@morpho-org/blue-sdk 4.14.0-next.1 → 4.14.0-next.2

package/lib/errors.d.ts

@@ -69,6 +69,14 @@ export declare namespace BlueErrors {
         constructor(deadline: bigint);
     }
 }
+export declare namespace VaultV2Errors {
+    class InvalidInterestAccrual extends Error {
+        readonly vault: Address;
+        readonly timestamp: bigint;
+        readonly lastUpdate: bigint;
+        constructor(vault: Address, timestamp: bigint, lastUpdate: bigint);
+    }
+}
 export interface ErrorClass<E extends Error> {
     new (...args: any[]): E;
 }

package/lib/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlueErrors = exports.UnsupportedVaultV2AdapterError = exports.UnsupportedPreLiquidationParamsError = exports.UnsupportedChainIdError = exports.UnknownVaultConfigError = exports.UnknownMarketParamsError = exports.UnknownTokenPriceError = exports.UnknownTokenError = exports.UnknownDataError = void 0;
+exports.VaultV2Errors = exports.BlueErrors = exports.UnsupportedVaultV2AdapterError = exports.UnsupportedPreLiquidationParamsError = exports.UnsupportedChainIdError = exports.UnknownVaultConfigError = exports.UnknownMarketParamsError = exports.UnknownTokenPriceError = exports.UnknownTokenError = exports.UnknownDataError = void 0;
 exports._try = _try;
 const viem_1 = require("viem");
 class UnknownDataError extends Error {
@@ -141,6 +141,21 @@ var BlueErrors;
     }
     BlueErrors.ExpiredSignature = ExpiredSignature;
 })(BlueErrors || (exports.BlueErrors = BlueErrors = {}));
+var VaultV2Errors;
+(function (VaultV2Errors) {
+    class InvalidInterestAccrual extends Error {
+        vault;
+        timestamp;
+        lastUpdate;
+        constructor(vault, timestamp, lastUpdate) {
+            super(`invalid interest accrual on vault ${vault}: accrual timestamp ${timestamp} can't be prior to last update ${lastUpdate}`);
+            this.vault = vault;
+            this.timestamp = timestamp;
+            this.lastUpdate = lastUpdate;
+        }
+    }
+    VaultV2Errors.InvalidInterestAccrual = InvalidInterestAccrual;
+})(VaultV2Errors || (exports.VaultV2Errors = VaultV2Errors = {}));
 function _try(accessor, ...errorClasses) {
     const maybeCatchError = (error) => {
         if (errorClasses.length === 0 ||

package/lib/index.d.ts

@@ -11,5 +11,4 @@ export * from "./holding/index.js";
 export * from "./position/index.js";
 export * from "./vault/index.js";
 export * from "./preLiquidation.js";
-export * from "./vault-v2/index.js";
 export * from "./utils.js";

package/lib/index.js

@@ -27,5 +27,4 @@ __exportStar(require("./holding/index.js"), exports);
 __exportStar(require("./position/index.js"), exports);
 __exportStar(require("./vault/index.js"), exports);
 __exportStar(require("./preLiquidation.js"), exports);
-__exportStar(require("./vault-v2/index.js"), exports);
 __exportStar(require("./utils.js"), exports);

package/lib/vault/index.d.ts

@@ -5,3 +5,4 @@ export * from "./VaultMarketConfig.js";
 export * from "./VaultMarketPublicAllocatorConfig.js";
 export * from "./VaultUser.js";
 export * from "./Vault.js";
+export * from "./v2";

package/lib/vault/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./VaultMarketConfig.js"), exports);
 __exportStar(require("./VaultMarketPublicAllocatorConfig.js"), exports);
 __exportStar(require("./VaultUser.js"), exports);
 __exportStar(require("./Vault.js"), exports);
+__exportStar(require("./v2"), exports);

package/lib/{vault-v2 → vault/v2}/VaultV2.d.ts

@@ -1,42 +1,47 @@
 import type { Address } from "viem";
-import { type RoundingDirection } from "../math";
-import { type IToken, WrappedToken } from "../token";
-import type { BigIntish } from "../types";
+import { type RoundingDirection } from "../../math";
+import { type IToken, WrappedToken } from "../../token";
+import type { BigIntish } from "../../types";
 import type { IAccrualVaultV2Adapter } from "./VaultV2Adapter";
 export interface IVaultV2 extends IToken {
     asset: Address;
-    totalSupply: bigint;
+    /**
+     * The total assets, *including* virtually accrued interest.
+     */
     totalAssets: bigint;
-    performanceFee: bigint;
-    managementFee: bigint;
+    /**
+     * The total assets, *excluding* virtually accrued interest.
+     */
+    _totalAssets: bigint;
+    /**
+     * The total supply of shares.
+     */
+    totalSupply: bigint;
     virtualShares: bigint;
+    maxRate: bigint;
     lastUpdate: bigint;
     adapters: Address[];
-    maxRate: bigint;
     liquidityAdapter: Address;
+    performanceFee: bigint;
+    managementFee: bigint;
     performanceFeeRecipient: Address;
     managementFeeRecipient: Address;
 }
 export declare class VaultV2 extends WrappedToken implements IVaultV2 {
     readonly asset: Address;
-    /**
-     * The ERC4626 vault's total supply of shares.
-     */
-    totalSupply: bigint;
-    /**
-     * The ERC4626 vault's total assets, without accrued interest
-     */
     totalAssets: bigint;
+    _totalAssets: bigint;
+    totalSupply: bigint;
     virtualShares: bigint;
+    maxRate: bigint;
     lastUpdate: bigint;
     adapters: Address[];
-    maxRate: bigint;
+    liquidityAdapter: Address;
     performanceFee: bigint;
     managementFee: bigint;
-    liquidityAdapter: Address;
     performanceFeeRecipient: Address;
     managementFeeRecipient: Address;
-    constructor({ totalSupply, asset, totalAssets, virtualShares, lastUpdate, adapters, maxRate, performanceFee, managementFee, liquidityAdapter, performanceFeeRecipient, managementFeeRecipient, ...config }: IVaultV2);
+    constructor({ asset, totalAssets, _totalAssets, totalSupply, virtualShares, lastUpdate, adapters, maxRate, performanceFee, managementFee, liquidityAdapter, performanceFeeRecipient, managementFeeRecipient, ...config }: IVaultV2);
     toAssets(shares: bigint): bigint;
     toShares(assets: bigint): bigint;
     protected _wrap(amount: bigint, rounding: RoundingDirection): bigint;
@@ -48,6 +53,10 @@ export declare class AccrualVaultV2 extends VaultV2 implements IAccrualVaultV2 {
     readonly accrualAdapters: IAccrualVaultV2Adapter[];
     readonly assetBalance: bigint;
     constructor(vault: IAccrualVaultV2, accrualAdapters: IAccrualVaultV2Adapter[], assetBalance: bigint);
+    /**
+     * 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 the vault's `lastUpdate`.
+     */
     accrueInterest(timestamp: BigIntish): {
         vault: AccrualVaultV2;
         performanceFeeShares: bigint;

package/lib/{vault-v2 → vault/v2}/VaultV2.js

@@ -1,39 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccrualVaultV2 = exports.VaultV2 = void 0;
-const math_1 = require("../math");
-const token_1 = require("../token");
+const errors_1 = require("../../errors");
+const math_1 = require("../../math");
+const token_1 = require("../../token");
 class VaultV2 extends token_1.WrappedToken {
     asset;
-    /**
-     * The ERC4626 vault's total supply of shares.
-     */
-    totalSupply;
-    /**
-     * The ERC4626 vault's total assets, without accrued interest
-     */
     totalAssets;
+    _totalAssets;
+    totalSupply;
     virtualShares;
+    maxRate;
     lastUpdate;
     adapters;
-    maxRate;
+    liquidityAdapter;
     performanceFee;
     managementFee;
-    liquidityAdapter;
     performanceFeeRecipient;
     managementFeeRecipient;
-    constructor({ totalSupply, asset, totalAssets, virtualShares, lastUpdate, adapters, maxRate, performanceFee, managementFee, liquidityAdapter, performanceFeeRecipient, managementFeeRecipient, ...config }) {
+    constructor({ asset, totalAssets, _totalAssets, totalSupply, virtualShares, lastUpdate, adapters, maxRate, performanceFee, managementFee, liquidityAdapter, performanceFeeRecipient, managementFeeRecipient, ...config }) {
         super(config, asset);
-        this.totalSupply = totalSupply;
+        this.asset = asset;
         this.totalAssets = totalAssets;
+        this._totalAssets = _totalAssets;
+        this.totalSupply = totalSupply;
         this.virtualShares = virtualShares;
-        this.lastUpdate = lastUpdate;
-        this.asset = asset;
         this.maxRate = maxRate;
+        this.lastUpdate = lastUpdate;
         this.adapters = adapters;
+        this.liquidityAdapter = liquidityAdapter;
         this.performanceFee = performanceFee;
         this.managementFee = managementFee;
-        this.liquidityAdapter = liquidityAdapter;
         this.performanceFeeRecipient = performanceFeeRecipient;
         this.managementFeeRecipient = managementFeeRecipient;
     }
@@ -59,16 +56,24 @@ class AccrualVaultV2 extends VaultV2 {
         this.accrualAdapters = accrualAdapters;
         this.assetBalance = assetBalance;
     }
+    /**
+     * 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 the vault's `lastUpdate`.
+     */
     accrueInterest(timestamp) {
         const vault = new AccrualVaultV2(this, this.accrualAdapters, this.assetBalance);
-        const elapsed = BigInt(timestamp) - vault.lastUpdate;
-        if (elapsed <= 0n)
+        timestamp = BigInt(timestamp);
+        const elapsed = timestamp - this.lastUpdate;
+        if (elapsed < 0n)
+            throw new errors_1.VaultV2Errors.InvalidInterestAccrual(this.address, timestamp, this.lastUpdate);
+        // Corresponds to the `firstTotalAssets == 0` onchain check.
+        if (elapsed === 0n)
             return { vault, performanceFeeShares: 0n, managementFeeShares: 0n };
         const realAssets = vault.accrualAdapters.reduce((curr, adapter) => curr + adapter.realAssets(timestamp), vault.assetBalance);
-        const maxTotalAssets = vault.totalAssets +
-            math_1.MathLib.wMulDown(vault.totalAssets * elapsed, vault.maxRate);
+        const maxTotalAssets = vault._totalAssets +
+            math_1.MathLib.wMulDown(vault._totalAssets * elapsed, vault.maxRate);
         const newTotalAssets = math_1.MathLib.min(realAssets, maxTotalAssets);
-        const interest = math_1.MathLib.zeroFloorSub(newTotalAssets, vault.totalAssets);
+        const interest = math_1.MathLib.zeroFloorSub(newTotalAssets, vault._totalAssets);
         const performanceFeeAssets = interest > 0n && vault.performanceFee > 0n
             ? math_1.MathLib.wMulDown(interest, vault.performanceFee)
             : 0n;
@@ -79,6 +84,7 @@ class AccrualVaultV2 extends VaultV2 {
         const performanceFeeShares = math_1.MathLib.mulDivDown(performanceFeeAssets, vault.totalSupply + vault.virtualShares, newTotalAssetsWithoutFees + 1n);
         const managementFeeShares = math_1.MathLib.mulDivDown(managementFeeAssets, vault.totalSupply + vault.virtualShares, newTotalAssetsWithoutFees + 1n);
         vault.totalAssets = newTotalAssets;
+        vault._totalAssets = newTotalAssets;
         if (performanceFeeShares)
             vault.totalSupply += performanceFeeShares;
         if (managementFeeShares)

package/lib/{vault-v2 → vault/v2}/VaultV2Adapter.d.ts

@@ -1,5 +1,5 @@
 import type { Address, Hash } from "viem";
-import type { BigIntish } from "../types";
+import type { BigIntish } from "../../types";
 export interface IVaultV2Adapter {
     address: Address;
     parentVault: Address;

package/lib/{vault-v2 → vault/v2}/VaultV2MorphoVaultV1Adapter.d.ts

@@ -3,8 +3,8 @@ import { VaultV2Adapter } from "./VaultV2Adapter";
 export interface IVaultV2MorphoVaultV1Adapter extends IVaultV2Adapter {
     morphoVaultV1: Address;
 }
-import type { BigIntish } from "../types";
-import type { AccrualVault } from "../vault";
+import type { BigIntish } from "../../types";
+import type { AccrualVault } from "../Vault";
 import type { IAccrualVaultV2Adapter, IVaultV2Adapter } from "./VaultV2Adapter";
 export declare class VaultV2MorphoVaultV1Adapter extends VaultV2Adapter implements IVaultV2MorphoVaultV1Adapter {
     readonly morphoVaultV1: Address;

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.14.0-next.1",
+  "version": "4.14.0-next.2",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"