@morpho-org/blue-sdk 2.0.0-next.31 → 2.0.0-next.32

package/lib/market/Market.d.ts

@@ -102,21 +102,21 @@ export declare class Market implements InputMarket {
      */
     get apyAtTarget(): bigint | undefined;
     /**
-     * Returns the rate at which interest accrued on average for suppliers of this market,
+     * Returns the rate at which interest accrued for suppliers of this market,
      * since the last time the market was updated (scaled by WAD).
      */
     get supplyRate(): bigint;
     /**
-     * Returns the rate at which interest accrued on average for borrowers of this market,
+     * Returns the rate at which interest accrued for borrowers of this market,
      * since the last time the market was updated (scaled by WAD).
      */
     get borrowRate(): bigint;
     /**
-     * The market's supply Annual Percentage Yield (APY) (scaled by WAD).
+     * The market's supply-side Annual Percentage Yield (APY) (scaled by WAD).
      */
     get supplyApy(): bigint;
     /**
-     * The market's borrow Annual Percentage Yield (APY) (scaled by WAD).
+     * The market's borrow-side Annual Percentage Yield (APY) (scaled by WAD).
      */
     get borrowApy(): bigint;
     /**

package/lib/market/Market.js

@@ -98,17 +98,17 @@ class Market {
     get apyAtTarget() {
         if (this.rateAtTarget == null)
             return;
-        return MarketUtils_js_1.MarketUtils.getApy(this.rateAtTarget);
+        return MarketUtils_js_1.MarketUtils.compoundRate(this.rateAtTarget);
     }
     /**
-     * Returns the rate at which interest accrued on average for suppliers of this market,
+     * Returns the rate at which interest accrued for suppliers of this market,
      * since the last time the market was updated (scaled by WAD).
      */
     get supplyRate() {
         return MarketUtils_js_1.MarketUtils.getSupplyRate(this.borrowRate, this);
     }
     /**
-     * Returns the rate at which interest accrued on average for borrowers of this market,
+     * Returns the rate at which interest accrued for borrowers of this market,
      * since the last time the market was updated (scaled by WAD).
      */
     get borrowRate() {
@@ -117,16 +117,16 @@ class Market {
         return index_js_1.AdaptiveCurveIrmLib.getBorrowRate(this.utilization, this.rateAtTarget, 0n).avgBorrowRate;
     }
     /**
-     * The market's supply Annual Percentage Yield (APY) (scaled by WAD).
+     * The market's supply-side Annual Percentage Yield (APY) (scaled by WAD).
      */
     get supplyApy() {
-        return MarketUtils_js_1.MarketUtils.getApy(this.supplyRate);
+        return MarketUtils_js_1.MarketUtils.compoundRate(this.supplyRate);
     }
     /**
-     * The market's borrow Annual Percentage Yield (APY) (scaled by WAD).
+     * The market's borrow-side Annual Percentage Yield (APY) (scaled by WAD).
      */
     get borrowApy() {
-        return MarketUtils_js_1.MarketUtils.getApy(this.borrowRate);
+        return MarketUtils_js_1.MarketUtils.compoundRate(this.borrowRate);
     }
     /**
      * 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,7 +26,7 @@ export declare namespace MarketUtils {
         totalBorrowAssets: BigIntish;
     }): bigint;
     /**
-     * Returns the rate at which interest accrued on average for suppliers on the corresponding market,
+     * 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.
@@ -36,10 +36,12 @@ export declare namespace MarketUtils {
         fee: BigIntish;
     }): bigint;
     /**
-     * Returns the Annual Percentage Yield (APY) from an average rate, as calculated in Morpho Blue.
-     * @param rate The average rate to convert to APY (scaled by WAD).
+     * Returns the per-second rate continuously compounded over the given period, as calculated in Morpho Blue (scaled by WAD).
+     * If the period is 1 year, the compounded rate correspond to the Annual Percentage Yield (APY)
+     * @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.
      */
-    function getApy(rate: BigIntish): bigint;
+    function compoundRate(rate: BigIntish, period?: BigIntish): bigint;
     /**
      * 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

@@ -50,7 +50,7 @@ var MarketUtils;
     }
     MarketUtils.getUtilization = getUtilization;
     /**
-     * Returns the rate at which interest accrued on average for suppliers on the corresponding market,
+     * 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.
@@ -61,13 +61,15 @@ var MarketUtils;
     }
     MarketUtils.getSupplyRate = getSupplyRate;
     /**
-     * Returns the Annual Percentage Yield (APY) from an average rate, as calculated in Morpho Blue.
-     * @param rate The average rate to convert to APY (scaled by WAD).
+     * Returns the per-second rate continuously compounded over the given period, as calculated in Morpho Blue (scaled by WAD).
+     * If the period is 1 year, the compounded rate correspond to the Annual Percentage Yield (APY)
+     * @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.
      */
-    function getApy(rate) {
-        return index_js_1.MathLib.wTaylorCompounded(rate, constants_js_1.SECONDS_PER_YEAR);
+    function compoundRate(rate, period = constants_js_1.SECONDS_PER_YEAR) {
+        return index_js_1.MathLib.wTaylorCompounded(rate, period);
     }
-    MarketUtils.getApy = getApy;
+    MarketUtils.compoundRate = compoundRate;
     /**
      * Returns the interest accrued on both sides of the given market
      * as well as the supply shares minted to the fee recipient.

package/lib/math/MathLib.d.ts

@@ -1,4 +1,3 @@
-import { Time } from "@morpho-org/morpho-ts";
 import type { BigIntish } from "../types.js";
 export type RoundingDirection = "Up" | "Down";
 /**
@@ -88,24 +87,10 @@ export declare namespace MathLib {
     function mulDiv(x: BigIntish, y: BigIntish, denominator: BigIntish, rounding: RoundingDirection): bigint;
     /**
      * The sum of the first three non-zero terms of a Taylor expansion of e^(nx) - 1,
-     * to approximate a continuous compound interest rate.
+     * to approximate a continuously compounded interest rate.
      *
      * @param x The base of the exponent
      * @param n The exponent
      */
     function wTaylorCompounded(x: BigIntish, n: BigIntish): bigint;
-    /**
-     * Converts an rate to compounded apy
-     *
-     * @param rate The rate to convert (in WAD)
-     * @param period The compounding basis
-     */
-    function rateToApy(rate: BigIntish, period: Time.PeriodLike): number;
-    /**
-     * Converts an apr to compounded apy
-     *
-     * @param apr The apr to convert (in WAD)
-     * @param compounding The compounding basis
-     */
-    function aprToApy(apr: BigIntish, compounding: Time.PeriodLike): number;
 }

package/lib/math/MathLib.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MathLib = void 0;
-const morpho_ts_1 = require("@morpho-org/morpho-ts");
 /**
  * Library to manage fixed-point arithmetic.
  * https://github.com/morpho-org/morpho-blue/blob/main/src/libraries/MathLib.sol
@@ -148,7 +147,7 @@ var MathLib;
     MathLib.mulDiv = mulDiv;
     /**
      * The sum of the first three non-zero terms of a Taylor expansion of e^(nx) - 1,
-     * to approximate a continuous compound interest rate.
+     * to approximate a continuously compounded interest rate.
      *
      * @param x The base of the exponent
      * @param n The exponent
@@ -160,29 +159,4 @@ var MathLib;
         return firstTerm + secondTerm + thirdTerm;
     }
     MathLib.wTaylorCompounded = wTaylorCompounded;
-    /**
-     * Converts an rate to compounded apy
-     *
-     * @param rate The rate to convert (in WAD)
-     * @param period The compounding basis
-     */
-    function 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(morpho_ts_1.format.number.locale("en").of(BigInt(rate), 18))) ** factor -
-            1);
-    }
-    MathLib.rateToApy = rateToApy;
-    /**
-     * Converts an apr to compounded apy
-     *
-     * @param apr The apr to convert (in WAD)
-     * @param compounding The compounding basis
-     */
-    function aprToApy(apr, compounding) {
-        const { unit, duration } = morpho_ts_1.Time.toPeriod(compounding);
-        const rate = (BigInt(apr) * BigInt(duration)) / morpho_ts_1.Time[unit].from.y(1n);
-        return rateToApy(rate, compounding);
-    }
-    MathLib.aprToApy = aprToApy;
 })(MathLib || (exports.MathLib = MathLib = {}));

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": "2.0.0-next.31",
+  "version": "2.0.0-next.32",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -28,7 +28,7 @@
     "viem": "^2.21.54",
     "vitest": "^2.1.8",
     "@morpho-org/morpho-ts": "^2.0.0-next.16",
-    "@morpho-org/test": "^2.0.0-next.25"
+    "@morpho-org/test": "^2.0.0-next.27"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",