@morpho-org/blue-sdk 5.3.0-next.0 → 5.3.0-next.1

package/lib/vault/Vault.d.ts

@@ -204,5 +204,5 @@ export declare class AccrualVault extends Vault implements IAccrualVault {
      * 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`.
      */
-    accrueInterest(timestamp: BigIntish): AccrualVault;
+    accrueInterest(timestamp?: BigIntish): AccrualVault;
 }

package/lib/vault/v2/VaultV2.js

@@ -6,7 +6,6 @@ const errors_1 = require("../../errors");
 const math_1 = require("../../math");
 const token_1 = require("../../token");
 const utils_1 = require("../../utils");
-const VaultV2MorphoVaultV1Adapter_1 = require("./VaultV2MorphoVaultV1Adapter");
 class VaultV2 extends token_1.WrappedToken {
     asset;
     totalAssets;
@@ -73,9 +72,8 @@ class AccrualVaultV2 extends VaultV2 {
         if (this.liquidityAdapter === viem_1.zeroAddress)
             return { value: BigInt(assets), limiter: utils_1.CapacityLimitReason.balance };
         let liquidityAdapterLimit;
-        if (this.accrualLiquidityAdapter instanceof VaultV2MorphoVaultV1Adapter_1.AccrualVaultV2MorphoVaultV1Adapter) {
+        if (this.accrualLiquidityAdapter != null)
             liquidityAdapterLimit = this.accrualLiquidityAdapter.maxDeposit(this.liquidityData, assets);
-        }
         if (this.liquidityAllocations == null || liquidityAdapterLimit == null)
             throw new errors_1.VaultV2Errors.UnsupportedLiquidityAdapter(this.liquidityAdapter);
         // At this stage: `liquidityAdapterLimit.value <= assets`
@@ -109,7 +107,7 @@ class AccrualVaultV2 extends VaultV2 {
         if (this.liquidityAdapter === viem_1.zeroAddress)
             return { value: BigInt(assets), limiter: utils_1.CapacityLimitReason.balance };
         let liquidity = this.assetBalance;
-        if (this.accrualLiquidityAdapter instanceof VaultV2MorphoVaultV1Adapter_1.AccrualVaultV2MorphoVaultV1Adapter)
+        if (this.accrualLiquidityAdapter != null)
             liquidity += this.accrualLiquidityAdapter.maxWithdraw(this.liquidityData).value;
         if (assets > liquidity)
             return {

package/lib/vault/v2/VaultV2MorphoMarketV1Adapter.d.ts

@@ -0,0 +1,30 @@
+import { type Address, type Hex } from "viem";
+import { type IMarketParams, MarketParams } from "../../market";
+import type { AccrualPosition } from "../../position";
+import type { BigIntish } from "../../types";
+import { CapacityLimitReason } from "../../utils";
+import { VaultV2Adapter } from "./VaultV2Adapter";
+import type { IAccrualVaultV2Adapter, IVaultV2Adapter } from "./VaultV2Adapter";
+export interface IVaultV2MorphoMarketV1Adapter extends Omit<IVaultV2Adapter, "adapterId"> {
+    marketParamsList: IMarketParams[];
+}
+export declare class VaultV2MorphoMarketV1Adapter extends VaultV2Adapter implements IVaultV2MorphoMarketV1Adapter {
+    static adapterId(address: Address): `0x${string}`;
+    static collateralId(address: Address): `0x${string}`;
+    static marketParamsId(address: Address, params: MarketParams): `0x${string}`;
+    marketParamsList: MarketParams[];
+    constructor({ marketParamsList, ...vaultV2Adapter }: IVaultV2MorphoMarketV1Adapter);
+    ids(params: MarketParams): `0x${string}`[];
+}
+export interface IAccrualVaultV2MorphoMarketV1Adapter extends IVaultV2MorphoMarketV1Adapter {
+}
+export declare class AccrualVaultV2MorphoMarketV1Adapter extends VaultV2MorphoMarketV1Adapter implements IAccrualVaultV2MorphoMarketV1Adapter, IAccrualVaultV2Adapter {
+    positions: AccrualPosition[];
+    constructor(adapter: IAccrualVaultV2MorphoMarketV1Adapter, positions: AccrualPosition[]);
+    realAssets(timestamp?: BigIntish): bigint;
+    maxDeposit(_data: Hex, assets: BigIntish): {
+        value: bigint;
+        limiter: CapacityLimitReason;
+    };
+    maxWithdraw(_data: Hex): import("../../utils").CapacityLimit;
+}

package/lib/vault/v2/VaultV2MorphoMarketV1Adapter.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AccrualVaultV2MorphoMarketV1Adapter = exports.VaultV2MorphoMarketV1Adapter = void 0;
+const viem_1 = require("viem");
+const market_1 = require("../../market");
+const utils_1 = require("../../utils");
+const VaultV2Adapter_1 = require("./VaultV2Adapter");
+const marketParamsAbi = {
+    type: "tuple",
+    components: [
+        { type: "address", name: "loanToken" },
+        { type: "address", name: "collateralToken" },
+        { type: "address", name: "oracle" },
+        { type: "address", name: "irm" },
+        { type: "uint256", name: "lltv" },
+    ],
+};
+class VaultV2MorphoMarketV1Adapter extends VaultV2Adapter_1.VaultV2Adapter {
+    static adapterId(address) {
+        return (0, viem_1.keccak256)((0, viem_1.encodeAbiParameters)([{ type: "string" }, { type: "address" }], ["this", address]));
+    }
+    static collateralId(address) {
+        return (0, viem_1.keccak256)((0, viem_1.encodeAbiParameters)([{ type: "string" }, { type: "address" }], ["collateralToken", address]));
+    }
+    static marketParamsId(address, params) {
+        return (0, viem_1.keccak256)((0, viem_1.encodeAbiParameters)([{ type: "string" }, { type: "address" }, marketParamsAbi], ["this/marketParams", address, params]));
+    }
+    marketParamsList;
+    constructor({ marketParamsList, ...vaultV2Adapter }) {
+        super({
+            ...vaultV2Adapter,
+            adapterId: VaultV2MorphoMarketV1Adapter.adapterId(vaultV2Adapter.address),
+        });
+        this.marketParamsList = marketParamsList.map((params) => new market_1.MarketParams(params));
+    }
+    ids(params) {
+        return [
+            this.adapterId,
+            VaultV2MorphoMarketV1Adapter.collateralId(params.collateralToken),
+            VaultV2MorphoMarketV1Adapter.marketParamsId(this.address, params),
+        ];
+    }
+}
+exports.VaultV2MorphoMarketV1Adapter = VaultV2MorphoMarketV1Adapter;
+class AccrualVaultV2MorphoMarketV1Adapter extends VaultV2MorphoMarketV1Adapter {
+    positions;
+    constructor(adapter, positions) {
+        super(adapter);
+        this.positions = positions;
+    }
+    realAssets(timestamp) {
+        return this.positions.reduce((total, position) => total + position.accrueInterest(timestamp).supplyAssets, 0n);
+    }
+    maxDeposit(_data, assets) {
+        return {
+            value: BigInt(assets),
+            limiter: utils_1.CapacityLimitReason.balance,
+        };
+    }
+    maxWithdraw(_data) {
+        const [marketParams] = (0, viem_1.decodeAbiParameters)([marketParamsAbi], _data);
+        const marketId = new market_1.MarketParams(marketParams).id;
+        const position = this.positions.find((position) => position.marketId === marketId);
+        return (position?.market?.getWithdrawCapacityLimit(position) ?? {
+            value: 0n,
+            limiter: utils_1.CapacityLimitReason.position,
+        });
+    }
+}
+exports.AccrualVaultV2MorphoMarketV1Adapter = AccrualVaultV2MorphoMarketV1Adapter;

package/lib/vault/v2/VaultV2MorphoVaultV1Adapter.d.ts

@@ -1,6 +1,6 @@
 import { type Address, type Hex } from "viem";
 import { VaultV2Adapter } from "./VaultV2Adapter";
-export interface IVaultV2MorphoVaultV1Adapter extends IVaultV2Adapter {
+export interface IVaultV2MorphoVaultV1Adapter extends Omit<IVaultV2Adapter, "adapterId"> {
     morphoVaultV1: Address;
 }
 import type { BigIntish } from "../../types";
@@ -18,7 +18,7 @@ export declare class AccrualVaultV2MorphoVaultV1Adapter extends VaultV2MorphoVau
     accrualVaultV1: AccrualVault;
     shares: bigint;
     constructor(adapter: IAccrualVaultV2MorphoVaultV1Adapter, accrualVaultV1: AccrualVault, shares: bigint);
-    realAssets(timestamp: BigIntish): bigint;
+    realAssets(timestamp?: BigIntish): bigint;
     maxDeposit(_data: Hex, assets: BigIntish): import("../..").CapacityLimit;
     maxWithdraw(_data: Hex): import("../..").CapacityLimit;
 }

package/lib/vault/v2/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./VaultV2.js";
 export * from "./VaultV2Adapter.js";
+export * from "./VaultV2MorphoMarketV1Adapter.js";
 export * from "./VaultV2MorphoVaultV1Adapter.js";

package/lib/vault/v2/index.js

@@ -16,4 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./VaultV2.js"), exports);
 __exportStar(require("./VaultV2Adapter.js"), exports);
+__exportStar(require("./VaultV2MorphoMarketV1Adapter.js"), exports);
 __exportStar(require("./VaultV2MorphoVaultV1Adapter.js"), exports);

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.3.0-next.0",
+  "version": "5.3.0-next.1",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -31,8 +31,8 @@
     "typescript": "^5.7.2",
     "viem": "^2.33.3",
     "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",