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

package/lib/addresses.d.ts

@@ -9,30 +9,6 @@ export declare const NATIVE_ADDRESS = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEe
 export interface ChainAddresses {
     morpho: Address;
     permit2?: Address;
-    /**
-     * @deprecated All bundles should use Bundler3 instead.
-     */
-    bundler?: Address;
-    /**
-     * @deprecated All bundles should use Bundler3 instead.
-     */
-    aaveV3OptimizerBundler?: Address;
-    /**
-     * @deprecated All bundles should use Bundler3 instead.
-     */
-    aaveV2Bundler?: Address;
-    /**
-     * @deprecated All bundles should use Bundler3 instead.
-     */
-    aaveV3Bundler?: Address;
-    /**
-     * @deprecated All bundles should use Bundler3 instead.
-     */
-    compoundV3Bundler?: Address;
-    /**
-     * @deprecated All bundles should use Bundler3 instead.
-     */
-    compoundV2Bundler?: Address;
     bundler3: {
         bundler3: Address;
         generalAdapter1: Address;
@@ -71,10 +47,6 @@ declare const _addressesRegistry: {
     readonly 1: {
         readonly morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb";
         readonly permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly bundler: "0x4095F064B8d3c3548A3bebfd0Bbfd04750E30077";
         readonly bundler3: {
             readonly bundler3: "0x6566194141eefa99Af43Bb5Aa71460Ca2Dc90245";
             readonly generalAdapter1: "0x4A6c312ec70E8747a587EE860a0353cd42Be0aE0";
@@ -88,26 +60,6 @@ declare const _addressesRegistry: {
             readonly aaveV3EtherFiMigrationAdapter: "0x4011dc6581fA05F9B0c7A12AdCd676e2b1a59ca3";
             readonly aaveV3OptimizerMigrationAdapter: "0x9e2ea2d5785598a163D569D795f286F5C55ad972";
         };
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly aaveV3OptimizerBundler: "0x16F38d2E764E7BeBF625a8E995b34968226D2F9c";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly aaveV2Bundler: "0xb3dCc75DB379925edFd3007511A8CE0cB4aa8e76";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly aaveV3Bundler: "0x98ccB155E86bb478d514a827d16f58c6912f9BDC";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly compoundV3Bundler: "0x3a0e2E9FB9c95fBc843daF166276C90B6C479558";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly compoundV2Bundler: "0x26bF52a84360Ad3d01d7CDc28FC2dDC04d8c8647";
         readonly adaptiveCurveIrm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC";
         readonly publicAllocator: "0xfd32fA2ca22c76dD6E550706Ad913FC6CE91c75D";
         readonly metaMorphoFactory: "0x1897A8997241C1cD4bD0698647e4EB7213535c24";
@@ -147,10 +99,6 @@ declare const _addressesRegistry: {
     readonly 8453: {
         readonly morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb";
         readonly permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly bundler: "0x23055618898e202386e6c13955a58D3C68200BFB";
         readonly bundler3: {
             readonly bundler3: "0x6BFd8137e702540E7A42B74178A4a49Ba43920C4";
             readonly generalAdapter1: "0xb98c948CFA24072e58935BC004a8A7b376AE746A";
@@ -159,18 +107,6 @@ declare const _addressesRegistry: {
             readonly compoundV3MigrationAdapter: "0x85D4812Ef92c040d4270eD8547b6835e41FbbB70";
             readonly aaveV3CoreMigrationAdapter: "0xb27Aa2a964eAd5ed661D86974b37e4fB995b36f5";
         };
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly compoundV2Bundler: "0x123f3167a416cA19365dE03a65e0AF3532af7223";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly aaveV3Bundler: "0xcAe2929baBc60Be34818EaA5F40bF69265677108";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly compoundV3Bundler: "0x1f8076e2EB6f10b12e6886f30D4909A91969F7dA";
         readonly adaptiveCurveIrm: "0x46415998764C29aB2a25CbeA6254146D50D22687";
         readonly publicAllocator: "0xA090dD1a701408Df1d4d0B85b716c87565f90467";
         readonly metaMorphoFactory: "0xFf62A7c278C62eD665133147129245053Bbf5918";
@@ -456,6 +392,7 @@ declare const _addressesRegistry: {
         readonly chainlinkOracleFactory: "0xeb476f124FaD625178759d13557A72394A6f9aF5";
         readonly preLiquidationFactory: "0x1b6782Ac7A859503cE953FBf4736311CC335B8f0";
         readonly wNative: "0x5555555555555555555555555555555555555555";
+        readonly usdc: "0xb88339CB7199b77E23DB6E890353E22632Ba630f";
     };
     readonly 1329: {
         readonly morpho: "0xc9cDAc20FCeAAF616f7EB0bb6Cd2c69dcfa9094c";
@@ -809,10 +746,6 @@ export declare let addressesRegistry: {
     readonly 1: {
         readonly morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb";
         readonly permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly bundler: "0x4095F064B8d3c3548A3bebfd0Bbfd04750E30077";
         readonly bundler3: {
             readonly bundler3: "0x6566194141eefa99Af43Bb5Aa71460Ca2Dc90245";
             readonly generalAdapter1: "0x4A6c312ec70E8747a587EE860a0353cd42Be0aE0";
@@ -826,26 +759,6 @@ export declare let addressesRegistry: {
             readonly aaveV3EtherFiMigrationAdapter: "0x4011dc6581fA05F9B0c7A12AdCd676e2b1a59ca3";
             readonly aaveV3OptimizerMigrationAdapter: "0x9e2ea2d5785598a163D569D795f286F5C55ad972";
         };
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly aaveV3OptimizerBundler: "0x16F38d2E764E7BeBF625a8E995b34968226D2F9c";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly aaveV2Bundler: "0xb3dCc75DB379925edFd3007511A8CE0cB4aa8e76";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly aaveV3Bundler: "0x98ccB155E86bb478d514a827d16f58c6912f9BDC";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly compoundV3Bundler: "0x3a0e2E9FB9c95fBc843daF166276C90B6C479558";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly compoundV2Bundler: "0x26bF52a84360Ad3d01d7CDc28FC2dDC04d8c8647";
         readonly adaptiveCurveIrm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC";
         readonly publicAllocator: "0xfd32fA2ca22c76dD6E550706Ad913FC6CE91c75D";
         readonly metaMorphoFactory: "0x1897A8997241C1cD4bD0698647e4EB7213535c24";
@@ -885,10 +798,6 @@ export declare let addressesRegistry: {
     readonly 8453: {
         readonly morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb";
         readonly permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly bundler: "0x23055618898e202386e6c13955a58D3C68200BFB";
         readonly bundler3: {
             readonly bundler3: "0x6BFd8137e702540E7A42B74178A4a49Ba43920C4";
             readonly generalAdapter1: "0xb98c948CFA24072e58935BC004a8A7b376AE746A";
@@ -897,18 +806,6 @@ export declare let addressesRegistry: {
             readonly compoundV3MigrationAdapter: "0x85D4812Ef92c040d4270eD8547b6835e41FbbB70";
             readonly aaveV3CoreMigrationAdapter: "0xb27Aa2a964eAd5ed661D86974b37e4fB995b36f5";
         };
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly compoundV2Bundler: "0x123f3167a416cA19365dE03a65e0AF3532af7223";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly aaveV3Bundler: "0xcAe2929baBc60Be34818EaA5F40bF69265677108";
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        readonly compoundV3Bundler: "0x1f8076e2EB6f10b12e6886f30D4909A91969F7dA";
         readonly adaptiveCurveIrm: "0x46415998764C29aB2a25CbeA6254146D50D22687";
         readonly publicAllocator: "0xA090dD1a701408Df1d4d0B85b716c87565f90467";
         readonly metaMorphoFactory: "0xFf62A7c278C62eD665133147129245053Bbf5918";
@@ -1194,6 +1091,7 @@ export declare let addressesRegistry: {
         readonly chainlinkOracleFactory: "0xeb476f124FaD625178759d13557A72394A6f9aF5";
         readonly preLiquidationFactory: "0x1b6782Ac7A859503cE953FBf4736311CC335B8f0";
         readonly wNative: "0x5555555555555555555555555555555555555555";
+        readonly usdc: "0xb88339CB7199b77E23DB6E890353E22632Ba630f";
     };
     readonly 1329: {
         readonly morpho: "0xc9cDAc20FCeAAF616f7EB0bb6Cd2c69dcfa9094c";

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,26 +33,6 @@ 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",
@@ -102,10 +78,6 @@ const _addressesRegistry = {
     [chain_js_1.ChainId.BaseMainnet]: {
         morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb",
         permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
-        /**
-         * @deprecated All bundles should use Bundler3 instead.
-         */
-        bundler: "0x23055618898e202386e6c13955a58D3C68200BFB",
         bundler3: {
             bundler3: "0x6BFd8137e702540E7A42B74178A4a49Ba43920C4",
             generalAdapter1: "0xb98c948CFA24072e58935BC004a8A7b376AE746A",
@@ -114,18 +86,6 @@ 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",
@@ -421,6 +381,8 @@ const _addressesRegistry = {
         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",

package/lib/market/Market.d.ts

@@ -88,19 +88,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).
+     * The market's Annual Percentage Yield (APY) at the IRM's target utilization rate, if applicable.
      */
-    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.
-     */
-    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 +117,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 +159,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.

package/lib/market/Market.js

@@ -87,27 +87,13 @@ class Market {
         return MarketUtils_js_1.MarketUtils.getUtilization(this);
     }
     /**
-     * The market's Annual Percentage Yield (APY) at the IRM's target utilization rate, if applicable (scaled by WAD).
+     * The market's Annual Percentage Yield (APY) at the IRM's target utilization rate, if applicable.
      */
     get apyAtTarget() {
         if (this.rateAtTarget == null)
             return;
         return MarketUtils_js_1.MarketUtils.rateToApy(this.rateAtTarget);
     }
-    /**
-     * 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() {
-        return MarketUtils_js_1.MarketUtils.getSupplyRate(this.avgBorrowRate, this);
-    }
-    /**
-     * @deprecated Use `avgBorrowRate` instead.
-     */
-    get borrowRate() {
-        return this.getAccrualBorrowRates().avgBorrowRate;
-    }
     /**
      * Returns the instantaneous rate at which interest accrues for borrowers of this market,
      * if `accrueInterest` was called immediately onchain (scaled by WAD).
@@ -138,25 +124,19 @@ class Market {
         return this.getAccrualBorrowRates().avgBorrowRate;
     }
     /**
-     * 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() {
         return this.getSupplyApy();
     }
     /**
-     * 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() {
         return this.getBorrowApy();
     }
-    /**
-     * @deprecated Use `getEndBorrowRate(timestamp)` instead.
-     */
-    getBorrowRate(timestamp = morpho_ts_1.Time.timestamp()) {
-        return this.getAccrualBorrowRates(timestamp).endBorrowRate;
-    }
     /**
      * 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).
@@ -204,7 +184,7 @@ class Market {
     }
     /**
      * 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).
@@ -215,18 +195,18 @@ class Market {
     }
     /**
      * 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 = morpho_ts_1.Time.timestamp()) {
-        const borrowApy = this.getBorrowApy(timestamp);
-        return index_js_1.MathLib.wMulUp(index_js_1.MathLib.wMulDown(borrowApy, this.utilization), index_js_1.MathLib.WAD - this.fee);
+        const borrowRate = this.getEndBorrowRate(timestamp);
+        return MarketUtils_js_1.MarketUtils.rateToApy(index_js_1.MathLib.wMulUp(index_js_1.MathLib.wMulDown(borrowRate, this.utilization), index_js_1.MathLib.WAD - this.fee));
     }
     /**
      * 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).
@@ -235,16 +215,26 @@ class Market {
         const borrowRate = this.getAvgBorrowRate(timestamp);
         return MarketUtils_js_1.MarketUtils.rateToApy(borrowRate);
     }
+    /**
+     * 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 = morpho_ts_1.Time.timestamp()) {
+        const borrowRate = this.getAvgBorrowRate(timestamp);
+        return index_js_1.MathLib.wMulUp(index_js_1.MathLib.wMulDown(borrowRate, this.utilization), index_js_1.MathLib.WAD - this.fee);
+    }
     /**
      * 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 = morpho_ts_1.Time.timestamp()) {
-        const borrowApy = this.getAvgBorrowApy(timestamp);
-        return index_js_1.MathLib.wMulUp(index_js_1.MathLib.wMulDown(borrowApy, this.utilization), index_js_1.MathLib.WAD - this.fee);
+        return MarketUtils_js_1.MarketUtils.rateToApy(this.getAvgSupplyRate(timestamp));
     }
     /**
      * Returns a new market derived from this market, whose interest has been accrued up to the given timestamp.

package/lib/market/MarketUtils.d.ts

@@ -26,29 +26,11 @@ export declare namespace MarketUtils {
         totalBorrowAssets: BigIntish;
     }): bigint;
     /**
-     * Returns the rate at which interest accrued 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.
-     * @deprecated There's no such thing as a supply rate in Morpho. Only the supply APY is meaningful.
-     */
-    function getSupplyRate(borrowRate: BigIntish, { utilization, fee }: {
-        utilization: BigIntish;
-        fee: BigIntish;
-    }): bigint;
-    /**
-     * Returns the per-second rate continuously compounded over the given period, as calculated in Morpho Blue (scaled by WAD).
-     * @param rate The per-second rate to compound (scaled by WAD).
-     * @param period The period to compound the rate over (in seconds). Defaults to 1 year.
-     * @deprecated The compounded rate is inaccurate if rate * period >> 0. If interested in the APY, use `rateToApy` instead.
-     */
-    function compoundRate(rate: BigIntish, period?: BigIntish): bigint;
-    /**
-     * Returns the per-second rate continuously compounded over a year (scaled by WAD),
+     * Returns the per-second rate continuously compounded over a year,
      * as calculated in Morpho Blue assuming the market is frequently accrued onchain.
-     * @param rate The per-second rate to compound annually (scaled by WAD).
+     * @param rate The per-second rate to compound annually.
      */
-    function rateToApy(rate: BigIntish): bigint;
+    function rateToApy(rate: BigIntish): number;
     /**
      * Returns the interest accrued on both sides of the given market
      * as well as the supply shares minted to the fee recipient.

package/lib/market/MarketUtils.js

@@ -6,7 +6,6 @@ const utils_1 = require("@noble/hashes/utils");
 const viem_1 = require("viem");
 const constants_js_1 = require("../constants.js");
 const index_js_1 = require("../math/index.js");
-const utils_js_1 = require("../utils.js");
 /**
  * Namespace of utility functions to ease market-related calculations.
  */
@@ -52,35 +51,12 @@ var MarketUtils;
     }
     MarketUtils.getUtilization = getUtilization;
     /**
-     * Returns the rate at which interest accrued 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.
-     * @deprecated There's no such thing as a supply rate in Morpho. Only the supply APY is meaningful.
-     */
-    function getSupplyRate(borrowRate, { utilization, fee }) {
-        const borrowRateWithoutFees = index_js_1.MathLib.wMulUp(borrowRate, utilization);
-        return index_js_1.MathLib.wMulUp(borrowRateWithoutFees, index_js_1.MathLib.WAD - BigInt(fee));
-    }
-    MarketUtils.getSupplyRate = getSupplyRate;
-    /**
-     * Returns the per-second rate continuously compounded over the given period, as calculated in Morpho Blue (scaled by WAD).
-     * @param rate The per-second rate to compound (scaled by WAD).
-     * @param period The period to compound the rate over (in seconds). Defaults to 1 year.
-     * @deprecated The compounded rate is inaccurate if rate * period >> 0. If interested in the APY, use `rateToApy` instead.
-     */
-    function compoundRate(rate, period = constants_js_1.SECONDS_PER_YEAR) {
-        return index_js_1.MathLib.wTaylorCompounded(rate, period);
-    }
-    MarketUtils.compoundRate = compoundRate;
-    /**
-     * Returns the per-second rate continuously compounded over a year (scaled by WAD),
+     * Returns the per-second rate continuously compounded over a year,
      * as calculated in Morpho Blue assuming the market is frequently accrued onchain.
-     * @param rate The per-second rate to compound annually (scaled by WAD).
+     * @param rate The per-second rate to compound annually.
      */
-    // TODO: return a Number for APYs.
     function rateToApy(rate) {
-        return (0, utils_js_1.safeParseNumber)(Math.expm1(+(0, viem_1.formatEther)(BigInt(rate) * constants_js_1.SECONDS_PER_YEAR)));
+        return Math.expm1(+(0, viem_1.formatEther)(BigInt(rate) * constants_js_1.SECONDS_PER_YEAR));
     }
     MarketUtils.rateToApy = rateToApy;
     /**

package/lib/types.d.ts

@@ -23,5 +23,4 @@ export declare enum TransactionType {
 export type Loadable<T> = T | undefined;
 export type Failable<T> = T | null;
 export type Fetchable<T> = Failable<Loadable<T>>;
-export declare function isFetched<T>(v: Fetchable<T>): v is T;
 export declare const isMarketId: (value: unknown) => value is MarketId;

package/lib/types.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isMarketId = exports.TransactionType = void 0;
-exports.isFetched = isFetched;
 /**
  * The possible transaction type on the Blue contract
  */
@@ -14,9 +13,5 @@ var TransactionType;
     TransactionType["Borrow"] = "Borrow";
     TransactionType["Repay"] = "Repay";
 })(TransactionType || (exports.TransactionType = TransactionType = {}));
-// TODO: replace with isDefined
-function isFetched(v) {
-    return v !== undefined && v !== null;
-}
 const isMarketId = (value) => typeof value === "string" && /^0x[0-9A-Fa-f]{64}$/.test(value);
 exports.isMarketId = isMarketId;

package/lib/utils.d.ts

@@ -11,5 +11,3 @@ export interface CapacityLimit {
     value: bigint;
     limiter: CapacityLimitReason;
 }
-export declare const safeParseNumber: (value: number, decimals?: number) => bigint;
-export declare const safeParseUnits: (strValue: string, decimals?: number) => bigint;

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeParseUnits = exports.safeParseNumber = exports.CapacityLimitReason = void 0;
+exports.CapacityLimitReason = void 0;
 var CapacityLimitReason;
 (function (CapacityLimitReason) {
     CapacityLimitReason["liquidity"] = "Liquidity";
@@ -11,67 +11,3 @@ var CapacityLimitReason;
     CapacityLimitReason["vaultV2_absoluteCap"] = "VaultV2_AbsoluteCap";
     CapacityLimitReason["vaultV2_relativeCap"] = "VaultV2_RelativeCap";
 })(CapacityLimitReason || (exports.CapacityLimitReason = CapacityLimitReason = {}));
-// Alternative to Number.toFixed that doesn't use scientific notation for excessively small or large numbers.
-const toFixed = (x, decimals) => new Intl.NumberFormat("en-US", {
-    style: "decimal",
-    useGrouping: false,
-    maximumFractionDigits: decimals,
-    minimumFractionDigits: decimals,
-}).format(x);
-const safeParseNumber = (value, decimals = 18) => (0, exports.safeParseUnits)(toFixed(value, decimals), decimals);
-exports.safeParseNumber = safeParseNumber;
-const safeParseUnits = (strValue, decimals = 18) => {
-    if (!/[-+]?[0-9]*\.?[0-9]+/.test(strValue))
-        throw Error(`invalid number: ${strValue}`);
-    let [whole, dec = ""] = strValue.split(".");
-    dec = dec.slice(0, decimals);
-    return parseUnits([whole || "0", dec].filter((v) => v.length > 0).join("."), decimals);
-};
-exports.safeParseUnits = safeParseUnits;
-/**
- * Multiplies a string representation of a number by a given exponent of base 10 (10exponent).
- *
- * - Docs: https://viem.sh/docs/utilities/parseUnits
- *
- * @example
- * import { parseUnits } from 'viem'
- *
- * parseUnits('420', 9)
- * // 420000000000n
- */
-// TODO: get rid of this copy.
-function parseUnits(value, decimals) {
-    let [integer, fraction = "0"] = value.split(".");
-    const negative = integer.startsWith("-");
-    if (negative)
-        integer = integer.slice(1);
-    // trim trailing zeros.
-    fraction = fraction.replace(/(0+)$/, "");
-    // round off if the fraction is larger than the number of decimals.
-    if (decimals === 0) {
-        if (Math.round(Number(`.${fraction}`)) === 1)
-            integer = `${BigInt(integer) + 1n}`;
-        fraction = "";
-    }
-    else if (fraction.length > decimals) {
-        const [left, unit, right] = [
-            fraction.slice(0, decimals - 1),
-            fraction.slice(decimals - 1, decimals),
-            fraction.slice(decimals),
-        ];
-        const rounded = Math.round(Number(`${unit}.${right}`));
-        if (rounded > 9)
-            fraction = `${BigInt(left) + BigInt(1)}0`.padStart(left.length + 1, "0");
-        else
-            fraction = `${left}${rounded}`;
-        if (fraction.length > decimals) {
-            fraction = fraction.slice(1);
-            integer = `${BigInt(integer) + 1n}`;
-        }
-        fraction = fraction.slice(0, decimals);
-    }
-    else {
-        fraction = fraction.padEnd(decimals, "0");
-    }
-    return BigInt(`${negative ? "-" : ""}${integer}${fraction}`);
-}

package/lib/vault/Vault.d.ts

@@ -149,28 +149,34 @@ export declare class AccrualVault extends Vault implements IAccrualVault {
     get liquidity(): bigint;
     /**
      * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
-     * weighted-averaged over its market deposits, before deducting the performance fee (scaled by WAD).
+     * weighted-averaged over its market deposits, before deducting the performance fee.
      * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
-    get apy(): bigint;
+    get apy(): number;
     /**
      * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
-     * weighted-averaged over its market deposits, after deducting the performance fee (scaled by WAD).
-     * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
+     * weighted-averaged over its market deposits, after deducting the performance fee.
+     * If interested in the APY at a specific timestamp, use `getNetApy(timestamp)` instead.
+     */
+    get netApy(): number;
+    /**
+     * The MetaMorpho vault's per-second rate at which interest _would_ accrue,
+     * weighted-averaged over its market deposits, before deducting the performance fee,
+     * if interest was to be accrued on each market at the given timestamp.
      */
-    get netApy(): bigint;
+    private _getAvgRate;
     /**
      * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
      * weighted-averaged over its market deposits, before deducting the performance fee,
-     * if interest was to be accrued on each market at the given timestamp (scaled by WAD).
+     * if interest was to be accrued on each market at the given timestamp.
      */
-    getApy(timestamp?: BigIntish): bigint;
+    getApy(timestamp?: BigIntish): number;
     /**
      * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
      * weighted-averaged over its market deposits, after deducting the performance fee,
-     * if interest was to be accrued on each market at the given timestamp (scaled by WAD).
+     * if interest was to be accrued on each market at the given timestamp.
      */
-    getNetApy(timestamp?: BigIntish): bigint;
+    getNetApy(timestamp?: BigIntish): number;
     getAllocationProportion(marketId: MarketId): bigint;
     /**
      * Returns the deposit capacity limit of a given amount of assets on the vault.

package/lib/vault/Vault.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccrualVault = exports.Vault = void 0;
 const morpho_ts_1 = require("@morpho-org/morpho-ts");
-const index_js_1 = require("../math/index.js");
-const index_js_2 = require("../token/index.js");
+const index_js_1 = require("../market/index.js");
+const index_js_2 = require("../math/index.js");
+const index_js_3 = require("../token/index.js");
 const utils_js_1 = require("../utils.js");
 const VaultMarketAllocation_js_1 = require("./VaultMarketAllocation.js");
-class Vault extends index_js_2.VaultToken {
+class Vault extends index_js_3.VaultToken {
     /**
      * The MetaMorpho vault's owner address.
      */
@@ -93,7 +94,7 @@ class Vault extends index_js_2.VaultToken {
      * The amount of interest in assets accrued since the last interaction with the vault.
      */
     get totalInterest() {
-        return index_js_1.MathLib.zeroFloorSub(this.totalAssets, this.lastTotalAssets);
+        return index_js_2.MathLib.zeroFloorSub(this.totalAssets, this.lastTotalAssets);
     }
     toAssets(shares, rounding = "Down") {
         return this._unwrap(shares, rounding);
@@ -155,7 +156,7 @@ class AccrualVault extends Vault {
     }
     /**
      * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
-     * weighted-averaged over its market deposits, before deducting the performance fee (scaled by WAD).
+     * weighted-averaged over its market deposits, before deducting the performance fee.
      * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
     get apy() {
@@ -163,32 +164,42 @@ class AccrualVault extends Vault {
     }
     /**
      * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
-     * weighted-averaged over its market deposits, after deducting the performance fee (scaled by WAD).
-     * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
+     * weighted-averaged over its market deposits, after deducting the performance fee.
+     * If interested in the APY at a specific timestamp, use `getNetApy(timestamp)` instead.
      */
     get netApy() {
         return this.getNetApy();
     }
     /**
-     * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
+     * The MetaMorpho vault's per-second rate at which interest _would_ accrue,
      * weighted-averaged over its market deposits, before deducting the performance fee,
-     * if interest was to be accrued on each market at the given timestamp (scaled by WAD).
+     * if interest was to be accrued on each market at the given timestamp.
      */
-    getApy(timestamp = morpho_ts_1.Time.timestamp()) {
+    _getAvgRate(timestamp = morpho_ts_1.Time.timestamp()) {
         if (this.totalAssets === 0n)
             return 0n;
         return (this.allocations
             .values()
             .reduce((total, { position }) => total +
-            position.market.getAvgSupplyApy(timestamp) * position.supplyAssets, 0n) / this.totalAssets);
+            position.market.getAvgSupplyRate(timestamp) * position.supplyAssets, 0n) / this.totalAssets);
+    }
+    /**
+     * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
+     * weighted-averaged over its market deposits, before deducting the performance fee,
+     * if interest was to be accrued on each market at the given timestamp.
+     */
+    getApy(timestamp = morpho_ts_1.Time.timestamp()) {
+        if (this.totalAssets === 0n)
+            return 0;
+        return index_js_1.MarketUtils.rateToApy(this._getAvgRate(timestamp));
     }
     /**
      * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
      * weighted-averaged over its market deposits, after deducting the performance fee,
-     * if interest was to be accrued on each market at the given timestamp (scaled by WAD).
+     * if interest was to be accrued on each market at the given timestamp.
      */
     getNetApy(timestamp = morpho_ts_1.Time.timestamp()) {
-        return index_js_1.MathLib.wMulDown(this.getApy(timestamp), index_js_1.MathLib.WAD - this.fee);
+        return index_js_1.MarketUtils.rateToApy(index_js_2.MathLib.wMulDown(this._getAvgRate(timestamp), index_js_2.MathLib.WAD - this.fee));
     }
     getAllocationProportion(marketId) {
         if (this.totalAssets === 0n)
@@ -196,7 +207,7 @@ class AccrualVault extends Vault {
         const allocation = this.allocations.get(marketId);
         if (!allocation)
             return 0n;
-        return index_js_1.MathLib.wDivDown(allocation.position.supplyAssets, this.totalAssets);
+        return index_js_2.MathLib.wDivDown(allocation.position.supplyAssets, this.totalAssets);
     }
     /**
      * Returns the deposit capacity limit of a given amount of assets on the vault.
@@ -222,10 +233,10 @@ class AccrualVault extends Vault {
         assets = BigInt(assets);
         const suppliable = this.allocations
             .values()
-            .reduce((total, { config: { cap }, position: { marketId, supplyAssets } }) => index_js_1.MathLib.min(total +
+            .reduce((total, { config: { cap }, position: { marketId, supplyAssets } }) => index_js_2.MathLib.min(total +
             (this.supplyQueue.includes(marketId)
-                ? index_js_1.MathLib.zeroFloorSub(cap, supplyAssets)
-                : 0n), index_js_1.MathLib.MAX_UINT_256), 0n);
+                ? index_js_2.MathLib.zeroFloorSub(cap, supplyAssets)
+                : 0n), index_js_2.MathLib.MAX_UINT_256), 0n);
         if (assets > suppliable)
             return {
                 value: suppliable,
@@ -268,10 +279,10 @@ class AccrualVault extends Vault {
             };
         }));
         if (vault.lostAssets != null) {
-            vault.lostAssets += index_js_1.MathLib.max(vault.lastTotalAssets - vault.lostAssets - vault.totalAssets, 0n);
+            vault.lostAssets += index_js_2.MathLib.max(vault.lastTotalAssets - vault.lostAssets - vault.totalAssets, 0n);
             vault.totalAssets += vault.lostAssets;
         }
-        const feeAssets = index_js_1.MathLib.wMulDown(vault.totalInterest, vault.fee);
+        const feeAssets = index_js_2.MathLib.wMulDown(vault.totalInterest, vault.fee);
         vault.totalAssets -= feeAssets;
         const feeShares = vault.toShares(feeAssets, "Down");
         vault.totalAssets += feeAssets;

package/lib/vault/VaultMarketAllocation.d.ts

@@ -1,7 +1,7 @@
 import type { AccrualPosition } from "../position/index.js";
-import type { VaultMarketConfig } from "./VaultMarketConfig.js";
+import { type IVaultMarketConfig, VaultMarketConfig } from "./VaultMarketConfig.js";
 export interface IVaultMarketAllocation {
-    config: VaultMarketConfig;
+    config: IVaultMarketConfig;
     position: AccrualPosition;
 }
 export declare class VaultMarketAllocation implements IVaultMarketAllocation {

package/lib/vault/VaultMarketAllocation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VaultMarketAllocation = void 0;
 const index_js_1 = require("../math/index.js");
+const VaultMarketConfig_js_1 = require("./VaultMarketConfig.js");
 class VaultMarketAllocation {
     /**
      * The vault's configuration on the corresponding market.
@@ -12,7 +13,7 @@ class VaultMarketAllocation {
      */
     position;
     constructor({ config, position }) {
-        this.config = config;
+        this.config = new VaultMarketConfig_js_1.VaultMarketConfig(config);
         this.position = position;
     }
     get vault() {

package/lib/vault/v2/VaultV2.js

@@ -88,14 +88,15 @@ class AccrualVaultV2 extends VaultV2 {
                     value: absoluteMaxDeposit,
                     limiter: utils_1.CapacityLimitReason.vaultV2_absoluteCap,
                 };
-            // `relativeCap` can be set lower than `allocation / totalAssets`.
-            const relativeMaxDeposit = math_1.MathLib.zeroFloorSub(math_1.MathLib.wMulDown(this.totalAssets, relativeCap), allocation);
-            if (liquidityAdapterLimit.value > relativeMaxDeposit &&
-                relativeCap !== math_1.MathLib.WAD)
-                return {
-                    value: relativeMaxDeposit,
-                    limiter: utils_1.CapacityLimitReason.vaultV2_relativeCap,
-                };
+            if (relativeCap !== math_1.MathLib.WAD) {
+                // `relativeCap` can be set lower than `allocation / totalAssets`.
+                const relativeMaxDeposit = math_1.MathLib.zeroFloorSub(math_1.MathLib.wMulDown(this.totalAssets, relativeCap), allocation);
+                if (liquidityAdapterLimit.value > relativeMaxDeposit)
+                    return {
+                        value: relativeMaxDeposit,
+                        limiter: utils_1.CapacityLimitReason.vaultV2_relativeCap,
+                    };
+            }
         }
         return liquidityAdapterLimit;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morpho-org/blue-sdk",
   "description": "Framework-agnostic package that defines Morpho-related entity classes (such as `Market`, `Token`, `Vault`).",
-  "version": "5.2.0-next.0",
+  "version": "5.2.0-next.1",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"