@morpho-org/blue-sdk 5.2.0-next.0 → 5.2.0

package/lib/market/Market.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Market = void 0;
+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 utils_js_1 = require("../utils.js");
 const MarketParams_js_1 = require("./MarketParams.js");
 const MarketUtils_js_1 = require("./MarketUtils.js");
+var CapacityLimitReason;
+(function (CapacityLimitReason) {
+    CapacityLimitReason["liquidity"] = "Liquidity";
+    CapacityLimitReason["balance"] = "Balance";
+    CapacityLimitReason["position"] = "Position";
+    CapacityLimitReason["collateral"] = "Collateral";
+    CapacityLimitReason["cap"] = "Cap";
+})(CapacityLimitReason || (exports.CapacityLimitReason = CapacityLimitReason = {}));
 /**
  * Represents a lending market on Morpho Blue.
  */
@@ -87,27 +94,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).
@@ -138,25 +131,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).
@@ -204,7 +191,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).
@@ -215,18 +202,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);
+        const borrowRate = this.getEndBorrowRate(timestamp);
+        return MarketUtils_js_1.MarketUtils.rateToApy(index_js_1.MathLib.wMulUp(index_js_1.MathLib.wMulDown(borrowRate, this.utilization), index_js_1.MathLib.WAD - 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).
@@ -235,16 +222,26 @@ class Market {
         const borrowRate = this.getAvgBorrowRate(timestamp);
         return MarketUtils_js_1.MarketUtils.rateToApy(borrowRate);
     }
+    /**
+     * Returns the average rate at which interest _would_ accrue for suppliers of this market,
+     * if `accrueInterest` was called at the given timestamp (scaled by WAD).
+     * @param timestamp The timestamp at which to calculate the average supply rate.
+     * Must be greater than or equal to `lastUpdate`.
+     * Defaults to `Time.timestamp()` (returns the current average supply rate).
+     */
+    getAvgSupplyRate(timestamp = morpho_ts_1.Time.timestamp()) {
+        const borrowRate = this.getAvgBorrowRate(timestamp);
+        return index_js_1.MathLib.wMulUp(index_js_1.MathLib.wMulDown(borrowRate, this.utilization), index_js_1.MathLib.WAD - this.fee);
+    }
     /**
      * 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 MarketUtils_js_1.MarketUtils.rateToApy(this.getAvgSupplyRate(timestamp));
     }
     /**
      * Returns a new market derived from this market, whose interest has been accrued up to the given timestamp.
@@ -500,11 +497,11 @@ class Market {
         if (maxBorrowableAssets > liquidity)
             return {
                 value: liquidity,
-                limiter: utils_js_1.CapacityLimitReason.liquidity,
+                limiter: CapacityLimitReason.liquidity,
             };
         return {
             value: maxBorrowableAssets,
-            limiter: utils_js_1.CapacityLimitReason.collateral,
+            limiter: CapacityLimitReason.collateral,
         };
     }
     /**
@@ -517,11 +514,11 @@ class Market {
         if (borrowAssets > loanTokenBalance)
             return {
                 value: loanTokenBalance,
-                limiter: utils_js_1.CapacityLimitReason.balance,
+                limiter: CapacityLimitReason.balance,
             };
         return {
             value: borrowAssets,
-            limiter: utils_js_1.CapacityLimitReason.position,
+            limiter: CapacityLimitReason.position,
         };
     }
     /**
@@ -535,11 +532,11 @@ class Market {
         if (supplyAssets > liquidity)
             return {
                 value: liquidity,
-                limiter: utils_js_1.CapacityLimitReason.liquidity,
+                limiter: CapacityLimitReason.liquidity,
             };
         return {
             value: supplyAssets,
-            limiter: utils_js_1.CapacityLimitReason.position,
+            limiter: CapacityLimitReason.position,
         };
     }
     /**
@@ -555,11 +552,11 @@ class Market {
         if (position.collateral > withdrawableCollateral)
             return {
                 value: withdrawableCollateral,
-                limiter: utils_js_1.CapacityLimitReason.collateral,
+                limiter: CapacityLimitReason.collateral,
             };
         return {
             value: position.collateral,
-            limiter: utils_js_1.CapacityLimitReason.position,
+            limiter: CapacityLimitReason.position,
         };
     }
     /**
@@ -573,14 +570,14 @@ class Market {
         return {
             supply: {
                 value: loanTokenBalance,
-                limiter: utils_js_1.CapacityLimitReason.balance,
+                limiter: CapacityLimitReason.balance,
             },
             withdraw: this.getWithdrawCapacityLimit(position),
             borrow: this.getBorrowCapacityLimit(position, options?.borrow),
             repay: this.getRepayCapacityLimit(position.borrowShares, loanTokenBalance),
             supplyCollateral: {
                 value: collateralTokenBalance,
-                limiter: utils_js_1.CapacityLimitReason.balance,
+                limiter: CapacityLimitReason.balance,
             },
             withdrawCollateral: this.getWithdrawCollateralCapacityLimit(position, options?.withdrawCollateral),
         };

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/position/Position.d.ts

@@ -109,7 +109,7 @@ export declare class AccrualPosition extends Position implements IAccrualPositio
      * Returns the maximum amount of loan assets that can be withdrawn given a certain supply position
      * and a balance of loan assets, and the reason for the limit.
      */
-    get withdrawCapacityLimit(): import("../utils.js").CapacityLimit;
+    get withdrawCapacityLimit(): import("../market/Market.js").CapacityLimit;
     /**
      * Returns a new position derived from this position, 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 market's `lastUpdate`.
@@ -137,9 +137,9 @@ export declare class AccrualPosition extends Position implements IAccrualPositio
         assets: bigint;
         shares: bigint;
     };
-    getBorrowCapacityLimit(options?: MaxBorrowOptions): import("../utils.js").CapacityLimit | undefined;
-    getWithdrawCollateralCapacityLimit(options?: MaxWithdrawCollateralOptions): import("../utils.js").CapacityLimit | undefined;
-    getRepayCapacityLimit(loanTokenBalance: bigint): import("../utils.js").CapacityLimit;
+    getBorrowCapacityLimit(options?: MaxBorrowOptions): import("../market/Market.js").CapacityLimit | undefined;
+    getWithdrawCollateralCapacityLimit(options?: MaxWithdrawCollateralOptions): import("../market/Market.js").CapacityLimit | undefined;
+    getRepayCapacityLimit(loanTokenBalance: bigint): import("../market/Market.js").CapacityLimit;
     getMaxCapacities(loanTokenBalance: bigint, collateralTokenBalance: bigint, options?: {
         borrow?: MaxBorrowOptions;
         withdrawCollateral?: MaxWithdrawCollateralOptions;

package/lib/position/Position.js

@@ -4,7 +4,6 @@ exports.AccrualPosition = exports.Position = void 0;
 const errors_js_1 = require("../errors.js");
 const index_js_1 = require("../market/index.js");
 const MathLib_js_1 = require("../math/MathLib.js");
-const utils_js_1 = require("../utils.js");
 class Position {
     /**
      * The user holding this position.
@@ -226,14 +225,14 @@ class AccrualPosition extends Position {
         return {
             supply: {
                 value: loanTokenBalance,
-                limiter: utils_js_1.CapacityLimitReason.balance,
+                limiter: index_js_1.CapacityLimitReason.balance,
             },
             withdraw: this.withdrawCapacityLimit,
             borrow: this.getBorrowCapacityLimit(options?.borrow),
             repay: this.getRepayCapacityLimit(loanTokenBalance),
             supplyCollateral: {
                 value: collateralTokenBalance,
-                limiter: utils_js_1.CapacityLimitReason.balance,
+                limiter: index_js_1.CapacityLimitReason.balance,
             },
             withdrawCollateral: this.getWithdrawCollateralCapacityLimit(options?.withdrawCollateral),
         };

package/lib/token/VaultToken.d.ts

@@ -1,5 +1,5 @@
 import type { RoundingDirection } from "../math/index.js";
-import type { Address, BigIntish } from "../types.js";
+import type { Address } from "../types.js";
 import type { IVaultConfig } from "../vault/VaultConfig.js";
 import { WrappedToken } from "./WrappedToken.js";
 export interface IVaultToken {
@@ -18,6 +18,6 @@ export declare class VaultToken extends WrappedToken implements IVaultToken {
      */
     totalAssets: bigint;
     constructor(config: IVaultConfig, { totalAssets, totalSupply }: IVaultToken);
-    protected _wrap(amount: BigIntish, rounding: RoundingDirection): bigint;
-    protected _unwrap(amount: BigIntish, rounding: RoundingDirection): bigint;
+    protected _wrap(amount: bigint, rounding: RoundingDirection): bigint;
+    protected _unwrap(amount: bigint, rounding: RoundingDirection): bigint;
 }

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

@@ -1,7 +1,7 @@
+import { type CapacityLimit } from "../market/index.js";
 import { type RoundingDirection } from "../math/index.js";
 import { VaultToken } from "../token/index.js";
 import type { Address, BigIntish, MarketId } from "../types.js";
-import { type CapacityLimit } from "../utils.js";
 import type { IVaultConfig } from "./VaultConfig.js";
 import { type IVaultMarketAllocation, VaultMarketAllocation } from "./VaultMarketAllocation.js";
 export interface Pending<T> {
@@ -116,8 +116,8 @@ export declare class Vault extends VaultToken implements IVault {
      * The amount of interest in assets accrued since the last interaction with the vault.
      */
     get totalInterest(): bigint;
-    toAssets(shares: BigIntish, rounding?: RoundingDirection): bigint;
-    toShares(assets: BigIntish, rounding?: RoundingDirection): bigint;
+    toAssets(shares: bigint, rounding?: RoundingDirection): bigint;
+    toShares(assets: bigint, rounding?: RoundingDirection): bigint;
 }
 export interface CollateralAllocation {
     address: Address;
@@ -149,51 +149,37 @@ 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).
-     * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
+     * weighted-averaged over its market deposits, after deducting the performance fee.
+     * If interested in the APY at a specific timestamp, use `getNetApy(timestamp)` instead.
+     */
+    get netApy(): number;
+    /**
+     * The MetaMorpho vault's per-second rate at which interest _would_ accrue,
+     * weighted-averaged over its market deposits, before deducting the performance fee,
+     * if interest was to be accrued on each market at the given timestamp.
      */
-    get netApy(): bigint;
+    private _getAvgRate;
     /**
      * 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;
-    /**
-     * Returns the deposit capacity limit of a given amount of assets on the vault.
-     * @param assets The maximum amount of assets to deposit.
-     * @deprecated Use `maxDeposit` instead.
-     */
     getDepositCapacityLimit(assets: bigint): CapacityLimit;
-    /**
-     * Returns the withdraw capacity limit corresponding to a given amount of shares of the vault.
-     * @param shares The maximum amount of shares to redeem.
-     * @deprecated Use `maxWithdraw` instead.
-     */
     getWithdrawCapacityLimit(shares: bigint): CapacityLimit;
-    /**
-     * Returns the maximum amount of assets that can be deposited to the vault.
-     * @param assets The maximum amount of assets to deposit.
-     */
-    maxDeposit(assets: BigIntish): CapacityLimit;
-    /**
-     * Returns the maximum amount of assets that can be withdrawn from the vault.
-     * @param shares The maximum amount of shares to redeem.
-     */
-    maxWithdraw(shares: BigIntish): CapacityLimit;
     /**
      * 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 each of the vault's market's `lastUpdate`.

package/lib/vault/Vault.js

@@ -2,11 +2,11 @@
 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("../math/index.js");
-const index_js_2 = require("../token/index.js");
-const utils_js_1 = require("../utils.js");
+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 VaultMarketAllocation_js_1 = require("./VaultMarketAllocation.js");
-class Vault extends index_js_2.VaultToken {
+class Vault extends index_js_3.VaultToken {
     /**
      * The MetaMorpho vault's owner address.
      */
@@ -93,7 +93,7 @@ class Vault extends index_js_2.VaultToken {
      * The amount of interest in assets accrued since the last interaction with the vault.
      */
     get totalInterest() {
-        return index_js_1.MathLib.zeroFloorSub(this.totalAssets, this.lastTotalAssets);
+        return index_js_2.MathLib.zeroFloorSub(this.totalAssets, this.lastTotalAssets);
     }
     toAssets(shares, rounding = "Down") {
         return this._unwrap(shares, rounding);
@@ -155,7 +155,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,32 +163,42 @@ 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).
-     * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
+     * weighted-averaged over its market deposits, after deducting the performance fee.
+     * If interested in the APY at a specific timestamp, use `getNetApy(timestamp)` instead.
      */
     get netApy() {
         return this.getNetApy();
     }
     /**
-     * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
+     * The MetaMorpho vault's per-second rate at which interest _would_ accrue,
      * 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()) {
+    _getAvgRate(timestamp = morpho_ts_1.Time.timestamp()) {
         if (this.totalAssets === 0n)
             return 0n;
         return (this.allocations
             .values()
             .reduce((total, { position }) => total +
-            position.market.getAvgSupplyApy(timestamp) * position.supplyAssets, 0n) / this.totalAssets);
+            position.market.getAvgSupplyRate(timestamp) * position.supplyAssets, 0n) / this.totalAssets);
+    }
+    /**
+     * 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.
+     */
+    getApy(timestamp = morpho_ts_1.Time.timestamp()) {
+        if (this.totalAssets === 0n)
+            return 0;
+        return index_js_1.MarketUtils.rateToApy(this._getAvgRate(timestamp));
     }
     /**
      * 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_1.MathLib.wMulDown(this.getApy(timestamp), index_js_1.MathLib.WAD - this.fee);
+        return index_js_1.MarketUtils.rateToApy(index_js_2.MathLib.wMulDown(this._getAvgRate(timestamp), index_js_2.MathLib.WAD - this.fee));
     }
     getAllocationProportion(marketId) {
         if (this.totalAssets === 0n)
@@ -196,61 +206,36 @@ class AccrualVault extends Vault {
         const allocation = this.allocations.get(marketId);
         if (!allocation)
             return 0n;
-        return index_js_1.MathLib.wDivDown(allocation.position.supplyAssets, this.totalAssets);
+        return index_js_2.MathLib.wDivDown(allocation.position.supplyAssets, this.totalAssets);
     }
-    /**
-     * Returns the deposit capacity limit of a given amount of assets on the vault.
-     * @param assets The maximum amount of assets to deposit.
-     * @deprecated Use `maxDeposit` instead.
-     */
     getDepositCapacityLimit(assets) {
-        return this.maxDeposit(assets);
-    }
-    /**
-     * Returns the withdraw capacity limit corresponding to a given amount of shares of the vault.
-     * @param shares The maximum amount of shares to redeem.
-     * @deprecated Use `maxWithdraw` instead.
-     */
-    getWithdrawCapacityLimit(shares) {
-        return this.maxWithdraw(shares);
-    }
-    /**
-     * Returns the maximum amount of assets that can be deposited to the vault.
-     * @param assets The maximum amount of assets to deposit.
-     */
-    maxDeposit(assets) {
-        assets = BigInt(assets);
         const suppliable = this.allocations
             .values()
-            .reduce((total, { config: { cap }, position: { marketId, supplyAssets } }) => index_js_1.MathLib.min(total +
+            .reduce((total, { config: { cap }, position: { marketId, supplyAssets } }) => index_js_2.MathLib.min(total +
             (this.supplyQueue.includes(marketId)
-                ? index_js_1.MathLib.zeroFloorSub(cap, supplyAssets)
-                : 0n), index_js_1.MathLib.MAX_UINT_256), 0n);
+                ? index_js_2.MathLib.zeroFloorSub(cap, supplyAssets)
+                : 0n), index_js_2.MathLib.MAX_UINT_256), 0n);
         if (assets > suppliable)
             return {
                 value: suppliable,
-                limiter: utils_js_1.CapacityLimitReason.cap,
+                limiter: index_js_1.CapacityLimitReason.cap,
             };
         return {
             value: assets,
-            limiter: utils_js_1.CapacityLimitReason.balance,
+            limiter: index_js_1.CapacityLimitReason.balance,
         };
     }
-    /**
-     * Returns the maximum amount of assets that can be withdrawn from the vault.
-     * @param shares The maximum amount of shares to redeem.
-     */
-    maxWithdraw(shares) {
+    getWithdrawCapacityLimit(shares) {
         const assets = this.toAssets(shares);
         const { liquidity } = this;
         if (assets > liquidity)
             return {
                 value: liquidity,
-                limiter: utils_js_1.CapacityLimitReason.liquidity,
+                limiter: index_js_1.CapacityLimitReason.liquidity,
             };
         return {
             value: assets,
-            limiter: utils_js_1.CapacityLimitReason.balance,
+            limiter: index_js_1.CapacityLimitReason.balance,
         };
     }
     /**
@@ -268,10 +253,10 @@ class AccrualVault extends Vault {
             };
         }));
         if (vault.lostAssets != null) {
-            vault.lostAssets += index_js_1.MathLib.max(vault.lastTotalAssets - vault.lostAssets - vault.totalAssets, 0n);
+            vault.lostAssets += index_js_2.MathLib.max(vault.lastTotalAssets - vault.lostAssets - vault.totalAssets, 0n);
             vault.totalAssets += vault.lostAssets;
         }
-        const feeAssets = index_js_1.MathLib.wMulDown(vault.totalInterest, vault.fee);
+        const feeAssets = index_js_2.MathLib.wMulDown(vault.totalInterest, vault.fee);
         vault.totalAssets -= feeAssets;
         const feeShares = vault.toShares(feeAssets, "Down");
         vault.totalAssets += feeAssets;

package/lib/vault/VaultMarketAllocation.d.ts

@@ -1,7 +1,7 @@
 import type { AccrualPosition } from "../position/index.js";
-import type { VaultMarketConfig } from "./VaultMarketConfig.js";
+import { type IVaultMarketConfig, VaultMarketConfig } from "./VaultMarketConfig.js";
 export interface IVaultMarketAllocation {
-    config: VaultMarketConfig;
+    config: IVaultMarketConfig;
     position: AccrualPosition;
 }
 export declare class VaultMarketAllocation implements IVaultMarketAllocation {