@morpho-org/blue-sdk 4.0.0-next.2 → 4.0.0

package/lib/errors.d.ts

@@ -38,7 +38,9 @@ export declare namespace BlueErrors {
         constructor(marketId: MarketId, timestamp: bigint, lastUpdate: bigint);
     }
     class InconsistentInput extends Error {
-        constructor();
+        readonly assets: bigint;
+        readonly shares: bigint;
+        constructor(assets: bigint, shares: bigint);
     }
     class InsufficientLiquidity extends Error {
         readonly marketId: MarketId;
@@ -58,6 +60,10 @@ export declare namespace BlueErrors {
         readonly marketId: MarketId;
         constructor(user: Address, marketId: MarketId);
     }
+    class ExpiredSignature extends Error {
+        readonly deadline: bigint;
+        constructor(deadline: bigint);
+    }
 }
 export interface ErrorClass<E extends Error> {
     new (...args: any[]): E;

package/lib/errors.js

@@ -79,8 +79,12 @@ var BlueErrors;
     }
     BlueErrors.InvalidInterestAccrual = InvalidInterestAccrual;
     class InconsistentInput extends Error {
-        constructor() {
-            super(`inconsistent input: assets & shares cannot both be zero`);
+        assets;
+        shares;
+        constructor(assets, shares) {
+            super(`inconsistent input assets "${assets}" and shares "${shares}"`);
+            this.assets = assets;
+            this.shares = shares;
         }
     }
     BlueErrors.InconsistentInput = InconsistentInput;
@@ -120,6 +124,14 @@ var BlueErrors;
         }
     }
     BlueErrors.InsufficientCollateral = InsufficientCollateral;
+    class ExpiredSignature extends Error {
+        deadline;
+        constructor(deadline) {
+            super(`expired signature deadline "${deadline}"`);
+            this.deadline = deadline;
+        }
+    }
+    BlueErrors.ExpiredSignature = ExpiredSignature;
 })(BlueErrors || (exports.BlueErrors = BlueErrors = {}));
 function _try(accessor, ...errorClasses) {
     const maybeCatchError = (error) => {

package/lib/market/Market.d.ts

@@ -1,6 +1,6 @@
 import { type RoundingDirection } from "../math/index.js";
 import type { BigIntish } from "../types.js";
-import type { MarketParams } from "./MarketParams.js";
+import { type IMarketParams, MarketParams } from "./MarketParams.js";
 export declare enum CapacityLimitReason {
     liquidity = "Liquidity",
     balance = "Balance",
@@ -27,7 +27,7 @@ export interface MaxPositionCapacities {
     withdrawCollateral: CapacityLimit | undefined;
 }
 export interface IMarket {
-    params: MarketParams;
+    params: IMarketParams;
     totalSupplyAssets: bigint;
     totalBorrowAssets: bigint;
     totalSupplyShares: bigint;

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 MarketParams_js_1 = require("./MarketParams.js");
 const MarketUtils_js_1 = require("./MarketUtils.js");
 var CapacityLimitReason;
 (function (CapacityLimitReason) {
@@ -56,7 +57,7 @@ class Market {
      */
     rateAtTarget;
     constructor({ params, totalSupplyAssets, totalBorrowAssets, totalSupplyShares, totalBorrowShares, lastUpdate, fee, price, rateAtTarget, }) {
-        this.params = params;
+        this.params = new MarketParams_js_1.MarketParams(params);
         this.totalSupplyAssets = totalSupplyAssets;
         this.totalBorrowAssets = totalBorrowAssets;
         this.totalSupplyShares = totalSupplyShares;
@@ -211,8 +212,8 @@ class Market {
         });
     }
     supply(assets, shares, timestamp) {
-        if (assets === 0n && shares === 0n)
-            throw new errors_js_1.BlueErrors.InconsistentInput();
+        if ((assets === 0n) === (shares === 0n))
+            throw new errors_js_1.BlueErrors.InconsistentInput(assets, shares);
         const market = this.accrueInterest(timestamp);
         if (shares === 0n)
             shares = market.toSupplyShares(assets, "Down");
@@ -223,8 +224,8 @@ class Market {
         return { market, assets, shares };
     }
     withdraw(assets, shares, timestamp) {
-        if (assets === 0n && shares === 0n)
-            throw new errors_js_1.BlueErrors.InconsistentInput();
+        if ((assets === 0n) === (shares === 0n))
+            throw new errors_js_1.BlueErrors.InconsistentInput(assets, shares);
         const market = this.accrueInterest(timestamp);
         if (shares === 0n)
             shares = market.toSupplyShares(assets, "Up");
@@ -237,8 +238,8 @@ class Market {
         return { market, assets, shares };
     }
     borrow(assets, shares, timestamp) {
-        if (assets === 0n && shares === 0n)
-            throw new errors_js_1.BlueErrors.InconsistentInput();
+        if ((assets === 0n) === (shares === 0n))
+            throw new errors_js_1.BlueErrors.InconsistentInput(assets, shares);
         const market = this.accrueInterest(timestamp);
         if (shares === 0n)
             shares = market.toBorrowShares(assets, "Up");
@@ -251,8 +252,8 @@ class Market {
         return { market, assets, shares };
     }
     repay(assets, shares, timestamp) {
-        if (assets === 0n && shares === 0n)
-            throw new errors_js_1.BlueErrors.InconsistentInput();
+        if ((assets === 0n) === (shares === 0n))
+            throw new errors_js_1.BlueErrors.InconsistentInput(assets, shares);
         const market = this.accrueInterest(timestamp);
         if (shares === 0n)
             shares = market.toBorrowShares(assets, "Down");

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.0.0-next.2",
+  "version": "4.0.0",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -25,14 +25,14 @@
     "lodash.mergewith": "^4.6.2"
   },
   "peerDependencies": {
-    "@morpho-org/morpho-ts": "^2.3.0"
+    "@morpho-org/morpho-ts": "^2.4.0"
   },
   "devDependencies": {
     "typescript": "^5.7.2",
     "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/morpho-ts": "^2.3.0",
-    "@morpho-org/test": "^2.1.3"
+    "@morpho-org/morpho-ts": "^2.4.0",
+    "@morpho-org/test": "^2.1.4"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",