@morpho-org/blue-sdk 1.0.6 → 1.2.1

package/lib/maths/MathLib.d.ts

@@ -1,5 +1,5 @@
-import { BigNumberish } from "ethers";
 import { Time } from "@morpho-org/morpho-ts";
+import { BigIntish } from "../types";
 export type RoundingDirection = "Up" | "Down";
 /**
  * Library to manage fixed-point arithmetic.
@@ -10,72 +10,85 @@ export type RoundingDirection = "Up" | "Down";
  */
 export declare class MathLib {
     static WAD: bigint;
+    static MAX_UINT_256: bigint;
     static MAX_UINT_160: bigint;
     static MAX_UINT_128: bigint;
     static MAX_UINT_48: bigint;
+    static maxUint(nBits: number): bigint;
+    /**
+     * Returns the absolute value of a number
+     * @param a The number
+     */
+    static abs(a: BigIntish): bigint;
     /**
      * Returns the smallest number given as param
      * @param x The first number
      * @param y The second number
      */
-    static min(x: BigNumberish, y: BigNumberish): bigint;
+    static min(...xs: BigIntish[]): bigint;
     /**
      * Returns the greatest number given as param
      * @param x The first number
      * @param y The second number
      */
-    static max(x: BigNumberish, y: BigNumberish): bigint;
+    static max(...xs: BigIntish[]): bigint;
+    /**
+     * Returns the subtraction of b from a, floored to zero if negative
+     * @param x The first number
+     * @param y The second number
+     */
+    static zeroFloorSub(x: BigIntish, y: BigIntish): bigint;
     /**
      * Perform the WAD-based multiplication of 2 numbers, rounded down
      * @param x The first number
      * @param y The second number
      */
-    static wMulDown(x: BigNumberish, y: BigNumberish): bigint;
+    static wMulDown(x: BigIntish, y: BigIntish): bigint;
     /**
      * Perform the WAD-based multiplication of 2 numbers, rounded up
      * @param x The first number
      * @param y The second number
      */
-    static wMulUp(x: BigNumberish, y: BigNumberish): bigint;
+    static wMulUp(x: BigIntish, y: BigIntish): bigint;
     /**
      * Perform the WAD-based multiplication of 2 numbers with a provided rounding direction
      * @param x The first number
      * @param y The second number
      */
-    static wMul(x: bigint, y: bigint, rounding: RoundingDirection): bigint;
+    static wMul(x: BigIntish, y: BigIntish, rounding: RoundingDirection): bigint;
     /**
      * Perform the WAD-based division of 2 numbers, rounded down
      * @param x The first number
      * @param y The second number
      */
-    static wDivDown(x: BigNumberish, y: BigNumberish): bigint;
+    static wDivDown(x: BigIntish, y: BigIntish): bigint;
     /**
      * Perform the WAD-based multiplication of 2 numbers, rounded up
      * @param x The first number
      * @param y The second number
      */
-    static wDivUp(x: BigNumberish, y: BigNumberish): bigint;
+    static wDivUp(x: BigIntish, y: BigIntish): bigint;
     /**
      * Perform the WAD-based multiplication of 2 numbers with a provided rounding direction
      * @param x The first number
      * @param y The second number
      */
-    static wDiv(x: BigNumberish, y: BigNumberish, rounding: RoundingDirection): bigint;
+    static wDiv(x: BigIntish, y: BigIntish, rounding: RoundingDirection): bigint;
     /**
      * Multiply two numbers and divide by a denominator, rounding down the result
      * @param x The first number
      * @param y The second number
      * @param denominator The denominator
      */
-    static mulDivDown(x: BigNumberish, y: BigNumberish, denominator: BigNumberish): bigint;
+    static mulDivDown(x: BigIntish, y: BigIntish, denominator: BigIntish): bigint;
     /**
      * Multiply two numbers and divide by a denominator, rounding up the result
      * @param x The first number
      * @param y The second number
      * @param denominator The denominator
      */
-    static mulDivUp(x: BigNumberish, y: BigNumberish, denominator: BigNumberish): bigint;
-    static mulDiv(x: BigNumberish, y: BigNumberish, denominator: BigNumberish, rounding: RoundingDirection): bigint;
+    static mulDivUp(x: BigIntish, y: BigIntish, denominator: BigIntish): bigint;
+    static mulDiv(x: BigIntish, y: BigIntish, denominator: BigIntish, rounding: RoundingDirection): bigint;
     /**
      * The sum of the first three non-zero terms of a Taylor expansion of e^(nx) - 1,
      * to approximate a continuous compound interest rate.
@@ -83,12 +96,19 @@ export declare class MathLib {
      * @param x The base of the exponent
      * @param n The exponent
      */
-    static wTaylorCompounded(x: BigNumberish, n: BigNumberish): bigint;
+    static wTaylorCompounded(x: BigIntish, n: BigIntish): bigint;
+    /**
+     * Converts an apr to compounded apy
+     *
+     * @param apr The rate to convert (in WAD)
+     * @param compounding The compounding basis
+     */
+    static rateToApy(rate: BigIntish, unit: Time.Unit): number;
     /**
      * Converts an apr to compounded apy
      *
-     * @param apr The apr to convert (in WAD)
+     * @param apr The yearly apr to convert (in WAD)
      * @param compounding The compounding basis
      */
-    static aprToApy(apr: bigint, compounding: Time.Unit): bigint;
+    static aprToApy(apr: BigIntish, compounding: Time.Unit): number;
 }

package/lib/maths/MathLib.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MathLib = void 0;
-const ethers_1 = require("ethers");
 const morpho_ts_1 = require("@morpho-org/morpho-ts");
+const helpers_1 = require("../helpers");
 /**
  * Library to manage fixed-point arithmetic.
  * This library reproduces the behaviour of the solidity library MathLib
@@ -11,25 +11,49 @@ const morpho_ts_1 = require("@morpho-org/morpho-ts");
  *
  */
 class MathLib {
+    static WAD = 1000000000000000000n;
+    static MAX_UINT_256 = MathLib.maxUint(256);
+    static MAX_UINT_160 = MathLib.maxUint(160);
+    static MAX_UINT_128 = MathLib.maxUint(128);
+    static MAX_UINT_48 = MathLib.maxUint(48);
+    static maxUint(nBits) {
+        if (nBits % 4 !== 0)
+            throw new Error(`Invalid number of bits: ${nBits}`);
+        return BigInt("0x" + "f".repeat(nBits / 4));
+    }
+    /**
+     * Returns the absolute value of a number
+     * @param a The number
+     */
+    static abs(a) {
+        a = BigInt(a);
+        return a >= 0 ? a : -a;
+    }
     /**
      * Returns the smallest number given as param
      * @param x The first number
      * @param y The second number
      */
-    static min(x, y) {
-        x = (0, ethers_1.toBigInt)(x);
-        y = (0, ethers_1.toBigInt)(y);
-        return x <= y ? x : y;
+    static min(...xs) {
+        return xs.map(BigInt).reduce((x, y) => (x <= y ? x : y));
     }
     /**
      * Returns the greatest number given as param
      * @param x The first number
      * @param y The second number
      */
-    static max(x, y) {
-        x = (0, ethers_1.toBigInt)(x);
-        y = (0, ethers_1.toBigInt)(y);
-        return x <= y ? y : x;
+    static max(...xs) {
+        return xs.map(BigInt).reduce((x, y) => (x <= y ? y : x));
+    }
+    /**
+     * Returns the subtraction of b from a, floored to zero if negative
+     * @param x The first number
+     * @param y The second number
+     */
+    static zeroFloorSub(x, y) {
+        x = BigInt(x);
+        y = BigInt(y);
+        return x <= y ? 0n : x - y;
     }
     /**
      * Perform the WAD-based multiplication of 2 numbers, rounded down
@@ -37,8 +61,6 @@ class MathLib {
      * @param y The second number
      */
     static wMulDown(x, y) {
-        x = (0, ethers_1.toBigInt)(x);
-        y = (0, ethers_1.toBigInt)(y);
         return MathLib.wMul(x, y, "Down");
     }
     /**
@@ -47,8 +69,6 @@ class MathLib {
      * @param y The second number
      */
     static wMulUp(x, y) {
-        x = (0, ethers_1.toBigInt)(x);
-        y = (0, ethers_1.toBigInt)(y);
         return MathLib.wMul(x, y, "Up");
     }
     /**
@@ -65,8 +85,6 @@ class MathLib {
      * @param y The second number
      */
     static wDivDown(x, y) {
-        x = (0, ethers_1.toBigInt)(x);
-        y = (0, ethers_1.toBigInt)(y);
         return MathLib.wDiv(x, y, "Down");
     }
     /**
@@ -75,8 +93,6 @@ class MathLib {
      * @param y The second number
      */
     static wDivUp(x, y) {
-        x = (0, ethers_1.toBigInt)(x);
-        y = (0, ethers_1.toBigInt)(y);
         return MathLib.wDiv(x, y, "Up");
     }
     /**
@@ -94,9 +110,9 @@ class MathLib {
      * @param denominator The denominator
      */
     static mulDivDown(x, y, denominator) {
-        x = (0, ethers_1.toBigInt)(x);
-        y = (0, ethers_1.toBigInt)(y);
-        denominator = (0, ethers_1.toBigInt)(denominator);
+        x = BigInt(x);
+        y = BigInt(y);
+        denominator = BigInt(denominator);
         if (denominator === 0n)
             throw Error("MathLib: DIVISION_BY_ZERO");
         return (x * y) / denominator;
@@ -108,9 +124,9 @@ class MathLib {
      * @param denominator The denominator
      */
     static mulDivUp(x, y, denominator) {
-        x = (0, ethers_1.toBigInt)(x);
-        y = (0, ethers_1.toBigInt)(y);
-        denominator = (0, ethers_1.toBigInt)(denominator);
+        x = BigInt(x);
+        y = BigInt(y);
+        denominator = BigInt(denominator);
         if (denominator === 0n)
             throw Error("MathLib: DIVISION_BY_ZERO");
         const roundup = (x * y) % denominator > 0 ? 1n : 0n;
@@ -127,9 +143,7 @@ class MathLib {
      * @param n The exponent
      */
     static wTaylorCompounded(x, n) {
-        x = (0, ethers_1.toBigInt)(x);
-        n = (0, ethers_1.toBigInt)(n);
-        const firstTerm = x * n;
+        const firstTerm = BigInt(x) * BigInt(n);
         const secondTerm = MathLib.mulDivDown(firstTerm, firstTerm, 2n * MathLib.WAD);
         const thirdTerm = MathLib.mulDivDown(secondTerm, firstTerm, 3n * MathLib.WAD);
         return firstTerm + secondTerm + thirdTerm;
@@ -137,17 +151,23 @@ class MathLib {
     /**
      * Converts an apr to compounded apy
      *
-     * @param apr The apr to convert (in WAD)
+     * @param apr The rate to convert (in WAD)
+     * @param compounding The compounding basis
+     */
+    static rateToApy(rate, unit) {
+        const factor = morpho_ts_1.Time[unit].from.y(1n);
+        return ((1 + Number(helpers_1.format.number.of(BigInt(rate), 18))) ** Number(factor) - 1);
+    }
+    /**
+     * Converts an apr to compounded apy
+     *
+     * @param apr The yearly apr to convert (in WAD)
      * @param compounding The compounding basis
      */
     static aprToApy(apr, compounding) {
         const factor = morpho_ts_1.Time[compounding].from.y(1n);
-        const rate = apr / factor;
-        return ((0, ethers_1.parseUnits)(((+(0, ethers_1.formatUnits)(this.WAD + rate)) ** Number(factor)).toFixed(18)) - this.WAD);
+        const rate = BigInt(apr) / factor;
+        return this.rateToApy(rate, compounding);
     }
 }
 exports.MathLib = MathLib;
-MathLib.WAD = (0, ethers_1.parseUnits)("1");
-MathLib.MAX_UINT_160 = BigInt("0x" + "f".repeat(40));
-MathLib.MAX_UINT_128 = BigInt("0x" + "f".repeat(32));
-MathLib.MAX_UINT_48 = BigInt("0x" + "f".repeat(12));

package/lib/maths/SharesMath.d.ts

@@ -1,4 +1,4 @@
-import { BigNumberish } from "ethers";
+import { BigIntish } from "../types";
 import { RoundingDirection } from "./MathLib";
 /**
  * JS implementation of {@link https://github.com/morpho-org/morpho-blue/blob/main/src/libraries/SharesMathLib.sol SharesMathLib} used by Morpho Blue
@@ -7,6 +7,6 @@ import { RoundingDirection } from "./MathLib";
 export declare namespace SharesMath {
     const VIRTUAL_SHARES = 1000000n;
     const VIRTUAL_ASSETS = 1n;
-    function toAssets(shares: BigNumberish, totalAssets: BigNumberish, totalShares: BigNumberish, rounding: RoundingDirection): bigint;
-    function toShares(assets: BigNumberish, totalAssets: BigNumberish, totalShares: BigNumberish, rounding: RoundingDirection): bigint;
+    function toAssets(shares: BigIntish, totalAssets: BigIntish, totalShares: BigIntish, rounding: RoundingDirection): bigint;
+    function toShares(assets: BigIntish, totalAssets: BigIntish, totalShares: BigIntish, rounding: RoundingDirection): bigint;
 }

package/lib/maths/SharesMath.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SharesMath = void 0;
-const ethers_1 = require("ethers");
 const MathLib_1 = require("./MathLib");
 /**
  * JS implementation of {@link https://github.com/morpho-org/morpho-blue/blob/main/src/libraries/SharesMathLib.sol SharesMathLib} used by Morpho Blue
@@ -12,11 +11,11 @@ var SharesMath;
     SharesMath.VIRTUAL_SHARES = 1000000n;
     SharesMath.VIRTUAL_ASSETS = 1n;
     function toAssets(shares, totalAssets, totalShares, rounding) {
-        return MathLib_1.MathLib.mulDiv(shares, (0, ethers_1.toBigInt)(totalAssets) + SharesMath.VIRTUAL_ASSETS, (0, ethers_1.toBigInt)(totalShares) + SharesMath.VIRTUAL_SHARES, rounding);
+        return MathLib_1.MathLib.mulDiv(shares, BigInt(totalAssets) + SharesMath.VIRTUAL_ASSETS, BigInt(totalShares) + SharesMath.VIRTUAL_SHARES, rounding);
     }
     SharesMath.toAssets = toAssets;
     function toShares(assets, totalAssets, totalShares, rounding) {
-        return MathLib_1.MathLib.mulDiv(assets, (0, ethers_1.toBigInt)(totalShares) + SharesMath.VIRTUAL_SHARES, (0, ethers_1.toBigInt)(totalAssets) + SharesMath.VIRTUAL_ASSETS, rounding);
+        return MathLib_1.MathLib.mulDiv(assets, BigInt(totalShares) + SharesMath.VIRTUAL_SHARES, BigInt(totalAssets) + SharesMath.VIRTUAL_ASSETS, rounding);
     }
     SharesMath.toShares = toShares;
 })(SharesMath || (exports.SharesMath = SharesMath = {}));

package/lib/maths/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./MathLib";
 export * from "./SharesMath";
-export * from "./MathUtils";
 export * from "./AdaptiveCurveIrmLib";

package/lib/maths/index.js

@@ -16,5 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./MathLib"), exports);
 __exportStar(require("./SharesMath"), exports);
-__exportStar(require("./MathUtils"), exports);
 __exportStar(require("./AdaptiveCurveIrmLib"), exports);

package/lib/position/Position.d.ts

@@ -1,22 +1,13 @@
-import { BigNumberish, Provider } from "ethers";
-import { ViewOverrides } from "ethers-types/dist/common";
-import { ChainId } from "../chain";
-import { Market, MarketConfig } from "../market";
+import { Market } from "../market";
 import { Address, MarketId } from "../types";
 export interface InputPosition {
     user: Address;
     marketId: MarketId;
-    supplyShares: BigNumberish;
-    borrowShares: BigNumberish;
-    collateral: BigNumberish;
+    supplyShares: bigint;
+    borrowShares: bigint;
+    collateral: bigint;
 }
 export declare class Position implements InputPosition {
-    static fetch(user: Address, marketId: MarketId, runner: {
-        provider: Provider;
-    }, { chainId, overrides, }?: {
-        chainId?: ChainId;
-        overrides?: ViewOverrides;
-    }): Promise<Position>;
     /**
      * The user holding this position.
      */
@@ -42,18 +33,6 @@ export declare class Position implements InputPosition {
 export interface InputAccrualPosition extends Omit<InputPosition, "marketId"> {
 }
 export declare class AccrualPosition extends Position implements InputAccrualPosition {
-    static fetchFromId(user: Address, marketId: MarketId, runner: {
-        provider: Provider;
-    }, options: {
-        chainId?: ChainId;
-        overrides?: ViewOverrides;
-    }): Promise<AccrualPosition>;
-    static fetchFromConfig(user: Address, config: MarketConfig, runner: {
-        provider: Provider;
-    }, options: {
-        chainId?: ChainId;
-        overrides?: ViewOverrides;
-    }): Promise<AccrualPosition>;
     /**
      * The market on which this position is held.
      */
@@ -112,7 +91,7 @@ export declare class AccrualPosition extends Position implements InputAccrualPos
     get borrowCapacityLimit(): import("../market").CapacityLimit;
     get withdrawCapacityLimit(): import("../market").CapacityLimit;
     get withdrawCollateralCapacityLimit(): import("../market").CapacityLimit;
-    accrueInterest(timestamp: BigNumberish): AccrualPosition;
+    accrueInterest(timestamp: bigint): AccrualPosition;
     getRepayCapacityLimit(loanTokenBalance: bigint): import("../market").CapacityLimit;
     getMaxCapacities(loanTokenBalance: bigint, collateralTokenBalance: bigint): import("../market").MaxPositionCapacities;
 }

package/lib/position/Position.js

@@ -1,48 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccrualPosition = exports.Position = void 0;
-const ethers_1 = require("ethers");
-const ethers_types_1 = require("ethers-types");
-const addresses_1 = require("../addresses");
-const chain_1 = require("../chain");
-const market_1 = require("../market");
 class Position {
-    static async fetch(user, marketId, runner, { chainId, overrides = {}, } = {}) {
-        chainId ?? (chainId = chain_1.ChainUtils.parseSupportedChainId((await runner.provider.getNetwork()).chainId));
-        const { morpho } = (0, addresses_1.getChainAddresses)(chainId);
-        const { supplyShares, borrowShares, collateral } = await ethers_types_1.MorphoBlue__factory.connect(morpho, runner).position(marketId, user, overrides);
-        return new Position({
-            user,
-            marketId,
-            supplyShares,
-            borrowShares,
-            collateral,
-        });
-    }
+    /**
+     * The user holding this position.
+     */
+    user;
+    /**
+     * The id of the market on which this position is held.
+     */
+    marketId;
+    /**
+     * The amount of supply shares held with this position.
+     */
+    supplyShares;
+    /**
+     * The amount of borrow shares held with this position.
+     */
+    borrowShares;
+    /**
+     * The amount of collateral assets held with this position.
+     */
+    collateral;
     constructor({ user, marketId, supplyShares, borrowShares, collateral, }) {
         this.user = user;
         this.marketId = marketId;
-        this.supplyShares = (0, ethers_1.toBigInt)(supplyShares);
-        this.borrowShares = (0, ethers_1.toBigInt)(borrowShares);
-        this.collateral = (0, ethers_1.toBigInt)(collateral);
+        this.supplyShares = supplyShares;
+        this.borrowShares = borrowShares;
+        this.collateral = collateral;
     }
 }
 exports.Position = Position;
 class AccrualPosition extends Position {
-    static async fetchFromId(user, marketId, runner, options) {
-        const [position, market] = await Promise.all([
-            await Position.fetch(user, marketId, runner, options),
-            await market_1.Market.fetchFromId(marketId, runner, options),
-        ]);
-        return new AccrualPosition(position, market);
-    }
-    static async fetchFromConfig(user, config, runner, options) {
-        const [position, market] = await Promise.all([
-            await Position.fetch(user, config.id, runner, options),
-            await market_1.Market.fetchFromConfig(config, runner, options),
-        ]);
-        return new AccrualPosition(position, market);
-    }
+    /**
+     * The market on which this position is held.
+     */
+    market;
     constructor(position, market) {
         super({ ...position, marketId: market.id });
         this.market = market;
@@ -127,7 +120,7 @@ class AccrualPosition extends Position {
         return this.market.getBorrowCapacityLimit(this);
     }
     get withdrawCapacityLimit() {
-        return this.market.getWithdrawCapacityLimit(this.supplyShares);
+        return this.market.getWithdrawCapacityLimit(this);
     }
     get withdrawCollateralCapacityLimit() {
         return this.market.getWithdrawCollateralCapacityLimit(this);

package/lib/tests/mocks/markets.d.ts

@@ -1,6 +1,7 @@
 import { MarketConfig } from "../../market";
 export declare const MAINNET_MARKETS: {
     eth_wstEth: MarketConfig;
+    eth_wstEth_2: MarketConfig;
     eth_rEth: MarketConfig;
     usdt_wbtc: MarketConfig;
     usdt_wstEth: MarketConfig;

package/lib/tests/mocks/markets.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MAINNET_MARKETS = void 0;
-const ethers_1 = require("ethers");
 const market_1 = require("../../market");
 exports.MAINNET_MARKETS = {
     eth_wstEth: new market_1.MarketConfig({
@@ -9,28 +8,35 @@ exports.MAINNET_MARKETS = {
         collateralToken: "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
         oracle: "0x2a01EB9496094dA03c4E364Def50f5aD1280AD72",
         irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.945"),
+        lltv: 945000000000000000n,
+    }),
+    eth_wstEth_2: new market_1.MarketConfig({
+        loanToken: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+        collateralToken: "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
+        oracle: "0xbD60A6770b27E084E8617335ddE769241B0e71D8",
+        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
+        lltv: 945000000000000000n,
     }),
     eth_rEth: new market_1.MarketConfig({
         loanToken: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
         collateralToken: "0xae78736Cd615f374D3085123A210448E74Fc6393",
         oracle: "0x1b4A3F92e5Fffd1d35A98751c9FE4472483579bB",
         irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.945"),
+        lltv: 945000000000000000n,
     }),
     usdt_wbtc: new market_1.MarketConfig({
         loanToken: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
         collateralToken: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
         oracle: "0x008bF4B1cDA0cc9f0e882E0697f036667652E1ef",
         irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.86"),
+        lltv: 860000000000000000n,
     }),
     usdt_wstEth: new market_1.MarketConfig({
         loanToken: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
         collateralToken: "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
         oracle: "0x95DB30fAb9A3754e42423000DF27732CB2396992",
         irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.86"),
+        lltv: 860000000000000000n,
     }),
     usdc_wbtc: new market_1.MarketConfig({
         // USDC(wBTC, 86%, Chainlink, AdaptiveCurve)
@@ -38,7 +44,7 @@ exports.MAINNET_MARKETS = {
         collateralToken: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
         oracle: "0xDddd770BADd886dF3864029e4B377B5F6a2B6b83",
         irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.86"),
+        lltv: 860000000000000000n,
     }),
     usdc_wstEth: new market_1.MarketConfig({
         // USDC(wstETH, 86%, Chainlink, AdaptiveCurve)
@@ -46,7 +52,7 @@ exports.MAINNET_MARKETS = {
         collateralToken: "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
         oracle: "0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2",
         irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.86"),
+        lltv: 860000000000000000n,
     }),
     usdc_sDai: new market_1.MarketConfig({
         // USDC(wstETH, 86%, Chainlink, AdaptiveCurve)
@@ -54,55 +60,55 @@ exports.MAINNET_MARKETS = {
         collateralToken: "0x83F20F44975D03b1b09e64809B757c47f942BEeA",
         oracle: "0x6CAFE228eC0B0bC2D076577d56D35Fe704318f6d",
         irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.965"),
+        lltv: 96500000000000000000n,
     }),
     idle_usdc: new market_1.MarketConfig({
         loanToken: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-        collateralToken: ethers_1.ZeroAddress,
-        oracle: ethers_1.ZeroAddress,
-        irm: ethers_1.ZeroAddress,
+        collateralToken: "0x0000000000000000000000000000000000000000",
+        oracle: "0x0000000000000000000000000000000000000000",
+        irm: "0x0000000000000000000000000000000000000000",
         lltv: 0n,
     }),
     crvUsd_stkcvxcrvUSDTWBTCWETH: new market_1.MarketConfig({
-        collateralToken: "0xb0Ce26C88e4e7DCa51968b6047f44646f5064278",
-        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.86"),
         loanToken: "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E",
+        collateralToken: "0xb0Ce26C88e4e7DCa51968b6047f44646f5064278",
         oracle: "0x077Af6c2D4A75D4145d141F9e9421864C3940CB3",
+        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
+        lltv: 860000000000000000n,
     }),
     crvUsd_stkcvxcrvUSDCWBTCWETH: new market_1.MarketConfig({
-        collateralToken: "0x0ea1a65A2c255f24Ee8D81eA6AaC54Decd9d269e",
-        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.86"),
         loanToken: "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E",
+        collateralToken: "0x0ea1a65A2c255f24Ee8D81eA6AaC54Decd9d269e",
         oracle: "0xd2F7C3B2fC97cC7b6AfDd76D163394680EFc35b9",
+        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
+        lltv: 860000000000000000n,
     }),
     crvUsd_stkcvxcrvCRVUSDTBTCWSTETH: new market_1.MarketConfig({
-        collateralToken: "0x3ce8Ec9f3d89aD0A2DdbCC3FDB8991BD241Fc82E",
-        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.86"),
         loanToken: "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E",
+        collateralToken: "0x3ce8Ec9f3d89aD0A2DdbCC3FDB8991BD241Fc82E",
         oracle: "0xa9f7900476F43C45Ebf56cEa669B9c960C176112",
+        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
+        lltv: 860000000000000000n,
     }),
     crvUsd_stkcvxTryLSD: new market_1.MarketConfig({
-        collateralToken: "0x6BA072F0d22806F2C52e9792AF47f2D59103BEBE",
-        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.86"),
         loanToken: "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E",
+        collateralToken: "0x6BA072F0d22806F2C52e9792AF47f2D59103BEBE",
         oracle: "0x18B0d7311a97c5377445C80c768ab5201Bb27B5a",
+        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
+        lltv: 860000000000000000n,
     }),
     crvUsd_stkcvxcrvUSDETHCRV: new market_1.MarketConfig({
-        collateralToken: "0xAc904BAfBb5FB04Deb2b6198FdCEedE75a78Ce5a",
-        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.86"),
         loanToken: "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E",
+        collateralToken: "0xAc904BAfBb5FB04Deb2b6198FdCEedE75a78Ce5a",
         oracle: "0xad7e157815df05029125B568E39d5402550d60bb",
+        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
+        lltv: 860000000000000000n,
     }),
     usda_re7Eth: new market_1.MarketConfig({
-        collateralToken: "0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0",
-        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
-        lltv: (0, ethers_1.parseUnits)("0.86"),
         loanToken: "0x0000206329b97DB379d5E1Bf586BbDB969C63274",
+        collateralToken: "0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0",
         oracle: "0x76052A2A28fDCB8124f4686C63C68355b142de3B",
+        irm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
+        lltv: 860000000000000000n,
     }),
 };

package/lib/token/Token.d.ts

@@ -1,4 +1,4 @@
-import { BigNumberish } from "ethers";
+import { ChainId } from "../chain";
 import { RoundingDirection } from "../maths";
 import { Address } from "../types";
 export interface InputToken {
@@ -8,6 +8,7 @@ export interface InputToken {
     name?: string;
 }
 export declare class Token implements InputToken {
+    static native(chainId: ChainId): Token;
     /**
      * The token's address.
      */
@@ -36,10 +37,10 @@ export declare class TokenWithPrice extends Token {
      * Quotes an amount in USD (scaled by WAD) in this token.
      * @param amount The amount of USD to quote.
      */
-    fromUsd(amount: BigNumberish, rounding?: RoundingDirection): bigint | null;
+    fromUsd(amount: bigint, rounding?: RoundingDirection): bigint | null;
     /**
      * Quotes an amount of tokens in USD (scaled by WAD).
      * @param amount The amount of tokens to quote.
      */
-    toUsd(amount: BigNumberish, rounding?: RoundingDirection): bigint | null;
+    toUsd(amount: bigint, rounding?: RoundingDirection): bigint | null;
 }