@morpho-org/blue-sdk 4.14.0-next.2 → 5.0.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;
@@ -49,6 +25,8 @@ export interface ChainAddresses {
     adaptiveCurveIrm: Address;
     publicAllocator?: Address;
     metaMorphoFactory?: Address;
+    vaultV2Factory?: Address;
+    morphoVaultV1AdapterFactory?: Address;
     registryList?: Address;
     chainlinkOracleFactory?: Address;
     preLiquidationFactory?: Address;
@@ -64,17 +42,11 @@ export interface ChainAddresses {
     usdc?: Address;
     stEth?: Address;
     wstEth?: Address;
-    vaultV2Factory?: Address;
-    morphoVaultV1AdapterFactory?: Address;
 }
 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,29 +60,11 @@ 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";
+        readonly vaultV2Factory: "0xA1D94F746dEfa1928926b84fB2596c06926C0405";
+        readonly morphoVaultV1AdapterFactory: "0xD1B8E2dee25c2b89DCD2f98448a7ce87d6F63394";
         readonly registryList: "0x3696c5eAe4a7Ffd04Ea163564571E9CD8Ed9364e";
         readonly chainlinkOracleFactory: "0x3A7bB36Ee3f3eE32A60e9f2b33c1e5f2E83ad766";
         readonly preLiquidationFactory: "0x6FF33615e792E35ed1026ea7cACCf42D9BF83476";
@@ -141,16 +95,10 @@ declare const _addressesRegistry: {
         readonly crvUSDETHCRV: "0x4eBdF703948ddCEA3B11f675B4D1Fba9d2414A14";
         readonly "stkcvx2BTC-f-morpho": "0x385E12cf4040543Bc8C18e05C1298Be5B04f3f5e";
         readonly "2BTC-f": "0xB7ECB2AA52AA64a717180E030241bC75Cd946726";
-        readonly vaultV2Factory: "0xA1D94F746dEfa1928926b84fB2596c06926C0405";
-        readonly morphoVaultV1AdapterFactory: "0xD1B8E2dee25c2b89DCD2f98448a7ce87d6F63394";
     };
     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,21 +107,11 @@ 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";
+        readonly vaultV2Factory: "0x4501125508079A99ebBebCE205DeC9593C2b5857";
+        readonly morphoVaultV1AdapterFactory: "0xF42D9c36b34c9c2CF3Bc30eD2a52a90eEB604642";
         readonly registryList: "0x5C2531Cbd2cf112Cf687da3Cd536708aDd7DB10a";
         readonly chainlinkOracleFactory: "0x2DC205F24BCb6B311E5cdf0745B0741648Aebd3d";
         readonly preLiquidationFactory: "0x8cd16b62E170Ee0bA83D80e1F80E6085367e2aef";
@@ -181,8 +119,6 @@ declare const _addressesRegistry: {
         readonly usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
         readonly verUsdc: "0x59aaF835D34b1E3dF2170e4872B785f11E2a964b";
         readonly testUsdc: "0xBC77067f829979812d795d516E523C4033b66409";
-        readonly vaultV2Factory: "0x4501125508079A99ebBebCE205DeC9593C2b5857";
-        readonly morphoVaultV1AdapterFactory: "0xF42D9c36b34c9c2CF3Bc30eD2a52a90eEB604642";
     };
     readonly 137: {
         readonly morpho: "0x1bF0c2541F820E775182832f06c0B7Fc27A25f67";
@@ -494,11 +430,11 @@ declare const _deployments: {
         readonly adaptiveCurveIrm: 18883124n;
         readonly publicAllocator: 19375099n;
         readonly metaMorphoFactory: 21439510n;
+        readonly vaultV2Factory: 23375073n;
+        readonly morphoVaultV1AdapterFactory: 23375073n;
         readonly registryList: 23375119n;
         readonly chainlinkOracleFactory: 19375066n;
         readonly preLiquidationFactory: 21414664n;
-        readonly vaultV2Factory: 23375073n;
-        readonly morphoVaultV1AdapterFactory: 23375073n;
     };
     readonly 8453: {
         readonly morpho: 13977148n;
@@ -514,11 +450,11 @@ declare const _deployments: {
         readonly adaptiveCurveIrm: 13977152n;
         readonly publicAllocator: 13979545n;
         readonly metaMorphoFactory: 23928808n;
+        readonly vaultV2Factory: 35615206n;
+        readonly morphoVaultV1AdapterFactory: 35615206n;
         readonly registryList: 35615358n;
         readonly chainlinkOracleFactory: 13978286n;
         readonly preLiquidationFactory: 23779056n;
-        readonly vaultV2Factory: 35615206n;
-        readonly morphoVaultV1AdapterFactory: 35615206n;
     };
     readonly 137: {
         readonly morpho: 66931042n;
@@ -809,10 +745,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,29 +758,11 @@ 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";
+        readonly vaultV2Factory: "0xA1D94F746dEfa1928926b84fB2596c06926C0405";
+        readonly morphoVaultV1AdapterFactory: "0xD1B8E2dee25c2b89DCD2f98448a7ce87d6F63394";
         readonly registryList: "0x3696c5eAe4a7Ffd04Ea163564571E9CD8Ed9364e";
         readonly chainlinkOracleFactory: "0x3A7bB36Ee3f3eE32A60e9f2b33c1e5f2E83ad766";
         readonly preLiquidationFactory: "0x6FF33615e792E35ed1026ea7cACCf42D9BF83476";
@@ -879,16 +793,10 @@ export declare let addressesRegistry: {
         readonly crvUSDETHCRV: "0x4eBdF703948ddCEA3B11f675B4D1Fba9d2414A14";
         readonly "stkcvx2BTC-f-morpho": "0x385E12cf4040543Bc8C18e05C1298Be5B04f3f5e";
         readonly "2BTC-f": "0xB7ECB2AA52AA64a717180E030241bC75Cd946726";
-        readonly vaultV2Factory: "0xA1D94F746dEfa1928926b84fB2596c06926C0405";
-        readonly morphoVaultV1AdapterFactory: "0xD1B8E2dee25c2b89DCD2f98448a7ce87d6F63394";
     };
     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,21 +805,11 @@ 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";
+        readonly vaultV2Factory: "0x4501125508079A99ebBebCE205DeC9593C2b5857";
+        readonly morphoVaultV1AdapterFactory: "0xF42D9c36b34c9c2CF3Bc30eD2a52a90eEB604642";
         readonly registryList: "0x5C2531Cbd2cf112Cf687da3Cd536708aDd7DB10a";
         readonly chainlinkOracleFactory: "0x2DC205F24BCb6B311E5cdf0745B0741648Aebd3d";
         readonly preLiquidationFactory: "0x8cd16b62E170Ee0bA83D80e1F80E6085367e2aef";
@@ -919,8 +817,6 @@ export declare let addressesRegistry: {
         readonly usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
         readonly verUsdc: "0x59aaF835D34b1E3dF2170e4872B785f11E2a964b";
         readonly testUsdc: "0xBC77067f829979812d795d516E523C4033b66409";
-        readonly vaultV2Factory: "0x4501125508079A99ebBebCE205DeC9593C2b5857";
-        readonly morphoVaultV1AdapterFactory: "0xF42D9c36b34c9c2CF3Bc30eD2a52a90eEB604642";
     };
     readonly 137: {
         readonly morpho: "0x1bF0c2541F820E775182832f06c0B7Fc27A25f67";
@@ -1230,11 +1126,11 @@ export declare let deployments: {
         readonly adaptiveCurveIrm: 18883124n;
         readonly publicAllocator: 19375099n;
         readonly metaMorphoFactory: 21439510n;
+        readonly vaultV2Factory: 23375073n;
+        readonly morphoVaultV1AdapterFactory: 23375073n;
         readonly registryList: 23375119n;
         readonly chainlinkOracleFactory: 19375066n;
         readonly preLiquidationFactory: 21414664n;
-        readonly vaultV2Factory: 23375073n;
-        readonly morphoVaultV1AdapterFactory: 23375073n;
     };
     readonly 8453: {
         readonly morpho: 13977148n;
@@ -1250,11 +1146,11 @@ export declare let deployments: {
         readonly adaptiveCurveIrm: 13977152n;
         readonly publicAllocator: 13979545n;
         readonly metaMorphoFactory: 23928808n;
+        readonly vaultV2Factory: 35615206n;
+        readonly morphoVaultV1AdapterFactory: 35615206n;
         readonly registryList: 35615358n;
         readonly chainlinkOracleFactory: 13978286n;
         readonly preLiquidationFactory: 23779056n;
-        readonly vaultV2Factory: 35615206n;
-        readonly morphoVaultV1AdapterFactory: 35615206n;
     };
     readonly 137: {
         readonly morpho: 66931042n;

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,11 @@ 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",
+        morphoVaultV1AdapterFactory: "0xD1B8E2dee25c2b89DCD2f98448a7ce87d6F63394",
         registryList: "0x3696c5eAe4a7Ffd04Ea163564571E9CD8Ed9364e",
         chainlinkOracleFactory: "0x3A7bB36Ee3f3eE32A60e9f2b33c1e5f2E83ad766",
         preLiquidationFactory: "0x6FF33615e792E35ed1026ea7cACCf42D9BF83476",
@@ -96,16 +74,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 +86,11 @@ 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",
+        morphoVaultV1AdapterFactory: "0xF42D9c36b34c9c2CF3Bc30eD2a52a90eEB604642",
         registryList: "0x5C2531Cbd2cf112Cf687da3Cd536708aDd7DB10a",
         chainlinkOracleFactory: "0x2DC205F24BCb6B311E5cdf0745B0741648Aebd3d",
         preLiquidationFactory: "0x8cd16b62E170Ee0bA83D80e1F80E6085367e2aef",
@@ -137,8 +99,6 @@ const _addressesRegistry = {
         usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
         verUsdc: "0x59aaF835D34b1E3dF2170e4872B785f11E2a964b",
         testUsdc: "0xBC77067f829979812d795d516E523C4033b66409",
-        vaultV2Factory: "0x4501125508079A99ebBebCE205DeC9593C2b5857",
-        morphoVaultV1AdapterFactory: "0xF42D9c36b34c9c2CF3Bc30eD2a52a90eEB604642",
     },
     [chain_js_1.ChainId.PolygonMainnet]: {
         morpho: "0x1bF0c2541F820E775182832f06c0B7Fc27A25f67",
@@ -456,11 +416,11 @@ const _deployments = {
         adaptiveCurveIrm: 18883124n,
         publicAllocator: 19375099n,
         metaMorphoFactory: 21439510n,
+        vaultV2Factory: 23375073n,
+        morphoVaultV1AdapterFactory: 23375073n,
         registryList: 23375119n,
         chainlinkOracleFactory: 19375066n,
         preLiquidationFactory: 21414664n,
-        vaultV2Factory: 23375073n,
-        morphoVaultV1AdapterFactory: 23375073n,
     },
     [chain_js_1.ChainId.BaseMainnet]: {
         morpho: 13977148n,
@@ -476,11 +436,11 @@ const _deployments = {
         adaptiveCurveIrm: 13977152n,
         publicAllocator: 13979545n,
         metaMorphoFactory: 23928808n,
+        vaultV2Factory: 35615206n,
+        morphoVaultV1AdapterFactory: 35615206n,
         registryList: 35615358n,
         chainlinkOracleFactory: 13978286n,
         preLiquidationFactory: 23779056n,
-        vaultV2Factory: 35615206n,
-        morphoVaultV1AdapterFactory: 35615206n,
     },
     [chain_js_1.ChainId.PolygonMainnet]: {
         morpho: 66931042n,

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,14 +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);
-    }
-}
 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,21 +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;
-})(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

@@ -98,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).
+     * 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).
@@ -137,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).
@@ -183,36 +169,36 @@ 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;
     /**
      * 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

@@ -4,6 +4,7 @@ exports.Market = exports.CapacityLimitReason = void 0;
 const morpho_ts_1 = require("@morpho-org/morpho-ts");
 const errors_js_1 = require("../errors.js");
 const index_js_1 = require("../math/index.js");
+const viem_1 = require("viem");
 const MarketParams_js_1 = require("./MarketParams.js");
 const MarketUtils_js_1 = require("./MarketUtils.js");
 var CapacityLimitReason;
@@ -94,27 +95,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).
@@ -145,25 +132,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).
@@ -211,7 +192,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).
@@ -222,18 +203,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);
+        return (borrowApy * +(0, viem_1.formatEther)(this.utilization) * (1 - +(0, viem_1.formatEther)(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).
@@ -244,14 +225,14 @@ class Market {
     }
     /**
      * 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 (borrowApy * +(0, viem_1.formatEther)(this.utilization) * (1 - +(0, viem_1.formatEther)(this.fee)));
     }
     /**
      * 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/vault/Vault.d.ts

@@ -149,28 +149,28 @@ 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).
+     * weighted-averaged over its market deposits, after deducting the performance fee.
      * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
-    get netApy(): bigint;
+    get netApy(): number;
     /**
      * 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;
     getDepositCapacityLimit(assets: bigint): CapacityLimit;
     getWithdrawCapacityLimit(shares: bigint): CapacityLimit;

package/lib/vault/Vault.js

@@ -5,6 +5,7 @@ const morpho_ts_1 = require("@morpho-org/morpho-ts");
 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 viem_1 = require("viem");
 const VaultMarketAllocation_js_1 = require("./VaultMarketAllocation.js");
 class Vault extends index_js_3.VaultToken {
     /**
@@ -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,7 +164,7 @@ 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).
+     * weighted-averaged over its market deposits, after deducting the performance fee.
      * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
     get netApy() {
@@ -172,23 +173,24 @@ class AccrualVault extends Vault {
     /**
      * 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 = morpho_ts_1.Time.timestamp()) {
         if (this.totalAssets === 0n)
-            return 0n;
+            return 0;
         return (this.allocations
             .values()
             .reduce((total, { position }) => total +
-            position.market.getAvgSupplyApy(timestamp) * position.supplyAssets, 0n) / this.totalAssets);
+            position.market.getAvgSupplyApy(timestamp) *
+                Number(position.supplyAssets), 0) / Number(this.totalAssets));
     }
     /**
      * 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_2.MathLib.wMulDown(this.getApy(timestamp), index_js_2.MathLib.WAD - this.fee);
+        return this.getApy(timestamp) * (1 - +(0, viem_1.formatEther)(this.fee));
     }
     getAllocationProportion(marketId) {
         if (this.totalAssets === 0n)

package/lib/vault/index.d.ts

@@ -5,4 +5,3 @@ export * from "./VaultMarketConfig.js";
 export * from "./VaultMarketPublicAllocatorConfig.js";
 export * from "./VaultUser.js";
 export * from "./Vault.js";
-export * from "./v2";

package/lib/vault/index.js

@@ -21,4 +21,3 @@ __exportStar(require("./VaultMarketConfig.js"), exports);
 __exportStar(require("./VaultMarketPublicAllocatorConfig.js"), exports);
 __exportStar(require("./VaultUser.js"), exports);
 __exportStar(require("./Vault.js"), exports);
-__exportStar(require("./v2"), exports);

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": "4.14.0-next.2",
+  "version": "5.0.1",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -29,10 +29,10 @@
   },
   "devDependencies": {
     "typescript": "^5.7.2",
-    "viem": "^2.33.3",
+    "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/morpho-ts": "^2.4.3",
-    "@morpho-org/test": "^2.6.0"
+    "@morpho-org/test": "^2.6.0",
+    "@morpho-org/morpho-ts": "^2.4.3"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",

package/lib/utils.d.ts

@@ -1,2 +0,0 @@
-export declare const safeParseNumber: (value: number, decimals?: number) => bigint;
-export declare const safeParseUnits: (strValue: string, decimals?: number) => bigint;

package/lib/utils.js

@@ -1,67 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeParseUnits = exports.safeParseNumber = void 0;
-// 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/v2/VaultV2.d.ts

@@ -1,65 +0,0 @@
-import type { Address } from "viem";
-import { type RoundingDirection } from "../../math";
-import { type IToken, WrappedToken } from "../../token";
-import type { BigIntish } from "../../types";
-import type { IAccrualVaultV2Adapter } from "./VaultV2Adapter";
-export interface IVaultV2 extends IToken {
-    asset: Address;
-    /**
-     * The total assets, *including* virtually accrued interest.
-     */
-    totalAssets: bigint;
-    /**
-     * The total assets, *excluding* virtually accrued interest.
-     */
-    _totalAssets: bigint;
-    /**
-     * The total supply of shares.
-     */
-    totalSupply: bigint;
-    virtualShares: bigint;
-    maxRate: bigint;
-    lastUpdate: bigint;
-    adapters: Address[];
-    liquidityAdapter: Address;
-    performanceFee: bigint;
-    managementFee: bigint;
-    performanceFeeRecipient: Address;
-    managementFeeRecipient: Address;
-}
-export declare class VaultV2 extends WrappedToken implements IVaultV2 {
-    readonly asset: Address;
-    totalAssets: bigint;
-    _totalAssets: bigint;
-    totalSupply: bigint;
-    virtualShares: bigint;
-    maxRate: bigint;
-    lastUpdate: bigint;
-    adapters: Address[];
-    liquidityAdapter: Address;
-    performanceFee: bigint;
-    managementFee: bigint;
-    performanceFeeRecipient: Address;
-    managementFeeRecipient: Address;
-    constructor({ asset, totalAssets, _totalAssets, totalSupply, virtualShares, lastUpdate, adapters, maxRate, performanceFee, managementFee, liquidityAdapter, performanceFeeRecipient, managementFeeRecipient, ...config }: IVaultV2);
-    toAssets(shares: bigint): bigint;
-    toShares(assets: bigint): bigint;
-    protected _wrap(amount: bigint, rounding: RoundingDirection): bigint;
-    protected _unwrap(amount: bigint, rounding: RoundingDirection): bigint;
-}
-export interface IAccrualVaultV2 extends Omit<IVaultV2, "adapters"> {
-}
-export declare class AccrualVaultV2 extends VaultV2 implements IAccrualVaultV2 {
-    readonly accrualAdapters: IAccrualVaultV2Adapter[];
-    readonly assetBalance: bigint;
-    constructor(vault: IAccrualVaultV2, accrualAdapters: IAccrualVaultV2Adapter[], assetBalance: bigint);
-    /**
-     * Returns a new vault derived from this vault, whose interest has been accrued up to the given timestamp.
-     * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to the vault's `lastUpdate`.
-     */
-    accrueInterest(timestamp: BigIntish): {
-        vault: AccrualVaultV2;
-        performanceFeeShares: bigint;
-        managementFeeShares: bigint;
-    };
-}

package/lib/vault/v2/VaultV2.js

@@ -1,96 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccrualVaultV2 = exports.VaultV2 = void 0;
-const errors_1 = require("../../errors");
-const math_1 = require("../../math");
-const token_1 = require("../../token");
-class VaultV2 extends token_1.WrappedToken {
-    asset;
-    totalAssets;
-    _totalAssets;
-    totalSupply;
-    virtualShares;
-    maxRate;
-    lastUpdate;
-    adapters;
-    liquidityAdapter;
-    performanceFee;
-    managementFee;
-    performanceFeeRecipient;
-    managementFeeRecipient;
-    constructor({ asset, totalAssets, _totalAssets, totalSupply, virtualShares, lastUpdate, adapters, maxRate, performanceFee, managementFee, liquidityAdapter, performanceFeeRecipient, managementFeeRecipient, ...config }) {
-        super(config, asset);
-        this.asset = asset;
-        this.totalAssets = totalAssets;
-        this._totalAssets = _totalAssets;
-        this.totalSupply = totalSupply;
-        this.virtualShares = virtualShares;
-        this.maxRate = maxRate;
-        this.lastUpdate = lastUpdate;
-        this.adapters = adapters;
-        this.liquidityAdapter = liquidityAdapter;
-        this.performanceFee = performanceFee;
-        this.managementFee = managementFee;
-        this.performanceFeeRecipient = performanceFeeRecipient;
-        this.managementFeeRecipient = managementFeeRecipient;
-    }
-    toAssets(shares) {
-        return this._unwrap(shares, "Down");
-    }
-    toShares(assets) {
-        return this._wrap(assets, "Down");
-    }
-    _wrap(amount, rounding) {
-        return math_1.MathLib.mulDiv(amount, this.totalSupply + this.virtualShares, this.totalAssets + 1n, rounding);
-    }
-    _unwrap(amount, rounding) {
-        return math_1.MathLib.mulDiv(amount, this.totalAssets + 1n, this.totalSupply + this.virtualShares, rounding);
-    }
-}
-exports.VaultV2 = VaultV2;
-class AccrualVaultV2 extends VaultV2 {
-    accrualAdapters;
-    assetBalance;
-    constructor(vault, accrualAdapters, assetBalance) {
-        super({ ...vault, adapters: accrualAdapters.map((a) => a.address) });
-        this.accrualAdapters = accrualAdapters;
-        this.assetBalance = assetBalance;
-    }
-    /**
-     * Returns a new vault derived from this vault, whose interest has been accrued up to the given timestamp.
-     * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to the vault's `lastUpdate`.
-     */
-    accrueInterest(timestamp) {
-        const vault = new AccrualVaultV2(this, this.accrualAdapters, this.assetBalance);
-        timestamp = BigInt(timestamp);
-        const elapsed = timestamp - this.lastUpdate;
-        if (elapsed < 0n)
-            throw new errors_1.VaultV2Errors.InvalidInterestAccrual(this.address, timestamp, this.lastUpdate);
-        // Corresponds to the `firstTotalAssets == 0` onchain check.
-        if (elapsed === 0n)
-            return { vault, performanceFeeShares: 0n, managementFeeShares: 0n };
-        const realAssets = vault.accrualAdapters.reduce((curr, adapter) => curr + adapter.realAssets(timestamp), vault.assetBalance);
-        const maxTotalAssets = vault._totalAssets +
-            math_1.MathLib.wMulDown(vault._totalAssets * elapsed, vault.maxRate);
-        const newTotalAssets = math_1.MathLib.min(realAssets, maxTotalAssets);
-        const interest = math_1.MathLib.zeroFloorSub(newTotalAssets, vault._totalAssets);
-        const performanceFeeAssets = interest > 0n && vault.performanceFee > 0n
-            ? math_1.MathLib.wMulDown(interest, vault.performanceFee)
-            : 0n;
-        const managementFeeAssets = elapsed > 0n && vault.managementFee > 0n
-            ? math_1.MathLib.wMulDown(newTotalAssets * elapsed, vault.managementFee)
-            : 0n;
-        const newTotalAssetsWithoutFees = newTotalAssets - performanceFeeAssets - managementFeeAssets;
-        const performanceFeeShares = math_1.MathLib.mulDivDown(performanceFeeAssets, vault.totalSupply + vault.virtualShares, newTotalAssetsWithoutFees + 1n);
-        const managementFeeShares = math_1.MathLib.mulDivDown(managementFeeAssets, vault.totalSupply + vault.virtualShares, newTotalAssetsWithoutFees + 1n);
-        vault.totalAssets = newTotalAssets;
-        vault._totalAssets = newTotalAssets;
-        if (performanceFeeShares)
-            vault.totalSupply += performanceFeeShares;
-        if (managementFeeShares)
-            vault.totalSupply += managementFeeShares;
-        vault.lastUpdate = BigInt(timestamp);
-        return { vault, performanceFeeShares, managementFeeShares };
-    }
-}
-exports.AccrualVaultV2 = AccrualVaultV2;

package/lib/vault/v2/VaultV2Adapter.d.ts

@@ -1,18 +0,0 @@
-import type { Address, Hash } from "viem";
-import type { BigIntish } from "../../types";
-export interface IVaultV2Adapter {
-    address: Address;
-    parentVault: Address;
-    adapterId: Hash;
-    skimRecipient: Address;
-}
-export declare abstract class VaultV2Adapter implements IVaultV2Adapter {
-    readonly address: Address;
-    readonly parentVault: Address;
-    readonly adapterId: Hash;
-    skimRecipient: Address;
-    constructor({ address, parentVault, adapterId, skimRecipient, }: IVaultV2Adapter);
-}
-export interface IAccrualVaultV2Adapter extends IVaultV2Adapter {
-    realAssets(timestamp: BigIntish): bigint;
-}

package/lib/vault/v2/VaultV2Adapter.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultV2Adapter = void 0;
-class VaultV2Adapter {
-    address;
-    parentVault;
-    adapterId;
-    skimRecipient;
-    constructor({ address, parentVault, adapterId, skimRecipient, }) {
-        this.address = address;
-        this.parentVault = parentVault;
-        this.adapterId = adapterId;
-        this.skimRecipient = skimRecipient;
-    }
-}
-exports.VaultV2Adapter = VaultV2Adapter;

package/lib/vault/v2/VaultV2MorphoVaultV1Adapter.d.ts

@@ -1,21 +0,0 @@
-import type { Address } from "viem";
-import { VaultV2Adapter } from "./VaultV2Adapter";
-export interface IVaultV2MorphoVaultV1Adapter extends IVaultV2Adapter {
-    morphoVaultV1: Address;
-}
-import type { BigIntish } from "../../types";
-import type { AccrualVault } from "../Vault";
-import type { IAccrualVaultV2Adapter, IVaultV2Adapter } from "./VaultV2Adapter";
-export declare class VaultV2MorphoVaultV1Adapter extends VaultV2Adapter implements IVaultV2MorphoVaultV1Adapter {
-    readonly morphoVaultV1: Address;
-    constructor({ morphoVaultV1, ...vaultV2Adapter }: IVaultV2MorphoVaultV1Adapter);
-    ids(): `0x${string}`[];
-}
-export interface IAccrualVaultV2MorphoVaultV1Adapter extends IVaultV2MorphoVaultV1Adapter {
-}
-export declare class AccrualVaultV2MorphoVaultV1Adapter extends VaultV2MorphoVaultV1Adapter implements IAccrualVaultV2MorphoVaultV1Adapter, IAccrualVaultV2Adapter {
-    vaultV1: AccrualVault;
-    shares: bigint;
-    constructor(adapter: IAccrualVaultV2MorphoVaultV1Adapter, vaultV1: AccrualVault, shares: bigint);
-    realAssets(timestamp: BigIntish): bigint;
-}

package/lib/vault/v2/VaultV2MorphoVaultV1Adapter.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccrualVaultV2MorphoVaultV1Adapter = exports.VaultV2MorphoVaultV1Adapter = void 0;
-const VaultV2Adapter_1 = require("./VaultV2Adapter");
-class VaultV2MorphoVaultV1Adapter extends VaultV2Adapter_1.VaultV2Adapter {
-    morphoVaultV1;
-    constructor({ morphoVaultV1, ...vaultV2Adapter }) {
-        super(vaultV2Adapter);
-        this.morphoVaultV1 = morphoVaultV1;
-    }
-    ids() {
-        return [this.adapterId];
-    }
-}
-exports.VaultV2MorphoVaultV1Adapter = VaultV2MorphoVaultV1Adapter;
-class AccrualVaultV2MorphoVaultV1Adapter extends VaultV2MorphoVaultV1Adapter {
-    vaultV1;
-    shares;
-    constructor(adapter, vaultV1, shares) {
-        super(adapter);
-        this.vaultV1 = vaultV1;
-        this.shares = shares;
-    }
-    realAssets(timestamp) {
-        return this.vaultV1.accrueInterest(timestamp).toAssets(this.shares);
-    }
-}
-exports.AccrualVaultV2MorphoVaultV1Adapter = AccrualVaultV2MorphoVaultV1Adapter;

package/lib/vault/v2/index.d.ts

@@ -1,3 +0,0 @@
-export * from "./VaultV2.js";
-export * from "./VaultV2Adapter.js";
-export * from "./VaultV2MorphoVaultV1Adapter.js";

package/lib/vault/v2/index.js

@@ -1,19 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./VaultV2.js"), exports);
-__exportStar(require("./VaultV2Adapter.js"), exports);
-__exportStar(require("./VaultV2MorphoVaultV1Adapter.js"), exports);