@morpho-org/blue-sdk 1.5.5 → 1.5.7

package/lib/addresses.d.ts

@@ -24,6 +24,7 @@ export declare const addresses: {
         aaveV2Bundler: "0xb3dCc75DB379925edFd3007511A8CE0cB4aa8e76";
         aaveV3Bundler: "0x98ccB155E86bb478d514a827d16f58c6912f9BDC";
         compoundV3Bundler: "0x3a0e2E9FB9c95fBc843daF166276C90B6C479558";
+        compoundV2Bundler: "0x26bf52a84360ad3d01d7cdc28fc2ddc04d8c8647";
         adaptiveCurveIrm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC";
         publicAllocator: "0xfd32fA2ca22c76dD6E550706Ad913FC6CE91c75D";
         wNative: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2";
@@ -57,6 +58,7 @@ export declare const addresses: {
         morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb";
         permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3";
         bundler: "0x23055618898e202386e6c13955a58D3C68200BFB";
+        compoundV2Bundler: "0x123f3167a416cA19365dE03a65e0AF3532af7223";
         aaveV3Bundler: "0xcAe2929baBc60Be34818EaA5F40bF69265677108";
         compoundV3Bundler: "0x1f8076e2EB6f10b12e6886f30D4909A91969F7dA";
         adaptiveCurveIrm: "0x46415998764C29aB2a25CbeA6254146D50D22687";
@@ -75,6 +77,7 @@ export interface ChainAddresses {
     aaveV2Bundler?: Address;
     aaveV3Bundler?: Address;
     compoundV3Bundler?: Address;
+    compoundV2Bundler?: Address;
     adaptiveCurveIrm?: Address;
     publicAllocator?: Address;
     wNative: Address;

package/lib/addresses.js

@@ -29,6 +29,7 @@ exports.addresses = {
         aaveV2Bundler: "0xb3dCc75DB379925edFd3007511A8CE0cB4aa8e76",
         aaveV3Bundler: "0x98ccB155E86bb478d514a827d16f58c6912f9BDC",
         compoundV3Bundler: "0x3a0e2E9FB9c95fBc843daF166276C90B6C479558",
+        compoundV2Bundler: "0x26bf52a84360ad3d01d7cdc28fc2ddc04d8c8647",
         adaptiveCurveIrm: "0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC",
         publicAllocator: "0xfd32fA2ca22c76dD6E550706Ad913FC6CE91c75D",
         wNative: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
@@ -66,6 +67,7 @@ exports.addresses = {
         morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb",
         permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
         bundler: "0x23055618898e202386e6c13955a58D3C68200BFB",
+        compoundV2Bundler: "0x123f3167a416cA19365dE03a65e0AF3532af7223",
         aaveV3Bundler: "0xcAe2929baBc60Be34818EaA5F40bF69265677108",
         compoundV3Bundler: "0x1f8076e2EB6f10b12e6886f30D4909A91969F7dA",
         adaptiveCurveIrm: "0x46415998764C29aB2a25CbeA6254146D50D22687",

package/lib/maths/MathLib.d.ts

@@ -98,17 +98,17 @@ export declare class MathLib {
      */
     static wTaylorCompounded(x: BigIntish, n: BigIntish): bigint;
     /**
-     * Converts an apr to compounded apy
+     * Converts an rate to compounded apy
      *
-     * @param apr The rate to convert (in WAD)
-     * @param compounding The compounding basis
+     * @param rate The rate to convert (in WAD)
+     * @param period The compounding basis
      */
-    static rateToApy(rate: BigIntish, unit: Time.Unit): number;
+    static rateToApy(rate: BigIntish, period: Time.PeriodLike): number;
     /**
      * Converts an apr to compounded apy
      *
-     * @param apr The yearly apr to convert (in WAD)
+     * @param apr The apr to convert (in WAD)
      * @param compounding The compounding basis
      */
-    static aprToApy(apr: BigIntish, compounding: Time.Unit): number;
+    static aprToApy(apr: BigIntish, compounding: Time.PeriodLike): number;
 }

package/lib/maths/MathLib.js

@@ -149,24 +149,25 @@ class MathLib {
         return firstTerm + secondTerm + thirdTerm;
     }
     /**
-     * Converts an apr to compounded apy
+     * Converts an rate to compounded apy
      *
-     * @param apr The rate to convert (in WAD)
-     * @param compounding The compounding basis
+     * @param rate The rate to convert (in WAD)
+     * @param period The compounding basis
      */
-    static rateToApy(rate, unit) {
-        const factor = morpho_ts_1.Time[unit].from.y(1n);
-        return ((1 + Number(helpers_1.format.number.of(BigInt(rate), 18))) ** Number(factor) - 1);
+    static rateToApy(rate, period) {
+        const { unit, duration } = morpho_ts_1.Time.toPeriod(period);
+        const factor = morpho_ts_1.Time[unit].from.y(1) / duration;
+        return (1 + Number(helpers_1.format.number.of(BigInt(rate), 18))) ** factor - 1;
     }
     /**
      * Converts an apr to compounded apy
      *
-     * @param apr The yearly apr to convert (in WAD)
+     * @param apr The apr to convert (in WAD)
      * @param compounding The compounding basis
      */
     static aprToApy(apr, compounding) {
-        const factor = morpho_ts_1.Time[compounding].from.y(1n);
-        const rate = BigInt(apr) / factor;
+        const { unit, duration } = morpho_ts_1.Time.toPeriod(compounding);
+        const rate = (BigInt(apr) * BigInt(duration)) / morpho_ts_1.Time[unit].from.y(1n);
         return this.rateToApy(rate, compounding);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morpho-org/blue-sdk",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "author": "Morpho Association <contact@morpho.org>",
   "license": "MIT",
   "main": "lib/index.js",
@@ -16,8 +16,8 @@
     "keccak256": "^1.0.6"
   },
   "devDependencies": {
-    "@morpho-org/morpho-test": "^1.5.5",
-    "@morpho-org/morpho-ts": "^1.5.5",
+    "@morpho-org/morpho-test": "^1.5.7",
+    "@morpho-org/morpho-ts": "^1.5.7",
     "@types/jest": "^29.5.12",
     "@types/node": "^22.1.0",
     "jest": "^29.7.0",
@@ -25,7 +25,7 @@
     "typescript": "^5.4.5"
   },
   "peerDependencies": {
-    "@morpho-org/morpho-ts": "^1.5.5"
+    "@morpho-org/morpho-ts": "^1.5.7"
   },
   "publishConfig": {
     "access": "public"
@@ -49,5 +49,5 @@
     ],
     "preset": "ts-jest"
   },
-  "gitHead": "81bdd19a15cf63595baf5d6c13ba7dcbadec8300"
+  "gitHead": "5b9230f0f757e778701baa6d3203cdccbdb715c4"
 }