@morpho-org/blue-sdk 1.0.6 → 1.2.0

package/lib/market/MarketUtils.d.ts

@@ -1,98 +1,143 @@
-import { BigNumberish } from "ethers";
-import { MarketParamsStruct } from "ethers-types/dist/protocols/morpho/blue/MorphoBlue";
 import { RoundingDirection } from "../maths";
-import { MarketId } from "../types";
+import { BigIntish, MarketId } from "../types";
+import { MarketParams } from "./MarketConfig";
+/**
+ * Namespace of utility functions to ease market-related calculations.
+ */
 export declare namespace MarketUtils {
-    function getMarketId(market: MarketParamsStruct): MarketId;
-    function getLiquidationIncentiveFactor({ lltv, }: {
-        lltv: BigNumberish;
+    /**
+     * Returns the id of a market based on its params.
+     * @param market The market params.
+     */
+    function getMarketId(market: MarketParams): MarketId;
+    /**
+     * Returns the liquidation incentive factor for a given market params.
+     * @param config The market params.
+     */
+    function getLiquidationIncentiveFactor({ lltv }: {
+        lltv: BigIntish;
     }): bigint;
+    /**
+     * Returns the market's utilization rate (scaled by WAD).
+     * @param market The market state.
+     */
     function getUtilization({ totalSupplyAssets, totalBorrowAssets, }: {
-        totalSupplyAssets: BigNumberish;
-        totalBorrowAssets: BigNumberish;
+        totalSupplyAssets: BigIntish;
+        totalBorrowAssets: BigIntish;
     }): bigint;
-    function getSupplyRate(borrowRate: BigNumberish, { utilization, fee }: {
-        utilization: BigNumberish;
-        fee: BigNumberish;
+    /**
+     * Returns the rate at which interest accrued on average for suppliers on the corresponding market,
+     * since the last time the market was updated (scaled by WAD).
+     * @param borrowRate The average borrow rate since the last market update (scaled by WAD).
+     * @param market The market state.
+     */
+    function getSupplyRate(borrowRate: BigIntish, { utilization, fee }: {
+        utilization: BigIntish;
+        fee: BigIntish;
     }): bigint;
-    function getApy(rate: BigNumberish): bigint;
-    function getAccruedInterest(borrowRate: BigNumberish, { totalSupplyAssets, totalBorrowAssets, totalSupplyShares, fee, }: {
-        totalSupplyAssets: BigNumberish;
-        totalBorrowAssets: BigNumberish;
-        totalSupplyShares: BigNumberish;
-        fee: BigNumberish;
+    /**
+     * Returns the Annual Percentage Yield (APY) from an average rate, as calculated in Morpho Blue.
+     * @param rate The average rate to convert to APY (scaled by WAD).
+     */
+    function getApy(rate: BigIntish): bigint;
+    /**
+     * Returns the interest accrued on both sides of the given market
+     * as well as the supply shares minted to the fee recipient.
+     * @param borrowRate The average borrow rate since the last market update (scaled by WAD).
+     * @param market The market state.
+     * @param elapsed The time elapsed since the last market update (in seconds).
+     */
+    function getAccruedInterest(borrowRate: BigIntish, { totalSupplyAssets, totalBorrowAssets, totalSupplyShares, fee, }: {
+        totalSupplyAssets: BigIntish;
+        totalBorrowAssets: BigIntish;
+        totalSupplyShares: BigIntish;
+        fee: BigIntish;
     }, elapsed?: bigint): {
         interest: bigint;
         feeShares: bigint;
     };
-    function getLiquidityToUtilization({ totalSupplyAssets, totalBorrowAssets, }: {
-        totalSupplyAssets: BigNumberish;
-        totalBorrowAssets: BigNumberish;
-    }, utilization: BigNumberish): bigint;
-    function getCollateralPower(collateral: BigNumberish, { lltv }: {
-        lltv: BigNumberish;
+    /**
+     * Returns the liquidity available to withdraw until the market reach the given utilization rate.
+     * @param market The market state.
+     * @param utilization The target utilization rate (scaled by WAD).
+     */
+    function getSupplyLiquidityToUtilization({ totalSupplyAssets, totalBorrowAssets, }: {
+        totalSupplyAssets: BigIntish;
+        totalBorrowAssets: BigIntish;
+    }, utilization: BigIntish): BigIntish;
+    /**
+     * Returns the liquidity available to borrow until the market reach the given utilization rate.
+     * @param market The market state.
+     * @param utilization The target utilization rate (scaled by WAD).
+     */
+    function getBorrowLiquidityToUtilization({ totalSupplyAssets, totalBorrowAssets, }: {
+        totalSupplyAssets: BigIntish;
+        totalBorrowAssets: BigIntish;
+    }, utilization: BigIntish): bigint;
+    function getCollateralPower(collateral: BigIntish, { lltv }: {
+        lltv: BigIntish;
     }): bigint;
-    function getCollateralValue(collateral: BigNumberish, { price }: {
-        price: BigNumberish;
+    function getCollateralValue(collateral: BigIntish, { price }: {
+        price: BigIntish;
     }): bigint;
-    function getMaxBorrowAssets(collateral: BigNumberish, market: {
-        price: BigNumberish;
+    function getMaxBorrowAssets(collateral: BigIntish, market: {
+        price: BigIntish;
     }, { lltv }: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): bigint;
     function getMaxBorrowableAssets({ collateral, borrowShares, }: {
-        collateral: BigNumberish;
-        borrowShares: BigNumberish;
+        collateral: BigIntish;
+        borrowShares: BigIntish;
     }, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
-        price: BigNumberish;
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
+        price: BigIntish;
     }, marketConfig: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): bigint;
-    function getLiquidationSeizedAssets(repaidShares: BigNumberish, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
-        price: BigNumberish;
+    function getLiquidationSeizedAssets(repaidShares: BigIntish, market: {
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
+        price: BigIntish;
     }, config: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): bigint;
-    function getLiquidationRepaidShares(seizedAssets: BigNumberish, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
-        price: BigNumberish;
+    function getLiquidationRepaidShares(seizedAssets: BigIntish, market: {
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
+        price: BigIntish;
     }, config: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): bigint;
     function getSeizableCollateral(position: {
-        collateral: BigNumberish;
-        borrowShares: BigNumberish;
+        collateral: BigIntish;
+        borrowShares: BigIntish;
     }, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
-        price: BigNumberish;
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
+        price: BigIntish;
     }, config: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): bigint;
     function getWithdrawableCollateral({ collateral, borrowShares, }: {
-        collateral: BigNumberish;
-        borrowShares: BigNumberish;
+        collateral: BigIntish;
+        borrowShares: BigIntish;
     }, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
-        price: BigNumberish;
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
+        price: BigIntish;
     }, { lltv }: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): bigint;
     function isHealthy({ collateral, borrowShares, }: {
-        collateral: BigNumberish;
-        borrowShares: BigNumberish;
+        collateral: BigIntish;
+        borrowShares: BigIntish;
     }, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
-        price: BigNumberish;
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
+        price: BigIntish;
     }, marketConfig: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): boolean;
     /**
      * Returns the price of the collateral quoted in the loan token (e.g. ETH/DAI)
@@ -100,66 +145,70 @@ export declare namespace MarketUtils {
      * Returns null if the user is not a borrower
      */
     function getLiquidationPrice({ collateral, borrowShares, }: {
-        collateral: BigNumberish;
-        borrowShares: BigNumberish;
+        collateral: BigIntish;
+        borrowShares: BigIntish;
     }, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
     }, marketConfig: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): bigint | null;
+    /**
+     * Returns the price deviation required for the given borrow position to be unhealthy (scaled by WAD).
+     * @param position The borrow position to consider.
+     */
     function getPriceVariationToLiquidation(position: {
-        collateral: BigNumberish;
-        borrowShares: BigNumberish;
+        collateral: BigIntish;
+        borrowShares: BigIntish;
     }, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
-        price: BigNumberish;
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
+        price: BigIntish;
     }, marketConfig: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): bigint | null;
     function getHealthFactor({ collateral, borrowShares, }: {
-        collateral: BigNumberish;
-        borrowShares: BigNumberish;
+        collateral: BigIntish;
+        borrowShares: BigIntish;
     }, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
-        price: BigNumberish;
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
+        price: BigIntish;
     }, marketConfig: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): bigint | null;
     function getLtv({ collateral, borrowShares, }: {
-        collateral: BigNumberish;
-        borrowShares: BigNumberish;
+        collateral: BigIntish;
+        borrowShares: BigIntish;
     }, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
-        price: BigNumberish;
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
+        price: BigIntish;
     }): bigint | null;
     function getBorrowCapacityUsage(position: {
-        collateral: BigNumberish;
-        borrowShares: BigNumberish;
+        collateral: BigIntish;
+        borrowShares: BigIntish;
     }, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
-        price: BigNumberish;
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
+        price: BigIntish;
     }, marketConfig: {
-        lltv: BigNumberish;
+        lltv: BigIntish;
     }): bigint | null;
-    function toSupplyAssets(shares: BigNumberish, market: {
-        totalSupplyAssets: BigNumberish;
-        totalSupplyShares: BigNumberish;
+    function toSupplyAssets(shares: BigIntish, market: {
+        totalSupplyAssets: BigIntish;
+        totalSupplyShares: BigIntish;
     }, rounding?: RoundingDirection): bigint;
-    function toSupplyShares(assets: BigNumberish, market: {
-        totalSupplyAssets: BigNumberish;
-        totalSupplyShares: BigNumberish;
+    function toSupplyShares(assets: BigIntish, market: {
+        totalSupplyAssets: BigIntish;
+        totalSupplyShares: BigIntish;
     }, rounding?: RoundingDirection): bigint;
-    function toBorrowAssets(shares: BigNumberish, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
+    function toBorrowAssets(shares: BigIntish, market: {
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
     }, rounding?: RoundingDirection): bigint;
-    function toBorrowShares(assets: BigNumberish, market: {
-        totalBorrowAssets: BigNumberish;
-        totalBorrowShares: BigNumberish;
+    function toBorrowShares(assets: BigIntish, market: {
+        totalBorrowAssets: BigIntish;
+        totalBorrowShares: BigIntish;
     }, rounding?: RoundingDirection): bigint;
 }

package/lib/market/MarketUtils.js

@@ -1,69 +1,115 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarketUtils = void 0;
-const ethers_1 = require("ethers");
+const keccak256_1 = __importDefault(require("keccak256"));
 const constants_1 = require("../constants");
 const maths_1 = require("../maths");
+/**
+ * Namespace of utility functions to ease market-related calculations.
+ */
 var MarketUtils;
 (function (MarketUtils) {
+    /**
+     * Returns the id of a market based on its params.
+     * @param market The market params.
+     */
     function getMarketId(market) {
-        const encodedMarket = ethers_1.AbiCoder.defaultAbiCoder().encode(["address", "address", "address", "address", "uint256"], [
-            market.loanToken,
-            market.collateralToken,
-            market.oracle,
-            market.irm,
-            market.lltv,
-        ]);
-        return (0, ethers_1.keccak256)(encodedMarket);
+        return `0x${(0, keccak256_1.default)("0x" +
+            market.loanToken.substring(2).toLowerCase().padStart(64, "0") +
+            market.collateralToken.substring(2).toLowerCase().padStart(64, "0") +
+            market.oracle.substring(2).padStart(64, "0") +
+            market.irm.substring(2).toLowerCase().padStart(64, "0") +
+            market.lltv.toString(16).padStart(64, "0")).toString("hex")}`;
     }
     MarketUtils.getMarketId = getMarketId;
-    function getLiquidationIncentiveFactor({ lltv, }) {
+    /**
+     * Returns the liquidation incentive factor for a given market params.
+     * @param config The market params.
+     */
+    function getLiquidationIncentiveFactor({ lltv }) {
         return maths_1.MathLib.min(constants_1.MAX_LIQUIDATION_INCENTIVE_FACTOR, maths_1.MathLib.wDivDown(maths_1.MathLib.WAD, maths_1.MathLib.WAD -
-            maths_1.MathLib.wMulDown(constants_1.LIQUIDATION_CURSOR, maths_1.MathLib.WAD - (0, ethers_1.toBigInt)(lltv))));
+            maths_1.MathLib.wMulDown(constants_1.LIQUIDATION_CURSOR, maths_1.MathLib.WAD - BigInt(lltv))));
     }
     MarketUtils.getLiquidationIncentiveFactor = getLiquidationIncentiveFactor;
+    /**
+     * Returns the market's utilization rate (scaled by WAD).
+     * @param market The market state.
+     */
     function getUtilization({ totalSupplyAssets, totalBorrowAssets, }) {
-        totalSupplyAssets = (0, ethers_1.toBigInt)(totalSupplyAssets);
-        totalBorrowAssets = (0, ethers_1.toBigInt)(totalBorrowAssets);
+        totalSupplyAssets = BigInt(totalSupplyAssets);
+        totalBorrowAssets = BigInt(totalBorrowAssets);
         if (totalSupplyAssets === 0n) {
             if (totalBorrowAssets > 0n)
-                return ethers_1.MaxUint256;
+                return maths_1.MathLib.MAX_UINT_256;
             return 0n;
         }
         return maths_1.MathLib.wDivDown(totalBorrowAssets, totalSupplyAssets);
     }
     MarketUtils.getUtilization = getUtilization;
+    /**
+     * Returns the rate at which interest accrued on average for suppliers on the corresponding market,
+     * since the last time the market was updated (scaled by WAD).
+     * @param borrowRate The average borrow rate since the last market update (scaled by WAD).
+     * @param market The market state.
+     */
     function getSupplyRate(borrowRate, { utilization, fee }) {
         const borrowRateWithoutFees = maths_1.MathLib.wMulUp(borrowRate, utilization);
-        return maths_1.MathLib.wMulUp(borrowRateWithoutFees, maths_1.MathLib.WAD - (0, ethers_1.toBigInt)(fee));
+        return maths_1.MathLib.wMulUp(borrowRateWithoutFees, maths_1.MathLib.WAD - BigInt(fee));
     }
     MarketUtils.getSupplyRate = getSupplyRate;
+    /**
+     * Returns the Annual Percentage Yield (APY) from an average rate, as calculated in Morpho Blue.
+     * @param rate The average rate to convert to APY (scaled by WAD).
+     */
     function getApy(rate) {
         return maths_1.MathLib.wTaylorCompounded(rate, constants_1.SECONDS_PER_YEAR);
     }
     MarketUtils.getApy = getApy;
+    /**
+     * Returns the interest accrued on both sides of the given market
+     * as well as the supply shares minted to the fee recipient.
+     * @param borrowRate The average borrow rate since the last market update (scaled by WAD).
+     * @param market The market state.
+     * @param elapsed The time elapsed since the last market update (in seconds).
+     */
     function getAccruedInterest(borrowRate, { totalSupplyAssets, totalBorrowAssets, totalSupplyShares, fee, }, elapsed = 0n) {
         const interest = maths_1.MathLib.wMulDown(totalBorrowAssets, maths_1.MathLib.wTaylorCompounded(borrowRate, elapsed));
         const feeAmount = maths_1.MathLib.wMulDown(interest, fee);
         const feeShares = toSupplyShares(feeAmount, {
-            totalSupplyAssets: (0, ethers_1.toBigInt)(totalSupplyAssets) - feeAmount,
+            totalSupplyAssets: BigInt(totalSupplyAssets) - feeAmount,
             totalSupplyShares,
         }, "Down");
         return { interest, feeShares };
     }
     MarketUtils.getAccruedInterest = getAccruedInterest;
-    function getLiquidityToUtilization({ totalSupplyAssets, totalBorrowAssets, }, utilization) {
-        utilization = (0, ethers_1.toBigInt)(utilization);
-        totalSupplyAssets = (0, ethers_1.toBigInt)(totalSupplyAssets);
-        totalBorrowAssets = (0, ethers_1.toBigInt)(totalBorrowAssets);
+    /**
+     * Returns the liquidity available to withdraw until the market reach the given utilization rate.
+     * @param market The market state.
+     * @param utilization The target utilization rate (scaled by WAD).
+     */
+    function getSupplyLiquidityToUtilization({ totalSupplyAssets, totalBorrowAssets, }, utilization) {
+        utilization = BigInt(utilization);
+        totalBorrowAssets = BigInt(totalBorrowAssets);
         if (utilization === 0n) {
             if (totalBorrowAssets === 0n)
                 return totalSupplyAssets;
             return 0n;
         }
-        return maths_1.MathUtils.zeroFloorSub(totalSupplyAssets, maths_1.MathLib.wDivUp(totalBorrowAssets, utilization));
+        return maths_1.MathLib.zeroFloorSub(totalSupplyAssets, maths_1.MathLib.wDivUp(totalBorrowAssets, utilization));
+    }
+    MarketUtils.getSupplyLiquidityToUtilization = getSupplyLiquidityToUtilization;
+    /**
+     * Returns the liquidity available to borrow until the market reach the given utilization rate.
+     * @param market The market state.
+     * @param utilization The target utilization rate (scaled by WAD).
+     */
+    function getBorrowLiquidityToUtilization({ totalSupplyAssets, totalBorrowAssets, }, utilization) {
+        return maths_1.MathLib.zeroFloorSub(maths_1.MathLib.wMulDown(totalSupplyAssets, utilization), totalBorrowAssets);
     }
-    MarketUtils.getLiquidityToUtilization = getLiquidityToUtilization;
+    MarketUtils.getBorrowLiquidityToUtilization = getBorrowLiquidityToUtilization;
     function getCollateralPower(collateral, { lltv }) {
         return maths_1.MathLib.wMulDown(collateral, lltv);
     }
@@ -77,11 +123,11 @@ var MarketUtils;
     }
     MarketUtils.getMaxBorrowAssets = getMaxBorrowAssets;
     function getMaxBorrowableAssets({ collateral, borrowShares, }, market, marketConfig) {
-        return maths_1.MathUtils.zeroFloorSub(getMaxBorrowAssets(collateral, market, marketConfig), toBorrowAssets(borrowShares, market));
+        return maths_1.MathLib.zeroFloorSub(getMaxBorrowAssets(collateral, market, marketConfig), toBorrowAssets(borrowShares, market));
     }
     MarketUtils.getMaxBorrowableAssets = getMaxBorrowableAssets;
     function getLiquidationSeizedAssets(repaidShares, market, config) {
-        market.price = (0, ethers_1.toBigInt)(market.price);
+        market.price = BigInt(market.price);
         if (market.price === 0n)
             return 0n;
         return maths_1.MathLib.mulDivDown(maths_1.MathLib.wMulDown(toBorrowAssets(repaidShares, market, "Down"), getLiquidationIncentiveFactor(config)), constants_1.ORACLE_PRICE_SCALE, market.price);
@@ -92,17 +138,17 @@ var MarketUtils;
     }
     MarketUtils.getLiquidationRepaidShares = getLiquidationRepaidShares;
     function getSeizableCollateral(position, market, config) {
-        market.price = (0, ethers_1.toBigInt)(market.price);
+        market.price = BigInt(market.price);
         if (market.price === 0n || isHealthy(position, market, config))
             return 0n;
         return maths_1.MathLib.min(position.collateral, getLiquidationSeizedAssets(position.borrowShares, market, config));
     }
     MarketUtils.getSeizableCollateral = getSeizableCollateral;
     function getWithdrawableCollateral({ collateral, borrowShares, }, market, { lltv }) {
-        market.price = (0, ethers_1.toBigInt)(market.price);
+        market.price = BigInt(market.price);
         if (market.price === 0n)
             return 0n;
-        return maths_1.MathUtils.zeroFloorSub((0, ethers_1.toBigInt)(collateral), maths_1.MathLib.wDivUp(maths_1.MathLib.mulDivUp(toBorrowAssets(borrowShares, market), constants_1.ORACLE_PRICE_SCALE, market.price), lltv));
+        return maths_1.MathLib.zeroFloorSub(collateral, maths_1.MathLib.wDivUp(maths_1.MathLib.mulDivUp(toBorrowAssets(borrowShares, market), constants_1.ORACLE_PRICE_SCALE, market.price), lltv));
     }
     MarketUtils.getWithdrawableCollateral = getWithdrawableCollateral;
     function isHealthy({ collateral, borrowShares, }, market, marketConfig) {
@@ -116,45 +162,51 @@ var MarketUtils;
      * Returns null if the user is not a borrower
      */
     function getLiquidationPrice({ collateral, borrowShares, }, market, marketConfig) {
-        borrowShares = (0, ethers_1.toBigInt)(borrowShares);
-        market.totalBorrowShares = (0, ethers_1.toBigInt)(market.totalBorrowShares);
+        borrowShares = BigInt(borrowShares);
+        market.totalBorrowShares = BigInt(market.totalBorrowShares);
         if (borrowShares === 0n || market.totalBorrowShares === 0n)
             return null;
         const collateralPower = getCollateralPower(collateral, marketConfig);
         if (collateralPower === 0n)
-            return ethers_1.MaxUint256;
+            return maths_1.MathLib.MAX_UINT_256;
         const borrowAssets = toBorrowAssets(borrowShares, market);
         return maths_1.MathLib.mulDivUp(borrowAssets, constants_1.ORACLE_PRICE_SCALE, collateralPower);
     }
     MarketUtils.getLiquidationPrice = getLiquidationPrice;
+    /**
+     * Returns the price deviation required for the given borrow position to be unhealthy (scaled by WAD).
+     * @param position The borrow position to consider.
+     */
     function getPriceVariationToLiquidation(position, market, marketConfig) {
-        market.price = (0, ethers_1.toBigInt)(market.price);
+        market.price = BigInt(market.price);
+        if (market.price === 0n)
+            return null;
         const liquidationPrice = getLiquidationPrice(position, market, marketConfig);
-        if (market.price === 0n || liquidationPrice == null)
+        if (liquidationPrice == null)
             return null;
         return maths_1.MathLib.WAD - maths_1.MathLib.wDivUp(liquidationPrice, market.price);
     }
     MarketUtils.getPriceVariationToLiquidation = getPriceVariationToLiquidation;
     function getHealthFactor({ collateral, borrowShares, }, market, marketConfig) {
-        borrowShares = (0, ethers_1.toBigInt)(borrowShares);
-        market.totalBorrowShares = (0, ethers_1.toBigInt)(market.totalBorrowShares);
+        borrowShares = BigInt(borrowShares);
+        market.totalBorrowShares = BigInt(market.totalBorrowShares);
         if (borrowShares === 0n || market.totalBorrowShares === 0n)
             return null;
         const borrowAssets = toBorrowAssets(borrowShares, market);
         if (borrowAssets === 0n)
-            return ethers_1.MaxUint256;
+            return maths_1.MathLib.MAX_UINT_256;
         const maxBorrowAssets = getMaxBorrowAssets(collateral, market, marketConfig);
         return maths_1.MathLib.wDivDown(maxBorrowAssets, borrowAssets);
     }
     MarketUtils.getHealthFactor = getHealthFactor;
     function getLtv({ collateral, borrowShares, }, market) {
-        borrowShares = (0, ethers_1.toBigInt)(borrowShares);
-        market.totalBorrowShares = (0, ethers_1.toBigInt)(market.totalBorrowShares);
+        borrowShares = BigInt(borrowShares);
+        market.totalBorrowShares = BigInt(market.totalBorrowShares);
         if (borrowShares === 0n || market.totalBorrowShares === 0n)
             return null;
         const collateralValue = getCollateralValue(collateral, market);
         if (collateralValue === 0n)
-            return ethers_1.MaxUint256;
+            return maths_1.MathLib.MAX_UINT_256;
         return maths_1.MathLib.wDivUp(toBorrowAssets(borrowShares, market), collateralValue);
     }
     MarketUtils.getLtv = getLtv;
@@ -163,7 +215,7 @@ var MarketUtils;
         if (hf === null)
             return null;
         if (hf === 0n)
-            return ethers_1.MaxUint256;
+            return maths_1.MathLib.MAX_UINT_256;
         return maths_1.MathLib.wDivUp(maths_1.MathLib.WAD, hf);
     }
     MarketUtils.getBorrowCapacityUsage = getBorrowCapacityUsage;

package/lib/market/MarketUtils.test.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const MarketUtils_1 = require("./MarketUtils");
 const market = {
     loanToken: "0x0000000000000000000000000000000000000001",
     collateralToken: "0x0000000000000000000000000000000000000002",
     oracle: "0x0000000000000000000000000000000000000003",
     irm: "0x0000000000000000000000000000000000000004",
-    lltv: (0, ethers_1.parseEther)("0.86"),
+    lltv: 860000000000000000n,
 };
 describe("MarketUtils", () => {
     it("should calculate the correct market id", () => {

package/lib/maths/AdaptiveCurveIrmLib.d.ts

@@ -1,9 +1,10 @@
+import { BigIntish } from "../types";
 /**
  * JS implementation of {@link https://github.com/morpho-org/morpho-blue-irm/blob/main/src/libraries/adaptive-curve/ExpLib.sol ExpLib} used by the Adaptive Curve IRM.
  */
 export declare namespace AdaptiveCurveIrmLib {
-    const CURVE_STEEPNESS: bigint;
-    const TARGET_UTILIZATION: bigint;
+    const CURVE_STEEPNESS = 4000000000000000000n;
+    const TARGET_UTILIZATION = 900000000000000000n;
     const INITIAL_RATE_AT_TARGET: bigint;
     const ADJUSTMENT_SPEED: bigint;
     const MIN_RATE_AT_TARGET: bigint;
@@ -29,8 +30,8 @@ export declare namespace AdaptiveCurveIrmLib {
      * Returns an approximation of exp(x) used by the Adaptive Curve IRM.
      * @param x
      */
-    function wExp(x: bigint): bigint;
-    function getBorrowRate(startUtilization: bigint, startRateAtTarget: bigint, elapsed: bigint): {
+    function wExp(x: BigIntish): bigint;
+    function getBorrowRate(startUtilization: BigIntish, startRateAtTarget: BigIntish, elapsed: BigIntish): {
         avgBorrowRate: bigint;
         endRateAtTarget: bigint;
     };

package/lib/maths/AdaptiveCurveIrmLib.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptiveCurveIrmLib = void 0;
-const ethers_1 = require("ethers");
 const constants_1 = require("../constants");
 const MathLib_1 = require("./MathLib");
 /**
@@ -9,12 +8,12 @@ const MathLib_1 = require("./MathLib");
  */
 var AdaptiveCurveIrmLib;
 (function (AdaptiveCurveIrmLib) {
-    AdaptiveCurveIrmLib.CURVE_STEEPNESS = (0, ethers_1.parseUnits)("4");
-    AdaptiveCurveIrmLib.TARGET_UTILIZATION = (0, ethers_1.parseUnits)("0.9");
-    AdaptiveCurveIrmLib.INITIAL_RATE_AT_TARGET = (0, ethers_1.parseUnits)("0.04") / constants_1.SECONDS_PER_YEAR;
-    AdaptiveCurveIrmLib.ADJUSTMENT_SPEED = (0, ethers_1.parseUnits)("50") / constants_1.SECONDS_PER_YEAR;
-    AdaptiveCurveIrmLib.MIN_RATE_AT_TARGET = (0, ethers_1.parseUnits)("0.001") / constants_1.SECONDS_PER_YEAR;
-    AdaptiveCurveIrmLib.MAX_RATE_AT_TARGET = (0, ethers_1.parseUnits)("2") / constants_1.SECONDS_PER_YEAR;
+    AdaptiveCurveIrmLib.CURVE_STEEPNESS = 4000000000000000000n;
+    AdaptiveCurveIrmLib.TARGET_UTILIZATION = 900000000000000000n;
+    AdaptiveCurveIrmLib.INITIAL_RATE_AT_TARGET = 40000000000000000n / constants_1.SECONDS_PER_YEAR;
+    AdaptiveCurveIrmLib.ADJUSTMENT_SPEED = 50000000000000000000n / constants_1.SECONDS_PER_YEAR;
+    AdaptiveCurveIrmLib.MIN_RATE_AT_TARGET = 1000000000000000n / constants_1.SECONDS_PER_YEAR;
+    AdaptiveCurveIrmLib.MAX_RATE_AT_TARGET = 2000000000000000000n / constants_1.SECONDS_PER_YEAR;
     /**
      * ln(2), scaled by WAD.
      */
@@ -37,6 +36,7 @@ var AdaptiveCurveIrmLib;
      * @param x
      */
     function wExp(x) {
+        x = BigInt(x);
         // If x < ln(1e-18) then exp(x) < 1e-18 so it is rounded to zero.
         if (x < AdaptiveCurveIrmLib.LN_WEI_INT)
             return 0n;
@@ -57,6 +57,9 @@ var AdaptiveCurveIrmLib;
     }
     AdaptiveCurveIrmLib.wExp = wExp;
     function getBorrowRate(startUtilization, startRateAtTarget, elapsed) {
+        startUtilization = BigInt(startUtilization);
+        startRateAtTarget = BigInt(startRateAtTarget);
+        elapsed = BigInt(elapsed);
         const errNormFactor = startUtilization > AdaptiveCurveIrmLib.TARGET_UTILIZATION
             ? MathLib_1.MathLib.WAD - AdaptiveCurveIrmLib.TARGET_UTILIZATION
             : AdaptiveCurveIrmLib.TARGET_UTILIZATION;