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

package/lib/errors.d.ts

@@ -1,4 +1,9 @@
+import { type Hex } from "viem";
 import type { Address, MarketId } from "./types.js";
+export declare class InvalidMarketParamsError extends Error {
+    readonly data: Hex;
+    constructor(data: Hex);
+}
 export declare class UnknownDataError extends Error {
 }
 export declare class UnknownTokenError extends UnknownDataError {

package/lib/errors.js

@@ -1,8 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultV2Errors = 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 = exports.InvalidMarketParamsError = void 0;
 exports._try = _try;
 const viem_1 = require("viem");
+class InvalidMarketParamsError extends Error {
+    data;
+    constructor(data) {
+        super(`cannot decode valid MarketParams from "${data}"`);
+        this.data = data;
+    }
+}
+exports.InvalidMarketParamsError = InvalidMarketParamsError;
 class UnknownDataError extends Error {
 }
 exports.UnknownDataError = UnknownDataError;

package/lib/market/MarketParams.d.ts

@@ -1,4 +1,5 @@
 import type { Address, BigIntish, MarketId } from "../types.js";
+import { type Hex } from "viem";
 export interface IMarketParams {
     loanToken: Address;
     collateralToken: Address;
@@ -7,6 +8,25 @@ export interface IMarketParams {
     lltv: BigIntish;
 }
 export type InputMarketParams = Pick<MarketParams, "loanToken" | "collateralToken" | "oracle" | "irm" | "lltv">;
+export declare const marketParamsAbi: {
+    readonly type: "tuple";
+    readonly components: readonly [{
+        readonly type: "address";
+        readonly name: "loanToken";
+    }, {
+        readonly type: "address";
+        readonly name: "collateralToken";
+    }, {
+        readonly type: "address";
+        readonly name: "oracle";
+    }, {
+        readonly type: "address";
+        readonly name: "irm";
+    }, {
+        readonly type: "uint256";
+        readonly name: "lltv";
+    }];
+};
 /**
  * Represents a market's configuration (also called market params).
  */
@@ -21,6 +41,7 @@ export declare class MarketParams implements IMarketParams {
      * Returns the canonical idle market configuration for the given loan token.
      */
     static idle(token: Address): MarketParams;
+    static fromHex(data: Hex): MarketParams;
     /**
      * The market's collateral token address.
      */

package/lib/market/MarketParams.js

@@ -1,9 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MarketParams = void 0;
+exports.MarketParams = exports.marketParamsAbi = void 0;
 const morpho_ts_1 = require("@morpho-org/morpho-ts");
 const errors_js_1 = require("../errors.js");
+const viem_1 = require("viem");
 const MarketUtils_js_1 = require("./MarketUtils.js");
+exports.marketParamsAbi = {
+    type: "tuple",
+    components: [
+        { type: "address", name: "loanToken" },
+        { type: "address", name: "collateralToken" },
+        { type: "address", name: "oracle" },
+        { type: "address", name: "irm" },
+        { type: "uint256", name: "lltv" },
+    ],
+};
 /**
  * Represents a market's configuration (also called market params).
  */
@@ -31,6 +42,15 @@ class MarketParams {
             lltv: 0n,
         });
     }
+    static fromHex(data) {
+        try {
+            const [marketParams] = (0, viem_1.decodeAbiParameters)([exports.marketParamsAbi], data);
+            return new MarketParams(marketParams);
+        }
+        catch {
+            throw new errors_js_1.InvalidMarketParamsError(data);
+        }
+    }
     /**
      * The market's collateral token address.
      */

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

@@ -26,5 +26,5 @@ export declare class AccrualVaultV2MorphoMarketV1Adapter extends VaultV2MorphoMa
         value: bigint;
         limiter: CapacityLimitReason;
     };
-    maxWithdraw(_data: Hex): import("../../utils").CapacityLimit;
+    maxWithdraw(data: Hex): import("../../utils").CapacityLimit;
 }

package/lib/vault/v2/VaultV2MorphoMarketV1Adapter.js

@@ -5,16 +5,6 @@ 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]));
@@ -23,7 +13,7 @@ class VaultV2MorphoMarketV1Adapter extends VaultV2Adapter_1.VaultV2Adapter {
         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]));
+        return (0, viem_1.keccak256)((0, viem_1.encodeAbiParameters)([{ type: "string" }, { type: "address" }, market_1.marketParamsAbi], ["this/marketParams", address, params]));
     }
     marketParamsList;
     constructor({ marketParamsList, ...vaultV2Adapter }) {
@@ -57,9 +47,8 @@ class AccrualVaultV2MorphoMarketV1Adapter extends VaultV2MorphoMarketV1Adapter {
             limiter: utils_1.CapacityLimitReason.balance,
         };
     }
-    maxWithdraw(_data) {
-        const [marketParams] = (0, viem_1.decodeAbiParameters)([marketParamsAbi], _data);
-        const marketId = new market_1.MarketParams(marketParams).id;
+    maxWithdraw(data) {
+        const marketId = market_1.MarketParams.fromHex(data).id;
         const position = this.positions.find((position) => position.marketId === marketId);
         return (position?.market?.getWithdrawCapacityLimit(position) ?? {
             value: 0n,

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.1",
+  "version": "5.3.0-next.2",
   "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/test": "^2.6.0",
-    "@morpho-org/morpho-ts": "^2.4.3"
+    "@morpho-org/morpho-ts": "^2.4.3",
+    "@morpho-org/test": "^2.6.0"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",