@morpho-org/blue-sdk 5.0.0 → 5.0.1

package/lib/market/Market.d.ts

@@ -127,12 +127,12 @@ 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(): number;
@@ -177,12 +177,12 @@ export declare class Market implements IMarket {
     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.
@@ -193,12 +193,12 @@ export declare class Market implements IMarket {
     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;
@@ -131,14 +132,14 @@ 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() {
@@ -202,14 +203,14 @@ 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),
@@ -224,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/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/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.0.0",
+  "version": "5.0.1",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -31,8 +31,8 @@
     "typescript": "^5.7.2",
     "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",