@morpho-org/midnight-sdk 2.1.0 → 2.2.0-next.0

package/lib/cjs/api/version.generated.d.ts

@@ -1,2 +1,2 @@
 /** @internal Installed Midnight SDK package version. */
-export declare const MIDNIGHT_SDK_VERSION = "2.1.0";
+export declare const MIDNIGHT_SDK_VERSION = "2.2.0-next.0";

package/lib/cjs/api/version.generated.js

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MIDNIGHT_SDK_VERSION = void 0;
 /** @internal Installed Midnight SDK package version. */
-exports.MIDNIGHT_SDK_VERSION = "2.1.0";
+exports.MIDNIGHT_SDK_VERSION = "2.2.0-next.0";

package/lib/cjs/errors.d.ts

@@ -1,3 +1,4 @@
+import { InvalidPositionAccrualStateError as SharedInvalidPositionAccrualStateError, InvalidPositionAccrualTimestampError as SharedInvalidPositionAccrualTimestampError, InvalidPositionLossFactorError as SharedInvalidPositionLossFactorError } from "@morpho-org/morpho-ts";
 import type { Address } from "viem";
 import type { MempoolPayloadValidationIssue } from "./api/types.js";
 /**
@@ -70,42 +71,27 @@ export declare class SettlementFeeExceedsPriceError extends Error {
 /**
  * Thrown when a local position accrual is requested for an impossible timestamp.
  *
- * @example
- * ```ts
- * import { InvalidPositionAccrualTimestampError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionAccrualTimestampError(1n, 2n);
- * ```
+ * @deprecated Import `InvalidPositionAccrualTimestampError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-export declare class InvalidPositionAccrualTimestampError extends Error {
-    constructor(timestamp: bigint, lastAccrual: bigint);
-}
+export declare const InvalidPositionAccrualTimestampError: typeof SharedInvalidPositionAccrualTimestampError;
+/** @deprecated Import `InvalidPositionAccrualTimestampError` from `@morpho-org/morpho-ts`. Removed in the next major. */
+export type InvalidPositionAccrualTimestampError = SharedInvalidPositionAccrualTimestampError;
 /**
  * Thrown when a local position accrual sees a market loss factor older than the position.
  *
- * @example
- * ```ts
- * import { InvalidPositionLossFactorError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionLossFactorError(1n, 2n);
- * ```
+ * @deprecated Import `InvalidPositionLossFactorError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-export declare class InvalidPositionLossFactorError extends Error {
-    constructor(marketLossFactor: bigint, positionLossFactor: bigint);
-}
+export declare const InvalidPositionLossFactorError: typeof SharedInvalidPositionLossFactorError;
+/** @deprecated Import `InvalidPositionLossFactorError` from `@morpho-org/morpho-ts`. Removed in the next major. */
+export type InvalidPositionLossFactorError = SharedInvalidPositionLossFactorError;
 /**
  * Thrown when local position accrual inputs violate Midnight accounting invariants.
  *
- * @example
- * ```ts
- * import { InvalidPositionAccrualStateError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionAccrualStateError("Pending fee exceeds credit.");
- * ```
+ * @deprecated Import `InvalidPositionAccrualStateError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-export declare class InvalidPositionAccrualStateError extends Error {
-    constructor(reason: string);
-}
+export declare const InvalidPositionAccrualStateError: typeof SharedInvalidPositionAccrualStateError;
+/** @deprecated Import `InvalidPositionAccrualStateError` from `@morpho-org/morpho-ts`. Removed in the next major. */
+export type InvalidPositionAccrualStateError = SharedInvalidPositionAccrualStateError;
 /**
  * Thrown when a market parameter cannot satisfy Midnight protocol rules.
  *

package/lib/cjs/errors.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvalidMidnightApiQuoteTargetError = exports.InvalidMidnightApiResponseError = exports.MidnightApiError = exports.InvalidEcrecoverSignatureVError = exports.InvalidTypedDataSignatureError = exports.MidnightMempoolValidationError = exports.ChainIdMismatchError = exports.RatifierV1TakerNotAllowedError = exports.InvalidRatifierV1AddressError = exports.InvalidRateRatifierV1TimeError = exports.InvalidRateRatifierV1TickError = exports.RateRatifierV1BoundOverflowError = exports.InvalidRateRatifierV1RateError = exports.InvalidTreeError = exports.InvalidTreeHeightError = exports.PayloadDecodeError = exports.InvalidOfferParameterError = exports.UnknownCollateralIndexError = exports.InvalidMarketParameterError = exports.InvalidPositionAccrualStateError = exports.InvalidPositionLossFactorError = exports.InvalidPositionAccrualTimestampError = exports.SettlementFeeExceedsPriceError = exports.InvalidTickSpacingError = exports.PriceGreaterThanOneError = exports.TickOutOfRangeError = exports.InvalidOfferGroupError = void 0;
+const morpho_ts_1 = require("@morpho-org/morpho-ts");
 /**
  * Thrown when a Midnight offer group violates protocol-level group mechanics.
  *
@@ -89,57 +90,25 @@ class SettlementFeeExceedsPriceError extends Error {
     }
 }
 exports.SettlementFeeExceedsPriceError = SettlementFeeExceedsPriceError;
+// Temporary compatibility exception for these shared morpho-ts errors.
 /**
  * Thrown when a local position accrual is requested for an impossible timestamp.
  *
- * @example
- * ```ts
- * import { InvalidPositionAccrualTimestampError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionAccrualTimestampError(1n, 2n);
- * ```
+ * @deprecated Import `InvalidPositionAccrualTimestampError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-class InvalidPositionAccrualTimestampError extends Error {
-    constructor(timestamp, lastAccrual) {
-        super(`Position accrual timestamp "${timestamp}" is before last accrual "${lastAccrual}". Use a timestamp greater than or equal to last accrual.`);
-        this.name = "InvalidPositionAccrualTimestampError";
-    }
-}
-exports.InvalidPositionAccrualTimestampError = InvalidPositionAccrualTimestampError;
+exports.InvalidPositionAccrualTimestampError = morpho_ts_1.InvalidPositionAccrualTimestampError;
 /**
  * Thrown when a local position accrual sees a market loss factor older than the position.
  *
- * @example
- * ```ts
- * import { InvalidPositionLossFactorError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionLossFactorError(1n, 2n);
- * ```
+ * @deprecated Import `InvalidPositionLossFactorError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-class InvalidPositionLossFactorError extends Error {
-    constructor(marketLossFactor, positionLossFactor) {
-        super(`Market loss factor "${marketLossFactor}" is below position loss factor "${positionLossFactor}". Fetch a consistent market and position at the same block.`);
-        this.name = "InvalidPositionLossFactorError";
-    }
-}
-exports.InvalidPositionLossFactorError = InvalidPositionLossFactorError;
+exports.InvalidPositionLossFactorError = morpho_ts_1.InvalidPositionLossFactorError;
 /**
  * Thrown when local position accrual inputs violate Midnight accounting invariants.
  *
- * @example
- * ```ts
- * import { InvalidPositionAccrualStateError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionAccrualStateError("Pending fee exceeds credit.");
- * ```
+ * @deprecated Import `InvalidPositionAccrualStateError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-class InvalidPositionAccrualStateError extends Error {
-    constructor(reason) {
-        super(`Invalid Midnight position accrual state. ${reason}`);
-        this.name = "InvalidPositionAccrualStateError";
-    }
-}
-exports.InvalidPositionAccrualStateError = InvalidPositionAccrualStateError;
+exports.InvalidPositionAccrualStateError = morpho_ts_1.InvalidPositionAccrualStateError;
 /**
  * Thrown when a market parameter cannot satisfy Midnight protocol rules.
  *

package/lib/cjs/position/PositionUtils.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PositionUtils = void 0;
 const morpho_ts_1 = require("@morpho-org/morpho-ts");
-const errors_js_1 = require("../errors.js");
 /**
  * Domain helpers for Midnight positions.
  *
@@ -135,40 +134,17 @@ var PositionUtils;
      */
     function accrueInterest(params) {
         const timestamp = BigInt(params.timestamp);
-        const credit = BigInt(params.position.credit);
-        const pendingFee = BigInt(params.position.pendingFee);
-        const lastLossFactor = BigInt(params.position.lastLossFactor);
-        const lastAccrual = BigInt(params.position.lastAccrual);
         const marketLossFactor = BigInt(params.market.lossFactor);
-        if (timestamp < lastAccrual) {
-            throw new errors_js_1.InvalidPositionAccrualTimestampError(timestamp, lastAccrual);
-        }
-        if (marketLossFactor < lastLossFactor) {
-            throw new errors_js_1.InvalidPositionLossFactorError(marketLossFactor, lastLossFactor);
-        }
-        if (pendingFee > credit) {
-            throw new errors_js_1.InvalidPositionAccrualStateError("Pending fee must be less than or equal to credit.");
-        }
-        const postSlashCredit = lastLossFactor < morpho_ts_1.MathLib.MAX_UINT_128
-            ? morpho_ts_1.MathLib.mulDivDown(credit, morpho_ts_1.MathLib.MAX_UINT_128 - marketLossFactor, morpho_ts_1.MathLib.MAX_UINT_128 - lastLossFactor)
-            : 0n;
-        if (postSlashCredit > credit) {
-            throw new errors_js_1.InvalidPositionAccrualStateError("Post-slash credit cannot exceed stored credit.");
-        }
-        const creditDecrease = credit - postSlashCredit;
-        const pendingFeeDecrease = credit > 0n ? morpho_ts_1.MathLib.mulDivUp(pendingFee, creditDecrease, credit) : 0n;
-        if (pendingFeeDecrease > pendingFee) {
-            throw new errors_js_1.InvalidPositionAccrualStateError("Pending-fee decrease cannot exceed pending fee.");
-        }
-        const postSlashPendingFee = pendingFee - pendingFeeDecrease;
         const maturity = BigInt(params.market.params.maturity);
-        const accrualEnd = timestamp < maturity ? timestamp : maturity;
-        const accruedFee = lastAccrual < maturity
-            ? morpho_ts_1.MathLib.mulDivDown(postSlashPendingFee, accrualEnd - lastAccrual, maturity - lastAccrual)
-            : 0n;
-        if (accruedFee > postSlashCredit || accruedFee > postSlashPendingFee) {
-            throw new errors_js_1.InvalidPositionAccrualStateError("Accrued fee cannot exceed post-slash credit or pending fee.");
-        }
+        const { credit, pendingFee, accruedFee } = morpho_ts_1.MidnightPositionLib.accrue({
+            credit: params.position.credit,
+            pendingFee: params.position.pendingFee,
+            lastLossFactor: params.position.lastLossFactor,
+            lastAccrual: params.position.lastAccrual,
+            marketLossFactor,
+            maturity,
+            timestamp,
+        });
         const collateral = params.position.collateral.map((assets) => BigInt(assets));
         const collateralParams = params.market.params.collateralParams.map((collateralParam) => ({
             token: collateralParam.token,
@@ -199,8 +175,8 @@ var PositionUtils;
             position: {
                 user: params.position.user,
                 marketId: params.position.marketId,
-                credit: postSlashCredit - accruedFee,
-                pendingFee: postSlashPendingFee - accruedFee,
+                credit,
+                pendingFee,
                 lastLossFactor: marketLossFactor,
                 lastAccrual: timestamp,
                 debt: BigInt(params.position.debt),

package/lib/esm/api/version.generated.d.ts

@@ -1,2 +1,2 @@
 /** @internal Installed Midnight SDK package version. */
-export declare const MIDNIGHT_SDK_VERSION = "2.1.0";
+export declare const MIDNIGHT_SDK_VERSION = "2.2.0-next.0";

package/lib/esm/api/version.generated.js

@@ -1,3 +1,3 @@
 // Generated by scripts/generate-midnight-package-version.ts. Do not edit.
 /** @internal Installed Midnight SDK package version. */
-export const MIDNIGHT_SDK_VERSION = "2.1.0";
+export const MIDNIGHT_SDK_VERSION = "2.2.0-next.0";

package/lib/esm/errors.d.ts

@@ -1,3 +1,4 @@
+import { InvalidPositionAccrualStateError as SharedInvalidPositionAccrualStateError, InvalidPositionAccrualTimestampError as SharedInvalidPositionAccrualTimestampError, InvalidPositionLossFactorError as SharedInvalidPositionLossFactorError } from "@morpho-org/morpho-ts";
 import type { Address } from "viem";
 import type { MempoolPayloadValidationIssue } from "./api/types.js";
 /**
@@ -70,42 +71,27 @@ export declare class SettlementFeeExceedsPriceError extends Error {
 /**
  * Thrown when a local position accrual is requested for an impossible timestamp.
  *
- * @example
- * ```ts
- * import { InvalidPositionAccrualTimestampError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionAccrualTimestampError(1n, 2n);
- * ```
+ * @deprecated Import `InvalidPositionAccrualTimestampError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-export declare class InvalidPositionAccrualTimestampError extends Error {
-    constructor(timestamp: bigint, lastAccrual: bigint);
-}
+export declare const InvalidPositionAccrualTimestampError: typeof SharedInvalidPositionAccrualTimestampError;
+/** @deprecated Import `InvalidPositionAccrualTimestampError` from `@morpho-org/morpho-ts`. Removed in the next major. */
+export type InvalidPositionAccrualTimestampError = SharedInvalidPositionAccrualTimestampError;
 /**
  * Thrown when a local position accrual sees a market loss factor older than the position.
  *
- * @example
- * ```ts
- * import { InvalidPositionLossFactorError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionLossFactorError(1n, 2n);
- * ```
+ * @deprecated Import `InvalidPositionLossFactorError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-export declare class InvalidPositionLossFactorError extends Error {
-    constructor(marketLossFactor: bigint, positionLossFactor: bigint);
-}
+export declare const InvalidPositionLossFactorError: typeof SharedInvalidPositionLossFactorError;
+/** @deprecated Import `InvalidPositionLossFactorError` from `@morpho-org/morpho-ts`. Removed in the next major. */
+export type InvalidPositionLossFactorError = SharedInvalidPositionLossFactorError;
 /**
  * Thrown when local position accrual inputs violate Midnight accounting invariants.
  *
- * @example
- * ```ts
- * import { InvalidPositionAccrualStateError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionAccrualStateError("Pending fee exceeds credit.");
- * ```
+ * @deprecated Import `InvalidPositionAccrualStateError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-export declare class InvalidPositionAccrualStateError extends Error {
-    constructor(reason: string);
-}
+export declare const InvalidPositionAccrualStateError: typeof SharedInvalidPositionAccrualStateError;
+/** @deprecated Import `InvalidPositionAccrualStateError` from `@morpho-org/morpho-ts`. Removed in the next major. */
+export type InvalidPositionAccrualStateError = SharedInvalidPositionAccrualStateError;
 /**
  * Thrown when a market parameter cannot satisfy Midnight protocol rules.
  *

package/lib/esm/errors.js

@@ -1,3 +1,4 @@
+import { InvalidPositionAccrualStateError as SharedInvalidPositionAccrualStateError, InvalidPositionAccrualTimestampError as SharedInvalidPositionAccrualTimestampError, InvalidPositionLossFactorError as SharedInvalidPositionLossFactorError, } from "@morpho-org/morpho-ts";
 /**
  * Thrown when a Midnight offer group violates protocol-level group mechanics.
  *
@@ -81,54 +82,25 @@ export class SettlementFeeExceedsPriceError extends Error {
         this.name = "SettlementFeeExceedsPriceError";
     }
 }
+// Temporary compatibility exception for these shared morpho-ts errors.
 /**
  * Thrown when a local position accrual is requested for an impossible timestamp.
  *
- * @example
- * ```ts
- * import { InvalidPositionAccrualTimestampError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionAccrualTimestampError(1n, 2n);
- * ```
+ * @deprecated Import `InvalidPositionAccrualTimestampError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-export class InvalidPositionAccrualTimestampError extends Error {
-    constructor(timestamp, lastAccrual) {
-        super(`Position accrual timestamp "${timestamp}" is before last accrual "${lastAccrual}". Use a timestamp greater than or equal to last accrual.`);
-        this.name = "InvalidPositionAccrualTimestampError";
-    }
-}
+export const InvalidPositionAccrualTimestampError = SharedInvalidPositionAccrualTimestampError;
 /**
  * Thrown when a local position accrual sees a market loss factor older than the position.
  *
- * @example
- * ```ts
- * import { InvalidPositionLossFactorError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionLossFactorError(1n, 2n);
- * ```
+ * @deprecated Import `InvalidPositionLossFactorError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-export class InvalidPositionLossFactorError extends Error {
-    constructor(marketLossFactor, positionLossFactor) {
-        super(`Market loss factor "${marketLossFactor}" is below position loss factor "${positionLossFactor}". Fetch a consistent market and position at the same block.`);
-        this.name = "InvalidPositionLossFactorError";
-    }
-}
+export const InvalidPositionLossFactorError = SharedInvalidPositionLossFactorError;
 /**
  * Thrown when local position accrual inputs violate Midnight accounting invariants.
  *
- * @example
- * ```ts
- * import { InvalidPositionAccrualStateError } from "@morpho-org/midnight-sdk";
- *
- * throw new InvalidPositionAccrualStateError("Pending fee exceeds credit.");
- * ```
+ * @deprecated Import `InvalidPositionAccrualStateError` from `@morpho-org/morpho-ts`. Removed in the next major.
  */
-export class InvalidPositionAccrualStateError extends Error {
-    constructor(reason) {
-        super(`Invalid Midnight position accrual state. ${reason}`);
-        this.name = "InvalidPositionAccrualStateError";
-    }
-}
+export const InvalidPositionAccrualStateError = SharedInvalidPositionAccrualStateError;
 /**
  * Thrown when a market parameter cannot satisfy Midnight protocol rules.
  *

package/lib/esm/position/PositionUtils.js

@@ -1,5 +1,4 @@
-import { MathLib } from "@morpho-org/morpho-ts";
-import { InvalidPositionAccrualStateError, InvalidPositionAccrualTimestampError, InvalidPositionLossFactorError, } from "../errors.js";
+import { MathLib, MidnightPositionLib, } from "@morpho-org/morpho-ts";
 /**
  * Domain helpers for Midnight positions.
  *
@@ -132,40 +131,17 @@ export var PositionUtils;
      */
     function accrueInterest(params) {
         const timestamp = BigInt(params.timestamp);
-        const credit = BigInt(params.position.credit);
-        const pendingFee = BigInt(params.position.pendingFee);
-        const lastLossFactor = BigInt(params.position.lastLossFactor);
-        const lastAccrual = BigInt(params.position.lastAccrual);
         const marketLossFactor = BigInt(params.market.lossFactor);
-        if (timestamp < lastAccrual) {
-            throw new InvalidPositionAccrualTimestampError(timestamp, lastAccrual);
-        }
-        if (marketLossFactor < lastLossFactor) {
-            throw new InvalidPositionLossFactorError(marketLossFactor, lastLossFactor);
-        }
-        if (pendingFee > credit) {
-            throw new InvalidPositionAccrualStateError("Pending fee must be less than or equal to credit.");
-        }
-        const postSlashCredit = lastLossFactor < MathLib.MAX_UINT_128
-            ? MathLib.mulDivDown(credit, MathLib.MAX_UINT_128 - marketLossFactor, MathLib.MAX_UINT_128 - lastLossFactor)
-            : 0n;
-        if (postSlashCredit > credit) {
-            throw new InvalidPositionAccrualStateError("Post-slash credit cannot exceed stored credit.");
-        }
-        const creditDecrease = credit - postSlashCredit;
-        const pendingFeeDecrease = credit > 0n ? MathLib.mulDivUp(pendingFee, creditDecrease, credit) : 0n;
-        if (pendingFeeDecrease > pendingFee) {
-            throw new InvalidPositionAccrualStateError("Pending-fee decrease cannot exceed pending fee.");
-        }
-        const postSlashPendingFee = pendingFee - pendingFeeDecrease;
         const maturity = BigInt(params.market.params.maturity);
-        const accrualEnd = timestamp < maturity ? timestamp : maturity;
-        const accruedFee = lastAccrual < maturity
-            ? MathLib.mulDivDown(postSlashPendingFee, accrualEnd - lastAccrual, maturity - lastAccrual)
-            : 0n;
-        if (accruedFee > postSlashCredit || accruedFee > postSlashPendingFee) {
-            throw new InvalidPositionAccrualStateError("Accrued fee cannot exceed post-slash credit or pending fee.");
-        }
+        const { credit, pendingFee, accruedFee } = MidnightPositionLib.accrue({
+            credit: params.position.credit,
+            pendingFee: params.position.pendingFee,
+            lastLossFactor: params.position.lastLossFactor,
+            lastAccrual: params.position.lastAccrual,
+            marketLossFactor,
+            maturity,
+            timestamp,
+        });
         const collateral = params.position.collateral.map((assets) => BigInt(assets));
         const collateralParams = params.market.params.collateralParams.map((collateralParam) => ({
             token: collateralParam.token,
@@ -196,8 +172,8 @@ export var PositionUtils;
             position: {
                 user: params.position.user,
                 marketId: params.position.marketId,
-                credit: postSlashCredit - accruedFee,
-                pendingFee: postSlashPendingFee - accruedFee,
+                credit,
+                pendingFee,
                 lastLossFactor: marketLossFactor,
                 lastAccrual: timestamp,
                 debt: BigInt(params.position.debt),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morpho-org/midnight-sdk",
   "description": "Viem-based package for Morpho Midnight that exports protocol utilities, fetch helpers, and Midnight API utilities under a dedicated API subpath.",
-  "version": "2.1.0",
+  "version": "2.2.0-next.0",
   "author": "Morpho Association <contact@morpho.org>",
   "repository": {
     "type": "git",
@@ -41,12 +41,12 @@
     "MIGRATION-v1-to-v2.md"
   ],
   "peerDependencies": {
-    "@morpho-org/morpho-ts": "^2.8.0 || ^3.0.0 || ^4.0.0",
+    "@morpho-org/morpho-ts": "^4.1.0-0",
     "viem": "^2.0.0"
   },
   "devDependencies": {
-    "@morpho-org/morpho-ts": "^4.0.1",
-    "@morpho-org/test": "^2.11.0",
+    "@morpho-org/morpho-ts": "^4.1.0-next.0",
+    "@morpho-org/test": "^2.12.0-next.0",
     "fast-check": "^4.9.0",
     "typescript": "7.0.2",
     "viem": "^2.55.10",