@morpho-org/blue-sdk 4.5.0 → 4.5.1

package/lib/vault/Vault.d.ts

@@ -148,29 +148,29 @@ export declare class AccrualVault extends Vault implements IAccrualVault {
      */
     get liquidity(): bigint;
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
-     * before deducting the performance fee, at the time of each market's last update (scaled by WAD).
+     * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
+     * weighted-averaged over its market deposits, before deducting the performance fee (scaled by WAD).
      * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
     get apy(): bigint;
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
-     * after deducting the performance fee, at the time of each market's last update (scaled by WAD).
+     * 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.
      */
     get netApy(): bigint;
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
-     * before deducting the performance fee, at the given timestamp,
-     * if the state of all the markets remains unchanged (not accrued) (scaled by WAD).
+     * 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).
      */
-    getApy(timestamp: BigIntish): bigint;
+    getApy(timestamp?: BigIntish): bigint;
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
-     * after deducting the performance fee, at the given timestamp,
-     * if the state of all the markets remains unchanged (not accrued) (scaled by WAD).
+     * 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).
      */
-    getNetApy(timestamp: BigIntish): bigint;
+    getNetApy(timestamp?: BigIntish): bigint;
     getAllocationProportion(marketId: MarketId): bigint;
     getDepositCapacityLimit(assets: bigint): CapacityLimit;
     getWithdrawCapacityLimit(shares: bigint): CapacityLimit;

package/lib/vault/Vault.js

@@ -1,6 +1,7 @@
 "use strict";
 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("../market/index.js");
 const index_js_2 = require("../math/index.js");
 const index_js_3 = require("../token/index.js");
@@ -153,44 +154,40 @@ class AccrualVault extends Vault {
             .reduce((total, { position }) => total + position.withdrawCapacityLimit.value, 0n);
     }
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
-     * before deducting the performance fee, at the time of each market's last update (scaled by WAD).
+     * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
+     * weighted-averaged over its market deposits, before deducting the performance fee (scaled by WAD).
      * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
     get apy() {
-        if (this.totalAssets === 0n)
-            return 0n;
-        return (this.allocations
-            .values()
-            .reduce((total, { position }) => total + position.market.supplyApy * position.supplyAssets, 0n) / this.totalAssets);
+        return this.getApy();
     }
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
-     * after deducting the performance fee, at the time of each market's last update (scaled by WAD).
+     * 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.
      */
     get netApy() {
-        return index_js_2.MathLib.wMulDown(this.apy, index_js_2.MathLib.WAD - this.fee);
+        return this.getNetApy();
     }
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
-     * before deducting the performance fee, at the given timestamp,
-     * if the state of all the markets remains unchanged (not accrued) (scaled by WAD).
+     * 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).
      */
-    getApy(timestamp) {
+    getApy(timestamp = morpho_ts_1.Time.timestamp()) {
         if (this.totalAssets === 0n)
             return 0n;
         return (this.allocations
             .values()
             .reduce((total, { position }) => total +
-            position.market.getSupplyApy(timestamp) * position.supplyAssets, 0n) / this.totalAssets);
+            position.market.getAvgSupplyApy(timestamp) * position.supplyAssets, 0n) / this.totalAssets);
     }
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
-     * after deducting the performance fee, at the given timestamp,
-     * if the state of all the markets remains unchanged (not accrued) (scaled by WAD).
+     * 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).
      */
-    getNetApy(timestamp) {
+    getNetApy(timestamp = morpho_ts_1.Time.timestamp()) {
         return index_js_2.MathLib.wMulDown(this.getApy(timestamp), index_js_2.MathLib.WAD - this.fee);
     }
     getAllocationProportion(marketId) {

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.5.0",
+  "version": "4.5.1",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"