@morpho-org/blue-sdk 5.2.0-next.0 → 5.2.0

package/lib/addresses.js

@@ -20,10 +20,6 @@ const _addressesRegistry = {
     [chain_js_1.ChainId.EthMainnet]: {
         morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb",
         permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        bundler: "0x4095F064B8d3c3548A3bebfd0Bbfd04750E30077",
         bundler3: {
             bundler3: "0x6566194141eefa99Af43Bb5Aa71460Ca2Dc90245",
             generalAdapter1: "0x4A6c312ec70E8747a587EE860a0353cd42Be0aE0",
@@ -37,29 +33,12 @@ const _addressesRegistry = {
             aaveV3EtherFiMigrationAdapter: "0x4011dc6581fA05F9B0c7A12AdCd676e2b1a59ca3",
             aaveV3OptimizerMigrationAdapter: "0x9e2ea2d5785598a163D569D795f286F5C55ad972",
         },
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        aaveV3OptimizerBundler: "0x16F38d2E764E7BeBF625a8E995b34968226D2F9c",
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        aaveV2Bundler: "0xb3dCc75DB379925edFd3007511A8CE0cB4aa8e76",
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        aaveV3Bundler: "0x98ccB155E86bb478d514a827d16f58c6912f9BDC",
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        compoundV3Bundler: "0x3a0e2E9FB9c95fBc843daF166276C90B6C479558",
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        compoundV2Bundler: "0x26bF52a84360Ad3d01d7CDc28FC2dDC04d8c8647",
         adaptiveCurveIrm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
         publicAllocator: "0xfd32fA2ca22c76dD6E550706Ad913FC6CE91c75D",
         metaMorphoFactory: "0x1897A8997241C1cD4bD0698647e4EB7213535c24",
+        vaultV2Factory: "0xA1D94F746dEfa1928926b84fB2596c06926C0405",
+        morphoMarketV1AdapterFactory: "0xb049465969ac6355127cDf9E88deE63d25204d5D",
+        morphoVaultV1AdapterFactory: "0xD1B8E2dee25c2b89DCD2f98448a7ce87d6F63394",
         registryList: "0x3696c5eAe4a7Ffd04Ea163564571E9CD8Ed9364e",
         chainlinkOracleFactory: "0x3A7bB36Ee3f3eE32A60e9f2b33c1e5f2E83ad766",
         preLiquidationFactory: "0x6FF33615e792E35ed1026ea7cACCf42D9BF83476",
@@ -96,16 +75,10 @@ const _addressesRegistry = {
         crvUSDETHCRV: "0x4eBdF703948ddCEA3B11f675B4D1Fba9d2414A14",
         "stkcvx2BTC-f-morpho": "0x385E12cf4040543Bc8C18e05C1298Be5B04f3f5e",
         "2BTC-f": "0xB7ECB2AA52AA64a717180E030241bC75Cd946726",
-        vaultV2Factory: "0xA1D94F746dEfa1928926b84fB2596c06926C0405",
-        morphoVaultV1AdapterFactory: "0xD1B8E2dee25c2b89DCD2f98448a7ce87d6F63394",
     },
     [chain_js_1.ChainId.BaseMainnet]: {
         morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb",
         permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        bundler: "0x23055618898e202386e6c13955a58D3C68200BFB",
         bundler3: {
             bundler3: "0x6BFd8137e702540E7A42B74178A4a49Ba43920C4",
             generalAdapter1: "0xb98c948CFA24072e58935BC004a8A7b376AE746A",
@@ -114,21 +87,12 @@ const _addressesRegistry = {
             compoundV3MigrationAdapter: "0x85D4812Ef92c040d4270eD8547b6835e41FbbB70",
             aaveV3CoreMigrationAdapter: "0xb27Aa2a964eAd5ed661D86974b37e4fB995b36f5",
         },
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        compoundV2Bundler: "0x123f3167a416cA19365dE03a65e0AF3532af7223",
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        aaveV3Bundler: "0xcAe2929baBc60Be34818EaA5F40bF69265677108",
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        compoundV3Bundler: "0x1f8076e2EB6f10b12e6886f30D4909A91969F7dA",
         adaptiveCurveIrm: "0x46415998764C29aB2a25CbeA6254146D50D22687",
         publicAllocator: "0xA090dD1a701408Df1d4d0B85b716c87565f90467",
         metaMorphoFactory: "0xFf62A7c278C62eD665133147129245053Bbf5918",
+        vaultV2Factory: "0x4501125508079A99ebBebCE205DeC9593C2b5857",
+        morphoMarketV1AdapterFactory: "0x133baC94306B99f6dAD85c381a5be851d8DD717c",
+        morphoVaultV1AdapterFactory: "0xF42D9c36b34c9c2CF3Bc30eD2a52a90eEB604642",
         registryList: "0x5C2531Cbd2cf112Cf687da3Cd536708aDd7DB10a",
         chainlinkOracleFactory: "0x2DC205F24BCb6B311E5cdf0745B0741648Aebd3d",
         preLiquidationFactory: "0x8cd16b62E170Ee0bA83D80e1F80E6085367e2aef",
@@ -137,8 +101,6 @@ const _addressesRegistry = {
         usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
         verUsdc: "0x59aaF835D34b1E3dF2170e4872B785f11E2a964b",
         testUsdc: "0xBC77067f829979812d795d516E523C4033b66409",
-        vaultV2Factory: "0x4501125508079A99ebBebCE205DeC9593C2b5857",
-        morphoVaultV1AdapterFactory: "0xF42D9c36b34c9c2CF3Bc30eD2a52a90eEB604642",
     },
     [chain_js_1.ChainId.PolygonMainnet]: {
         morpho: "0x1bF0c2541F820E775182832f06c0B7Fc27A25f67",
@@ -154,6 +116,10 @@ const _addressesRegistry = {
         adaptiveCurveIrm: "0xe675A2161D4a6E2de2eeD70ac98EEBf257FBF0B0",
         publicAllocator: "0xfac15aff53ADd2ff80C2962127C434E8615Df0d3",
         metaMorphoFactory: "0xa9c87daB340631C34BB738625C70499e29ddDC98",
+        vaultV2Factory: "0xC11a53eE9B1eCc7a068D8e40F8F17926584F97Cf",
+        morphoMarketV1AdapterFactory: "0xD1A0C86F28ecD1657Ad06415c2B230cC89D9b6dd",
+        morphoVaultV1AdapterFactory: "0xEb174FEA51Da241eB3B516959B216e013de2888a",
+        registryList: "0xb70a43821d2707fA9d0EDd9511CC499F468Ba564",
         chainlinkOracleFactory: "0x1ff7895Eb842794c5d07C4c547b6730e61295215",
         preLiquidationFactory: "0xeDadDe37D76c72b98725614d0b41C20Fe612d304",
         wNative: "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270",
@@ -173,6 +139,10 @@ const _addressesRegistry = {
         adaptiveCurveIrm: "0x66F30587FB8D4206918deb78ecA7d5eBbafD06DA",
         publicAllocator: "0x769583Af5e9D03589F159EbEC31Cc2c23E8C355E",
         metaMorphoFactory: "0x878988f5f561081deEa117717052164ea1Ef0c82",
+        vaultV2Factory: "0x6b46fa3cc9EBF8aB230aBAc664E37F2966Bf7971",
+        morphoMarketV1AdapterFactory: "0x96456Bf888D4de607Bf3ca0b3C8e4DF9b0d0Ad47",
+        morphoVaultV1AdapterFactory: "0xD8Fc8a85779551e78B516da9f74061cb3b086793",
+        registryList: "0xc00eb3c7aD1aE986A7f05F5A9d71aCa39c763C65",
         chainlinkOracleFactory: "0x98Ce5D183DC0c176f54D37162F87e7eD7f2E41b5",
         preLiquidationFactory: "0x635c31B5DF1F7EFbCbC07E302335Ef4230758e3d",
         wNative: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
@@ -190,6 +160,10 @@ const _addressesRegistry = {
         adaptiveCurveIrm: "0x8cD70A8F399428456b29546BC5dBe10ab6a06ef6",
         publicAllocator: "0x0d68a97324E602E02799CD83B42D337207B40658",
         metaMorphoFactory: "0x3Bb6A6A0Bc85b367EFE0A5bAc81c5E52C892839a",
+        vaultV2Factory: "0x6128b680b277Bf4Df80DFE9D8c55A498660870ef",
+        morphoMarketV1AdapterFactory: "0x65956d5Ba4974983ecCe111612FC0A0c22650A11",
+        morphoVaultV1AdapterFactory: "0xEe9F7C64dD827ED7b5CAA2272936366FAca00CF3",
+        registryList: "0xD1346be260cd22Eab9E6163010b0D5CbfAAAD32b",
         chainlinkOracleFactory: "0x1ec408D4131686f727F3Fd6245CF85Bc5c9DAD70",
         preLiquidationFactory: "0x3d05C01EE8e97361b9E19D172128255eaE5F98B9",
         wNative: "0x4200000000000000000000000000000000000006",
@@ -205,6 +179,10 @@ const _addressesRegistry = {
         adaptiveCurveIrm: "0x34E99D604751a72cF8d0CFDf87069292d82De472",
         publicAllocator: "0xef9889B4e443DEd35FA0Bd060f2104Cca94e6A43",
         metaMorphoFactory: "0x4DBB3a642a2146d5413750Cca3647086D9ba5F12",
+        vaultV2Factory: "0x6846EA318B6B987Ee6b28eBFd87c3409F1d13108",
+        morphoMarketV1AdapterFactory: "0xAf93F2d8508053432659d509b0210fdF1472493D",
+        morphoVaultV1AdapterFactory: "0xbF7DEa3756668C7E396C655D646C039826ba8416",
+        registryList: "0x06A47994B4890dcA28C076969cedE1151d86EFCF",
         chainlinkOracleFactory: "0xd706690BA1Fe26b70c4AD89e60ff62cEB3A2eD02",
         preLiquidationFactory: "0xe3cE2051a24e58DBFC0eFBe4c2d9e89c5eAe4695",
         wNative: "0x4200000000000000000000000000000000000006",
@@ -264,6 +242,10 @@ const _addressesRegistry = {
         adaptiveCurveIrm: "0x9a6061d51743B31D2c3Be75D83781Fa423f53F0E",
         publicAllocator: "0xB0c9a107fA17c779B3378210A7a593e88938C7C9",
         metaMorphoFactory: "0xe9EdE3929F43a7062a007C3e8652e4ACa610Bdc0",
+        vaultV2Factory: "0xC9b34c108014B44e5a189A830e7e04c56704a0c9",
+        morphoMarketV1AdapterFactory: "0x117b92Ab1C025B175ED38a0CDe5A067a745224a0",
+        morphoVaultV1AdapterFactory: "0xf1Ab9e885C0faa0cbCEd407498BBA895537aD754",
+        registryList: "0xB9130D2A87d7c60ED7E7e4b25bdA6e3E6841becB",
         chainlinkOracleFactory: "0x43269546e1D586a1f7200a0AC07e26f9631f7539",
         preLiquidationFactory: "0xb04e4D3D59Ee47Ca9BA192707AF13A7D02969911",
         wNative: "0x4200000000000000000000000000000000000006",
@@ -361,6 +343,10 @@ const _addressesRegistry = {
         adaptiveCurveIrm: "0x4F708C0ae7deD3d74736594C2109C2E3c065B428",
         publicAllocator: "0x39EB6Da5e88194C82B13491Df2e8B3E213eD2412",
         metaMorphoFactory: "0x1c8De6889acee12257899BFeAa2b7e534de32E16",
+        vaultV2Factory: "0xFcb8b57E56787bB29e130Fca67f3c5a1232975D1",
+        morphoMarketV1AdapterFactory: "0x2e6BE3a3A27fb45c6AbA2D1833eeA48E8788538e",
+        morphoVaultV1AdapterFactory: "0xc8D22B1adD3D176600E9952e7876e9249254cAAF",
+        registryList: "0xA9132a09838fD20304dF2B2892679d06A4cc6371",
         chainlinkOracleFactory: "0x7D047fB910Bc187C18C81a69E30Fa164f8c536eC",
         preLiquidationFactory: "0x678EB53A3bB79111263f47B84989d16D81c36D85",
         wNative: "0xEE7D8BCFb72bC1880D0Cf19822eB0A2e6577aB62",
@@ -416,14 +402,18 @@ const _addressesRegistry = {
         publicAllocator: "0x517505be22D9068687334e69ae7a02fC77edf4Fc",
         metaMorphoFactory: "0xec051b19d654C48c357dC974376DeB6272f24e53",
         vaultV2Factory: "0xD7217E5687FF1071356C780b5fe4803D9D967da7",
+        morphoMarketV1AdapterFactory: "0xc6b8B565C715134b0Ca3D6fa3D29B25759D0b9e2",
         morphoVaultV1AdapterFactory: "0xdf5202e29654e02011611A086f15477880580CAc",
         registryList: "0x857B55cEb57dA0C2A83EE08a8dB529B931089aee",
         chainlinkOracleFactory: "0xeb476f124FaD625178759d13557A72394A6f9aF5",
         preLiquidationFactory: "0x1b6782Ac7A859503cE953FBf4736311CC335B8f0",
         wNative: "0x5555555555555555555555555555555555555555",
+        // Must implement USDC permit version 2 (otherwise breaks permit signatures).
+        usdc: "0xb88339CB7199b77E23DB6E890353E22632Ba630f",
     },
     [chain_js_1.ChainId.SeiMainnet]: {
         morpho: "0xc9cDAc20FCeAAF616f7EB0bb6Cd2c69dcfa9094c",
+        permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
         bundler3: {
             bundler3: "0xF9457356F18A3349Bb317Ac144c3Bcc62e5761aD",
             generalAdapter1: "0x02e0e71e145f254820B9D89c9E6068f08256F601",
@@ -434,6 +424,7 @@ const _addressesRegistry = {
         chainlinkOracleFactory: "0x4bD68c2FF3274207EC07ED281C915758b6F23F07",
         preLiquidationFactory: "0x65eD61058cEB4895B7d62437BaCEA39b04f6D27B",
         wNative: "0xE30feDd158A2e3b13e9badaeABaFc5516e95e8C7",
+        usdc: "0xe15fC38F6D8c56aF07bbCBe3BAf5708A2Bf42392",
     },
 };
 const _deployments = {
@@ -456,11 +447,12 @@ const _deployments = {
         adaptiveCurveIrm: 18883124n,
         publicAllocator: 19375099n,
         metaMorphoFactory: 21439510n,
+        vaultV2Factory: 23375073n,
+        morphoMarketV1AdapterFactory: 23375073n,
+        morphoVaultV1AdapterFactory: 23375073n,
         registryList: 23375119n,
         chainlinkOracleFactory: 19375066n,
         preLiquidationFactory: 21414664n,
-        vaultV2Factory: 23375073n,
-        morphoVaultV1AdapterFactory: 23375073n,
     },
     [chain_js_1.ChainId.BaseMainnet]: {
         morpho: 13977148n,
@@ -476,11 +468,12 @@ const _deployments = {
         adaptiveCurveIrm: 13977152n,
         publicAllocator: 13979545n,
         metaMorphoFactory: 23928808n,
+        vaultV2Factory: 35615206n,
+        morphoMarketV1AdapterFactory: 35615206n,
+        morphoVaultV1AdapterFactory: 35615206n,
         registryList: 35615358n,
         chainlinkOracleFactory: 13978286n,
         preLiquidationFactory: 23779056n,
-        vaultV2Factory: 35615206n,
-        morphoVaultV1AdapterFactory: 35615206n,
     },
     [chain_js_1.ChainId.PolygonMainnet]: {
         morpho: 66931042n,
@@ -496,6 +489,10 @@ const _deployments = {
         adaptiveCurveIrm: 66931042n,
         publicAllocator: 66931042n,
         metaMorphoFactory: 66931042n,
+        vaultV2Factory: 77371907n,
+        morphoMarketV1AdapterFactory: 77371907n,
+        morphoVaultV1AdapterFactory: 77371907n,
+        registryList: 77372020n,
         chainlinkOracleFactory: 66931042n,
         preLiquidationFactory: 68074185n,
     },
@@ -512,6 +509,10 @@ const _deployments = {
         adaptiveCurveIrm: 296446593n,
         publicAllocator: 296446593n,
         metaMorphoFactory: 296447195n,
+        vaultV2Factory: 387016724n,
+        morphoMarketV1AdapterFactory: 387016724n,
+        morphoVaultV1AdapterFactory: 387016724n,
+        registryList: 387017701n,
         chainlinkOracleFactory: 296447195n,
         preLiquidationFactory: 307326238n,
     },
@@ -526,6 +527,10 @@ const _deployments = {
         adaptiveCurveIrm: 130770075n,
         publicAllocator: 130770075n,
         metaMorphoFactory: 130770189n,
+        vaultV2Factory: 142122059n,
+        morphoMarketV1AdapterFactory: 142122059n,
+        morphoVaultV1AdapterFactory: 142122059n,
+        registryList: 142122170n,
         chainlinkOracleFactory: 130770189n,
         preLiquidationFactory: 132139369n,
     },
@@ -538,6 +543,10 @@ const _deployments = {
         adaptiveCurveIrm: 9025669n,
         publicAllocator: 9025669n,
         metaMorphoFactory: 9025733n,
+        vaultV2Factory: 20253005n,
+        morphoMarketV1AdapterFactory: 20253005n,
+        morphoVaultV1AdapterFactory: 20253005n,
+        registryList: 20253132n,
         chainlinkOracleFactory: 9025733n,
         preLiquidationFactory: 10273494n,
     },
@@ -589,6 +598,10 @@ const _deployments = {
         adaptiveCurveIrm: 9139027n,
         publicAllocator: 9139027n,
         metaMorphoFactory: 9316789n,
+        vaultV2Factory: 29092109n,
+        morphoMarketV1AdapterFactory: 29092109n,
+        morphoVaultV1AdapterFactory: 29092109n,
+        registryList: 29092328n,
         chainlinkOracleFactory: 9316789n,
         preLiquidationFactory: 9381237n,
     },
@@ -673,6 +686,10 @@ const _deployments = {
         adaptiveCurveIrm: 2741069n,
         publicAllocator: 2741069n,
         metaMorphoFactory: 2741420n,
+        vaultV2Factory: 13096629n,
+        morphoMarketV1AdapterFactory: 13096629n,
+        morphoVaultV1AdapterFactory: 13096629n,
+        registryList: 13096853n,
         chainlinkOracleFactory: 2741420n,
         preLiquidationFactory: 2741993n,
     },
@@ -722,6 +739,7 @@ const _deployments = {
         publicAllocator: 1988429n,
         metaMorphoFactory: 1988677n,
         vaultV2Factory: 14188393n,
+        morphoMarketV1AdapterFactory: 14188393n,
         morphoVaultV1AdapterFactory: 14188393n,
         registryList: 14188698n,
         chainlinkOracleFactory: 1988677n,
@@ -733,11 +751,13 @@ const _deployments = {
             bundler3: 168897284n,
             generalAdapter1: 168897284n,
         },
+        permit2: 118721449n,
         adaptiveCurveIrm: 166036723n,
         publicAllocator: 166036723n,
         metaMorphoFactory: 168896078n,
         chainlinkOracleFactory: 168896078n,
         preLiquidationFactory: 168897284n,
+        usdc: 154131168n,
     },
 };
 const getChainAddresses = (chainId) => {

package/lib/errors.d.ts

@@ -25,10 +25,6 @@ export declare class UnsupportedPreLiquidationParamsError extends Error {
     readonly lltv: bigint;
     constructor(lltv: bigint);
 }
-export declare class UnsupportedVaultV2AdapterError extends Error {
-    readonly address: Address;
-    constructor(address: Address);
-}
 export declare namespace BlueErrors {
     class AlreadySet extends Error {
         readonly name: string;
@@ -69,18 +65,6 @@ export declare namespace BlueErrors {
         constructor(deadline: bigint);
     }
 }
-export declare namespace VaultV2Errors {
-    class InvalidInterestAccrual extends Error {
-        readonly vault: Address;
-        readonly timestamp: bigint;
-        readonly lastUpdate: bigint;
-        constructor(vault: Address, timestamp: bigint, lastUpdate: bigint);
-    }
-    class UnsupportedLiquidityAdapter extends Error {
-        readonly address: Address;
-        constructor(address: Address);
-    }
-}
 export interface ErrorClass<E extends Error> {
     new (...args: any[]): E;
 }

package/lib/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultV2Errors = exports.BlueErrors = exports.UnsupportedVaultV2AdapterError = exports.UnsupportedPreLiquidationParamsError = exports.UnsupportedChainIdError = exports.UnknownVaultConfigError = exports.UnknownMarketParamsError = exports.UnknownTokenPriceError = exports.UnknownTokenError = exports.UnknownDataError = void 0;
+exports.BlueErrors = exports.UnsupportedPreLiquidationParamsError = exports.UnsupportedChainIdError = exports.UnknownVaultConfigError = exports.UnknownMarketParamsError = exports.UnknownTokenPriceError = exports.UnknownTokenError = exports.UnknownDataError = void 0;
 exports._try = _try;
 const viem_1 = require("viem");
 class UnknownDataError extends Error {
@@ -54,14 +54,6 @@ class UnsupportedPreLiquidationParamsError extends Error {
     }
 }
 exports.UnsupportedPreLiquidationParamsError = UnsupportedPreLiquidationParamsError;
-class UnsupportedVaultV2AdapterError extends Error {
-    address;
-    constructor(address) {
-        super(`vault v2 adapter "${address}" is not supported`);
-        this.address = address;
-    }
-}
-exports.UnsupportedVaultV2AdapterError = UnsupportedVaultV2AdapterError;
 var BlueErrors;
 (function (BlueErrors) {
     class AlreadySet extends Error {
@@ -141,29 +133,6 @@ var BlueErrors;
     }
     BlueErrors.ExpiredSignature = ExpiredSignature;
 })(BlueErrors || (exports.BlueErrors = BlueErrors = {}));
-var VaultV2Errors;
-(function (VaultV2Errors) {
-    class InvalidInterestAccrual extends Error {
-        vault;
-        timestamp;
-        lastUpdate;
-        constructor(vault, timestamp, lastUpdate) {
-            super(`invalid interest accrual on vault ${vault}: accrual timestamp ${timestamp} can't be prior to last update ${lastUpdate}`);
-            this.vault = vault;
-            this.timestamp = timestamp;
-            this.lastUpdate = lastUpdate;
-        }
-    }
-    VaultV2Errors.InvalidInterestAccrual = InvalidInterestAccrual;
-    class UnsupportedLiquidityAdapter extends Error {
-        address;
-        constructor(address) {
-            super(`unsupported liquidity adapter "${address}"`);
-            this.address = address;
-        }
-    }
-    VaultV2Errors.UnsupportedLiquidityAdapter = UnsupportedLiquidityAdapter;
-})(VaultV2Errors || (exports.VaultV2Errors = VaultV2Errors = {}));
 function _try(accessor, ...errorClasses) {
     const maybeCatchError = (error) => {
         if (errorClasses.length === 0 ||

package/lib/index.d.ts

@@ -11,4 +11,3 @@ export * from "./holding/index.js";
 export * from "./position/index.js";
 export * from "./vault/index.js";
 export * from "./preLiquidation.js";
-export * from "./utils.js";

package/lib/index.js

@@ -27,4 +27,3 @@ __exportStar(require("./holding/index.js"), exports);
 __exportStar(require("./position/index.js"), exports);
 __exportStar(require("./vault/index.js"), exports);
 __exportStar(require("./preLiquidation.js"), exports);
-__exportStar(require("./utils.js"), exports);

package/lib/market/Market.d.ts

@@ -1,7 +1,17 @@
 import { type RoundingDirection } from "../math/index.js";
 import type { BigIntish } from "../types.js";
-import { type CapacityLimit } from "../utils.js";
 import { type IMarketParams, MarketParams } from "./MarketParams.js";
+export declare enum CapacityLimitReason {
+    liquidity = "Liquidity",
+    balance = "Balance",
+    position = "Position",
+    collateral = "Collateral",
+    cap = "Cap"
+}
+export interface CapacityLimit {
+    value: bigint;
+    limiter: CapacityLimitReason;
+}
 export interface MaxBorrowOptions {
     maxLtv?: bigint;
 }
@@ -88,19 +98,9 @@ export declare class Market implements IMarket {
      */
     get utilization(): bigint;
     /**
-     * The market's Annual Percentage Yield (APY) at the IRM's target utilization rate, if applicable (scaled by WAD).
-     */
-    get apyAtTarget(): bigint | undefined;
-    /**
-     * Returns the rate at which interest accrued for suppliers of this market,
-     * since the last time the market was updated (scaled by WAD).
-     * @deprecated There's no such thing as a supply rate in Morpho. Only the supply APY is meaningful.
-     */
-    get supplyRate(): bigint;
-    /**
-     * @deprecated Use `avgBorrowRate` instead.
+     * The market's Annual Percentage Yield (APY) at the IRM's target utilization rate, if applicable.
      */
-    get borrowRate(): bigint;
+    get apyAtTarget(): number | undefined;
     /**
      * Returns the instantaneous rate at which interest accrues for borrowers of this market,
      * if `accrueInterest` was called immediately onchain (scaled by WAD).
@@ -127,19 +127,15 @@ export declare class Market implements IMarket {
      */
     get avgBorrowRate(): bigint;
     /**
-     * The market's current, instantaneous supply-side Annual Percentage Yield (APY) (scaled by WAD).
+     * The market's current, instantaneous supply-side Annual Percentage Yield (APY).
      * If interested in the APY at a specific timestamp, use `getSupplyApy(timestamp)` instead.
      */
-    get supplyApy(): bigint;
+    get supplyApy(): number;
     /**
-     * The market's current, instantaneous borrow-side Annual Percentage Yield (APY) (scaled by WAD).
+     * The market's current, instantaneous borrow-side Annual Percentage Yield (APY).
      * If interested in the APY at a specific timestamp, use `getBorrowApy(timestamp)` instead.
      */
-    get borrowApy(): bigint;
-    /**
-     * @deprecated Use `getEndBorrowRate(timestamp)` instead.
-     */
-    getBorrowRate(timestamp?: BigIntish): bigint;
+    get borrowApy(): number;
     /**
      * Returns the instantaneous rate at which interest accrues for borrowers of this market,
      * at the given timestamp, if the state remains unchanged (not accrued) (scaled by WAD).
@@ -173,36 +169,44 @@ export declare class Market implements IMarket {
     };
     /**
      * The market's instantaneous borrow-side Annual Percentage Yield (APY) at the given timestamp,
-     * if the state remains unchanged (not accrued) (scaled by WAD).
+     * if the state remains unchanged (not accrued).
      * @param timestamp The timestamp at which to calculate the borrow APY.
      * Must be greater than or equal to `lastUpdate`.
      * Defaults to `Time.timestamp()` (returns the current borrow APY).
      */
-    getBorrowApy(timestamp?: BigIntish): bigint;
+    getBorrowApy(timestamp?: BigIntish): number;
     /**
      * The market's instantaneous supply-side Annual Percentage Yield (APY) at the given timestamp,
-     * if the state remains unchanged (not accrued) (scaled by WAD).
+     * if the state remains unchanged (not accrued).
      * @param timestamp The timestamp at which to calculate the supply APY.
      * Must be greater than or equal to `lastUpdate`.
      * Defaults to `Time.timestamp()` (returns the current supply APY).
      */
-    getSupplyApy(timestamp?: BigIntish): bigint;
+    getSupplyApy(timestamp?: BigIntish): number;
     /**
      * The market's experienced borrow-side Annual Percentage Yield (APY),
-     * if interest was to be accrued at the given timestamp (scaled by WAD).
+     * if interest was to be accrued at the given timestamp.
      * @param timestamp The timestamp at which to calculate the borrow APY.
      * Must be greater than or equal to `lastUpdate`.
      * Defaults to `Time.timestamp()` (returns the current borrow APY).
      */
-    getAvgBorrowApy(timestamp?: BigIntish): bigint;
+    getAvgBorrowApy(timestamp?: BigIntish): number;
+    /**
+     * Returns the average rate at which interest _would_ accrue for suppliers of this market,
+     * if `accrueInterest` was called at the given timestamp (scaled by WAD).
+     * @param timestamp The timestamp at which to calculate the average supply rate.
+     * Must be greater than or equal to `lastUpdate`.
+     * Defaults to `Time.timestamp()` (returns the current average supply rate).
+     */
+    getAvgSupplyRate(timestamp?: BigIntish): bigint;
     /**
      * The market's experienced supply-side Annual Percentage Yield (APY),
-     * if interest was to be accrued at the given timestamp (scaled by WAD).
+     * if interest was to be accrued at the given timestamp.
      * @param timestamp The timestamp at which to calculate the supply APY.
      * Must be greater than or equal to `lastUpdate`.
      * Defaults to `Time.timestamp()` (returns the current supply APY).
      */
-    getAvgSupplyApy(timestamp?: BigIntish): bigint;
+    getAvgSupplyApy(timestamp?: BigIntish): number;
     /**
      * Returns a new market derived from this market, whose interest has been accrued up to the given timestamp.
      * @param timestamp The timestamp at which to accrue interest.