@morpho-org/midnight-sdk 0.1.0 → 1.1.1

package/lib/esm/offers/OfferUtils.js

@@ -1,9 +1,10 @@
-import { encodeAbiParameters, keccak256, zeroAddress, zeroHash } from "viem";
-import { DEFAULT_TICK_SPACING, MAX_CONTINUOUS_FEE, MAX_TICK, OFFER_TYPEHASH, } from "../constants.js";
+import { assertNonNegative, DivisionByZeroError, MathLib, } from "@morpho-org/morpho-ts";
+import { encodeAbiParameters, isAddressEqual, keccak256, zeroAddress, zeroHash, } from "viem";
+import { DEFAULT_TICK_SPACING, MAX_OFFER_CAP, MAX_TICK, OFFER_TYPEHASH, } from "../constants.js";
 import { InvalidOfferGroupError, InvalidOfferParameterError, } from "../errors.js";
-import { MarketUtils } from "../market/index.js";
+import { Market, MarketParams, MarketUtils } from "../market/index.js";
+import { TakeAmountsLib, TickLib } from "../math/index.js";
 import { Offer, } from "./Offer.js";
-const comparableHex = (value) => value.toLowerCase();
 const offerHashParams = [
     { name: "typehash", type: "bytes32" },
     { name: "marketHash", type: "bytes32" },
@@ -18,8 +19,8 @@ const offerHashParams = [
     { name: "receiverIfMakerIsSeller", type: "address" },
     { name: "ratifier", type: "address" },
     { name: "reduceOnly", type: "bool" },
-    { name: "maxUnits", type: "uint256" },
-    { name: "maxAssets", type: "uint256" },
+    { name: "maxUnits", type: "uint128" },
+    { name: "maxAssets", type: "uint128" },
     { name: "continuousFeeCap", type: "uint256" },
 ];
 /**
@@ -56,12 +57,14 @@ export var OfferUtils;
      *
      * const offer = Offer.create({
      *   market: {
+     *     chainId: 8453,
+     *     midnight: "0x0000000000000000000000000000000000001000",
      *     loanToken: "0x0000000000000000000000000000000000006000",
      *     collateralParams: [
      *       {
      *         token: "0x0000000000000000000000000000000000007000",
      *         lltv: 770000000000000000n,
-     *         maxLif: 1061007957559681697n,
+     *         liquidationCursor: 250000000000000000n,
      *         oracle: "0x0000000000000000000000000000000000008000",
      *       },
      *     ],
@@ -120,12 +123,14 @@ export var OfferUtils;
      *
      * const offer = Offer.create({
      *   market: {
+     *     chainId: 8453,
+     *     midnight: "0x0000000000000000000000000000000000001000",
      *     loanToken: "0x0000000000000000000000000000000000006000",
      *     collateralParams: [
      *       {
      *         token: "0x0000000000000000000000000000000000007000",
      *         lltv: 770000000000000000n,
-     *         maxLif: 1061007957559681697n,
+     *         liquidationCursor: 250000000000000000n,
      *         oracle: "0x0000000000000000000000000000000000008000",
      *       },
      *     ],
@@ -183,12 +188,14 @@ export var OfferUtils;
      *
      * const offer = Offer.create({
      *   market: {
+     *     chainId: 8453,
+     *     midnight: "0x0000000000000000000000000000000000001000",
      *     loanToken: "0x0000000000000000000000000000000000006000",
      *     collateralParams: [
      *       {
      *         token: "0x0000000000000000000000000000000000007000",
      *         lltv: 770000000000000000n,
-     *         maxLif: 1061007957559681697n,
+     *         liquidationCursor: 250000000000000000n,
      *         oracle: "0x0000000000000000000000000000000000008000",
      *       },
      *     ],
@@ -229,12 +236,14 @@ export var OfferUtils;
      *
      * const offer = Offer.create({
      *   market: {
+     *     chainId: 8453,
+     *     midnight: "0x0000000000000000000000000000000000001000",
      *     loanToken: "0x0000000000000000000000000000000000006000",
      *     collateralParams: [
      *       {
      *         token: "0x0000000000000000000000000000000000007000",
      *         lltv: 770000000000000000n,
-     *         maxLif: 1061007957559681697n,
+     *         liquidationCursor: 250000000000000000n,
      *         oracle: "0x0000000000000000000000000000000000008000",
      *       },
      *     ],
@@ -312,7 +321,7 @@ export var OfferUtils;
      * @param params.start - Optional offer start timestamp; defaults to zero.
      * @param params.expiry - Offer expiry timestamp.
      * @returns Normalized start and expiry timestamps.
-     * @throws {InvalidOfferParameterError} when the range is negative or not strictly increasing.
+     * @throws {InvalidOfferParameterError} when the range is negative or expiry is before start.
      * @example
      * ```ts
      * import { OfferUtils } from "@morpho-org/midnight-sdk";
@@ -331,11 +340,11 @@ export var OfferUtils;
                 instruction: "Use a non-negative timestamp.",
             });
         }
-        if (expiry < 0n || expiry <= start) {
+        if (expiry < 0n || expiry < start) {
             throw new InvalidOfferParameterError({
                 parameter: "expiry",
                 value: expiry,
-                instruction: `Use an expiry greater than start "${start}".`,
+                instruction: `Use an expiry greater than or equal to start "${start}".`,
             });
         }
         return { start, expiry };
@@ -376,6 +385,20 @@ export var OfferUtils;
                 instruction: "Use a non-negative cap.",
             });
         }
+        if (maxUnits > MAX_OFFER_CAP) {
+            throw new InvalidOfferParameterError({
+                parameter: "maxUnits",
+                value: maxUnits,
+                instruction: `Use a cap less than or equal to "${MAX_OFFER_CAP}".`,
+            });
+        }
+        if (maxAssets > MAX_OFFER_CAP) {
+            throw new InvalidOfferParameterError({
+                parameter: "maxAssets",
+                value: maxAssets,
+                instruction: `Use a cap less than or equal to "${MAX_OFFER_CAP}".`,
+            });
+        }
         if ((maxAssets === 0n) === (maxUnits === 0n)) {
             throw new InvalidOfferParameterError({
                 parameter: "maxUnits/maxAssets",
@@ -390,8 +413,8 @@ export var OfferUtils;
      * Validates and normalizes the maximum continuous fee an offer accepts.
      *
      * Use this before `Offer.create` when a maker UI exposes fee tolerance.
-     * `Offer.create` calls it internally and defaults omitted values to
-     * {@link MAX_CONTINUOUS_FEE}.
+     * `Offer.create` calls it internally and defaults omitted values to zero so
+     * fresh offers fail closed unless the maker explicitly accepts a fee cap.
      *
      * @param params.continuousFeeCap - Optional maximum market continuous fee accepted by this offer.
      * @returns Normalized continuous fee cap.
@@ -405,7 +428,7 @@ export var OfferUtils;
      * ```
      */
     function validateContinuousFeeCap(params) {
-        const continuousFeeCap = BigInt(params.continuousFeeCap ?? MAX_CONTINUOUS_FEE);
+        const continuousFeeCap = BigInt(params.continuousFeeCap ?? 0n);
         if (continuousFeeCap < 0n) {
             throw new InvalidOfferParameterError({
                 parameter: "continuousFeeCap",
@@ -458,22 +481,16 @@ export var OfferUtils;
      * instantiating an `Offer`. `Offer.create` uses the same validation and then
      * constructs the class instance for grouping and trees.
      *
-     * @param params.market - Market params or hydrated market this offer trades.
      * @param params.buy - Whether the maker buys loan assets.
      * @param params.maker - Maker address.
      * @param params.tick - Offer tick.
-     * @param params.group - Optional consumption group id for already-grouped offers.
      * @param params.tickSpacing - Optional market tick spacing; defaults to `DEFAULT_TICK_SPACING`.
      * @param params.maxUnits - Optional unit cap; defaults to zero.
      * @param params.maxAssets - Optional buyer or seller asset cap; defaults to zero.
-     * @param params.continuousFeeCap - Optional maximum market continuous fee accepted by this offer; defaults to `MAX_CONTINUOUS_FEE`.
+     * @param params.continuousFeeCap - Optional maximum market continuous fee accepted by this offer; defaults to zero.
      * @param params.start - Optional offer start timestamp; defaults to zero.
      * @param params.expiry - Offer expiry timestamp.
-     * @param params.callback - Optional callback address; defaults to the zero address.
-     * @param params.callbackData - Optional callback payload; defaults to `0x`.
      * @param params.receiverIfMakerIsSeller - Optional receiver used when maker is seller.
-     * @param params.ratifier - Ratifier contract address.
-     * @param params.reduceOnly - Optional flag restricting the offer to exposure-reducing execution.
      * @returns Normalized deterministic offer parameters.
      * @throws {InvalidOfferParameterError} when a deterministic offer parameter cannot satisfy protocol rules.
      * @example
@@ -481,26 +498,10 @@ export var OfferUtils;
      * import { OfferUtils } from "@morpho-org/midnight-sdk";
      *
      * const params = OfferUtils.validateOfferParams({
-     *   market: {
-     *     loanToken: "0x0000000000000000000000000000000000006000",
-     *     collateralParams: [
-     *       {
-     *         token: "0x0000000000000000000000000000000000007000",
-     *         lltv: 770000000000000000n,
-     *         maxLif: 1061007957559681697n,
-     *         oracle: "0x0000000000000000000000000000000000008000",
-     *       },
-     *     ],
-     *     maturity: 54_000n,
-     *     rcfThreshold: 0n,
-     *     enterGate: "0x0000000000000000000000000000000000000000",
-     *     liquidatorGate: "0x0000000000000000000000000000000000000000",
-     *   },
      *   buy: true,
      *   maker: "0x0000000000000000000000000000000000009000",
      *   tick: 5_000n,
      *   expiry: 3_600n,
-     *   ratifier: "0x0000000000000000000000000000000000004000",
      *   maxUnits: 100n,
      * });
      * console.log(params.maxAssets);
@@ -543,12 +544,14 @@ export var OfferUtils;
      *
      * const offer = Offer.create({
      *   market: {
+     *     chainId: 8453,
+     *     midnight: "0x0000000000000000000000000000000000001000",
      *     loanToken: "0x0000000000000000000000000000000000006000",
      *     collateralParams: [
      *       {
      *         token: "0x0000000000000000000000000000000000007000",
      *         lltv: 770000000000000000n,
-     *         maxLif: 1061007957559681697n,
+     *         liquidationCursor: 250000000000000000n,
      *         oracle: "0x0000000000000000000000000000000000008000",
      *       },
      *     ],
@@ -575,39 +578,315 @@ export var OfferUtils;
         }
         const offers = offerInputs.map((offer) => Offer.from(offer));
         const first = offers[0];
-        const expectedMaker = comparableHex(first.maker);
+        const expectedMaker = first.maker;
         const expectedBuy = first.buy;
-        const expectedLoanToken = comparableHex(first.market.loanToken);
+        const expectedLoanToken = MarketParams.from(first.market).loanToken;
+        const expectedChainId = MarketParams.from(first.market).chainId;
+        const expectedMidnight = MarketParams.from(first.market).midnight;
         const expectedMaxUnits = first.maxUnits;
         const expectedMaxAssets = first.maxAssets;
         for (const offer of offers) {
-            if (comparableHex(offer.maker) !== expectedMaker) {
+            if (!isAddressEqual(offer.maker, expectedMaker)) {
                 throw new InvalidOfferGroupError("All offers in a group must use the same maker.");
             }
             if (offer.buy !== expectedBuy) {
                 throw new InvalidOfferGroupError("All offers in a group must use the same maker side.");
             }
             if (offer.maxUnits < 0n ||
+                offer.maxUnits > MAX_OFFER_CAP ||
                 offer.maxAssets < 0n ||
+                offer.maxAssets > MAX_OFFER_CAP ||
                 (offer.maxAssets === 0n) === (offer.maxUnits === 0n)) {
-                throw new InvalidOfferGroupError("Every offer must set exactly one non-zero non-negative cap.");
+                throw new InvalidOfferGroupError("Every offer must set exactly one non-zero uint128 cap.");
             }
-            if (comparableHex(offer.market.loanToken) !== expectedLoanToken) {
+            if (!isAddressEqual(MarketParams.from(offer.market).loanToken, expectedLoanToken)) {
                 throw new InvalidOfferGroupError("All offers in a group must use the same loan token.");
             }
+            if (MarketParams.from(offer.market).chainId !== expectedChainId) {
+                throw new InvalidOfferGroupError("All offers in a group must use the same chain id.");
+            }
+            if (!isAddressEqual(MarketParams.from(offer.market).midnight, expectedMidnight)) {
+                throw new InvalidOfferGroupError("All offers in a group must use the same Midnight contract.");
+            }
             if (offer.maxUnits !== expectedMaxUnits ||
                 offer.maxAssets !== expectedMaxAssets) {
                 throw new InvalidOfferGroupError("All offers in a group must use the same cap mode and value.");
             }
             if (offer.buy &&
-                comparableHex(offer.receiverIfMakerIsSeller) !==
-                    comparableHex(zeroAddress)) {
+                !isAddressEqual(offer.receiverIfMakerIsSeller, zeroAddress)) {
                 throw new InvalidOfferGroupError("Buy offers must use the zero address as receiverIfMakerIsSeller.");
             }
         }
         return [...offers];
     }
     OfferUtils.validateOfferGroup = validateOfferGroup;
+    /**
+     * Converts an offer tick into its WAD zero-coupon price.
+     *
+     * Use for display or local quote checks when accepting any plain object
+     * matching `IOffer` or an `Offer` instance.
+     *
+     * @param offer - Offer to inspect.
+     * @returns WAD price rounded to the protocol price quantum.
+     * @throws {NegativeValueError} when `offer.tick` is negative.
+     * @throws {TickOutOfRangeError} when `offer.tick` exceeds `MAX_TICK`.
+     * @example
+     * ```ts
+     * import { OfferUtils } from "@morpho-org/midnight-sdk";
+     *
+     * const price = OfferUtils.getPrice({ tick: 5_000n });
+     * console.log(price);
+     * ```
+     */
+    function getPrice(offer) {
+        return TickLib.tickToPrice(offer.tick);
+    }
+    OfferUtils.getPrice = getPrice;
+    /**
+     * Converts an offer tick into a WAD per-second simple rate at a timestamp.
+     *
+     * The rate is the offer's fixed period rate divided by the market's remaining
+     * time to maturity at `timestamp`, rounded up.
+     *
+     * @param params.offer - Offer to inspect.
+     * @param params.timestamp - Timestamp at which the rate is calculated.
+     * @returns WAD per-second simple rate rounded up.
+     * @throws {NegativeValueError} when `market.maturity`, `timestamp`, or `tick` is negative.
+     * @throws {TickOutOfRangeError} when `tick` exceeds `MAX_TICK`.
+     * @throws {DivisionByZeroError} when the tick price is zero or `timestamp` is at or after maturity.
+     * @example
+     * ```ts
+     * import { Offer, OfferUtils } from "@morpho-org/midnight-sdk";
+     *
+     * const offer = Offer.from({
+     *   market: {
+     *     loanToken: "0x0000000000000000000000000000000000006000",
+     *     collateralParams: [
+     *       {
+     *         token: "0x0000000000000000000000000000000000007000",
+     *         lltv: 770000000000000000n,
+     *         liquidationCursor: 250000000000000000n,
+     *         oracle: "0x0000000000000000000000000000000000008000",
+     *       },
+     *     ],
+     *     maturity: 54_000n,
+     *     rcfThreshold: 0n,
+     *     enterGate: "0x0000000000000000000000000000000000000000",
+     *     liquidatorGate: "0x0000000000000000000000000000000000000000",
+     *   },
+     *   buy: true,
+     *   maker: "0x0000000000000000000000000000000000009000",
+     *   start: 0n,
+     *   expiry: 3_600n,
+     *   tick: 5_000n,
+     *   callback: "0x0000000000000000000000000000000000000000",
+     *   callbackData: "0x",
+     *   receiverIfMakerIsSeller: "0x0000000000000000000000000000000000000000",
+     *   ratifier: "0x0000000000000000000000000000000000004000",
+     *   reduceOnly: false,
+     *   maxUnits: 100n,
+     *   maxAssets: 0n,
+     *   continuousFeeCap: 317097919n,
+     * });
+     * const rate = OfferUtils.getRate({ offer, timestamp: 1_000n });
+     * console.log(rate);
+     * ```
+     */
+    function getRate(params) {
+        const market = MarketParams.from(params.offer.market);
+        const timestamp = BigInt(params.timestamp);
+        assertNonNegative("market.maturity", market.maturity);
+        assertNonNegative("timestamp", timestamp);
+        const timeToMaturity = MathLib.zeroFloorSub(market.maturity, timestamp);
+        if (timeToMaturity === 0n) {
+            throw new DivisionByZeroError("timeToMaturity");
+        }
+        return MathLib.mulDiv(TickLib.tickToRate(params.offer.tick), 1n, timeToMaturity, "Up");
+    }
+    OfferUtils.getRate = getRate;
+    /**
+     * Converts an offer tick into a WAD simple annual percentage rate at a timestamp.
+     *
+     * It computes time to maturity from the offer market and delegates the final
+     * tick annualization to `TickLib.tickToApr`.
+     *
+     * @param params.offer - Offer to inspect.
+     * @param params.timestamp - Timestamp at which the APR is calculated.
+     * @returns WAD simple APR rounded up.
+     * @throws {NegativeValueError} when `market.maturity`, `timestamp`, or `tick` is negative.
+     * @throws {TickOutOfRangeError} when `tick` exceeds `MAX_TICK`.
+     * @throws {DivisionByZeroError} when the tick price is zero or `timestamp` is at or after maturity.
+     * @example
+     * ```ts
+     * import { Offer, OfferUtils } from "@morpho-org/midnight-sdk";
+     *
+     * const offer = Offer.from({
+     *   market: {
+     *     loanToken: "0x0000000000000000000000000000000000006000",
+     *     collateralParams: [
+     *       {
+     *         token: "0x0000000000000000000000000000000000007000",
+     *         lltv: 770000000000000000n,
+     *         liquidationCursor: 250000000000000000n,
+     *         oracle: "0x0000000000000000000000000000000000008000",
+     *       },
+     *     ],
+     *     maturity: 54_000n,
+     *     rcfThreshold: 0n,
+     *     enterGate: "0x0000000000000000000000000000000000000000",
+     *     liquidatorGate: "0x0000000000000000000000000000000000000000",
+     *   },
+     *   buy: true,
+     *   maker: "0x0000000000000000000000000000000000009000",
+     *   start: 0n,
+     *   expiry: 3_600n,
+     *   tick: 5_000n,
+     *   callback: "0x0000000000000000000000000000000000000000",
+     *   callbackData: "0x",
+     *   receiverIfMakerIsSeller: "0x0000000000000000000000000000000000000000",
+     *   ratifier: "0x0000000000000000000000000000000000004000",
+     *   reduceOnly: false,
+     *   maxUnits: 100n,
+     *   maxAssets: 0n,
+     *   continuousFeeCap: 317097919n,
+     * });
+     * const apr = OfferUtils.getApr({ offer, timestamp: 1_000n });
+     * console.log(apr);
+     * ```
+     */
+    function getApr(params) {
+        const market = MarketParams.from(params.offer.market);
+        const timestamp = BigInt(params.timestamp);
+        assertNonNegative("market.maturity", market.maturity);
+        assertNonNegative("timestamp", timestamp);
+        return TickLib.tickToApr(params.offer.tick, MathLib.zeroFloorSub(market.maturity, timestamp));
+    }
+    OfferUtils.getApr = getApr;
+    /**
+     * Returns remaining units accepted by an offer's cap at a timestamp.
+     *
+     * The offer must carry a hydrated {@link Market} so the current market
+     * continuous fee and settlement-fee buckets are available locally. Fetch the
+     * current `consumed(maker, group)` value separately and pass it as input.
+     *
+     * @param params.offer - Offer to inspect. Its market must be hydrated.
+     * @param params.consumed - Amount already consumed from the offer group.
+     * @param params.timestamp - Timestamp used to compute market time to maturity.
+     * @returns Remaining consumable units accepted by Midnight `take`.
+     * @throws {InvalidOfferParameterError} when the offer does not carry hydrated market state or has invalid caps.
+     * @throws {NegativeValueError} when `consumed`, `timestamp`, offer limits, or delegated math inputs are negative.
+     * @throws {TickOutOfRangeError} when `tick` exceeds `MAX_TICK`.
+     * @throws {SettlementFeeExceedsPriceError} when settlement fee exceeds a buy-offer price.
+     * @example
+     * ```ts
+     * import { OfferUtils, midnightAbi } from "@morpho-org/midnight-sdk";
+     * import { createPublicClient, http } from "viem";
+     * import { base } from "viem/chains";
+     * import { readContract } from "viem/actions";
+     *
+     * const client = createPublicClient({ chain: base, transport: http() });
+     * const offer = {
+     *   market: {
+     *     params: {
+     *       chainId: 8453,
+     *       midnight: "0x0000000000000000000000000000000000001000",
+     *       loanToken: "0x0000000000000000000000000000000000006000",
+     *       collateralParams: [
+     *         {
+     *           token: "0x0000000000000000000000000000000000007000",
+     *           lltv: 770000000000000000n,
+     *           liquidationCursor: 250000000000000000n,
+     *           oracle: "0x0000000000000000000000000000000000008000",
+     *         },
+     *       ],
+     *       maturity: 54_000n,
+     *       rcfThreshold: 0n,
+     *       enterGate: "0x0000000000000000000000000000000000000000",
+     *       liquidatorGate: "0x0000000000000000000000000000000000000000",
+     *     },
+     *     totalUnits: 1_000n,
+     *     lossFactor: 0n,
+     *     withdrawable: 500n,
+     *     continuousFeeCredit: 0n,
+     *     settlementFeeCbps: [1, 2, 3, 4, 5, 6, 7],
+     *     continuousFee: 10,
+     *     tickSpacing: 4,
+     *   },
+     *   buy: true,
+     *   maker: "0x0000000000000000000000000000000000009000",
+     *   start: 0n,
+     *   expiry: 3_600n,
+     *   tick: 5_000n,
+     *   callback: "0x0000000000000000000000000000000000000000",
+     *   callbackData: "0x",
+     *   receiverIfMakerIsSeller: "0x0000000000000000000000000000000000000000",
+     *   ratifier: "0x0000000000000000000000000000000000004000",
+     *   reduceOnly: false,
+     *   maxUnits: 100n,
+     *   maxAssets: 0n,
+     *   continuousFeeCap: 317097919n,
+     * } as const;
+     * const consumed = await readContract(client, {
+     *   address: "0x0000000000000000000000000000000000001000",
+     *   abi: midnightAbi,
+     *   functionName: "consumed",
+     *   args: [offer.maker, "0x1111111111111111111111111111111111111111111111111111111111111111"],
+     * });
+     * const units = OfferUtils.getConsumableUnits({ offer, consumed, timestamp: 1_000n });
+     * console.log(units);
+     * ```
+     */
+    function getConsumableUnits(params) {
+        const offer = params.offer;
+        const consumed = BigInt(params.consumed);
+        const timestamp = BigInt(params.timestamp);
+        const start = BigInt(offer.start);
+        const expiry = BigInt(offer.expiry);
+        const maxUnits = BigInt(offer.maxUnits);
+        const maxAssets = BigInt(offer.maxAssets);
+        const continuousFeeCap = BigInt(offer.continuousFeeCap);
+        assertNonNegative("consumed", consumed);
+        assertNonNegative("timestamp", timestamp);
+        assertNonNegative("offer.start", start);
+        assertNonNegative("offer.expiry", expiry);
+        assertNonNegative("offer.maxUnits", maxUnits);
+        assertNonNegative("offer.maxAssets", maxAssets);
+        assertNonNegative("offer.continuousFeeCap", continuousFeeCap);
+        validateOfferCaps({ maxUnits, maxAssets });
+        if (!("params" in offer.market)) {
+            throw new InvalidOfferParameterError({
+                parameter: "market",
+                value: offer.market,
+                instruction: "Provide a hydrated Market with continuous fee and settlement fee buckets.",
+            });
+        }
+        const market = Market.from(offer.market);
+        if (timestamp < start || timestamp > expiry)
+            return 0n;
+        if (continuousFeeCap < BigInt(market.continuousFee))
+            return 0n;
+        if (maxUnits > 0n)
+            return MathLib.zeroFloorSub(maxUnits, consumed);
+        const remainingAssets = MathLib.zeroFloorSub(maxAssets, consumed);
+        const settlementFee = market.getSettlementFee(market.timeToMaturity(timestamp));
+        if (!offer.buy) {
+            const { sellerPrice } = TakeAmountsLib.prices({
+                offer,
+                settlementFee,
+            });
+            if (sellerPrice === 0n)
+                return MathLib.MAX_UINT_256;
+            return MathLib.mulDivDown(remainingAssets, MathLib.WAD, sellerPrice);
+        }
+        const { buyerPrice } = TakeAmountsLib.prices({
+            offer,
+            settlementFee,
+        });
+        if (buyerPrice === 0n)
+            return MathLib.MAX_UINT_256;
+        return ((remainingAssets + 1n) * MathLib.WAD - 1n) / buyerPrice;
+    }
+    OfferUtils.getConsumableUnits = getConsumableUnits;
     /**
      * Returns an offer expiry timestamp.
      *
@@ -624,12 +903,14 @@ export var OfferUtils;
      *
      * const offer = Offer.create({
      *   market: {
+     *     chainId: 8453,
+     *     midnight: "0x0000000000000000000000000000000000001000",
      *     loanToken: "0x0000000000000000000000000000000000006000",
      *     collateralParams: [
      *       {
      *         token: "0x0000000000000000000000000000000000007000",
      *         lltv: 770000000000000000n,
-     *         maxLif: 1061007957559681697n,
+     *         liquidationCursor: 250000000000000000n,
      *         oracle: "0x0000000000000000000000000000000000008000",
      *       },
      *     ],

package/lib/esm/queries/GetPosition.d.ts

@@ -52,4 +52,4 @@ export declare const abi: readonly [{
     readonly type: "function";
 }];
 /** @internal Deployless `GetPosition` query bytecode. */
-export declare const code = "0x60808060405234601557610362908161001a8239f35b5f80fdfe6080806040526004361015610012575f80fd5b5f3560e01c63d8f172c414610025575f80fd5b346101b85760603660031901126101b8576004356001600160a01b03811691908290036101b857602435906044356001600160a01b038116908190036101b85760e0820182811067ffffffffffffffff8211176102e2576040525f825260208201925f845260408301925f8452606081015f8152608082015f815260a08301915f835260c0840196611000604051906100be81836102f6565b36823788526040516349e2903160e11b8152600481018790526024810188905260c0816044818e5afa9081156101c4575f905f925f91885f925f925f91610243575b506001600160801b039081169091529081168852908116865290811684529182168b521685525f5b60808110156101cf5760405163ecdcc72d60e01b8152600481018890526024810189905260448101829052906020826064818f5afa80156101c4575f90610187575b600192506001600160801b038b519116908260051b015201610128565b506020823d82116101bc575b816101a0602093836102f6565b810103126101b8576101b3600192610318565b61016a565b5f80fd5b3d9150610193565b6040513d5f823e3d90fd5b506001600160801b039283899593818094818e816040519c51168c52511660208b0152511660408901525116606087015251166080850152511660a08301525160c082015f905b60808210610224576110c084f35b6020806001926001600160801b03865116815201930191019091610216565b965050505050505060c0813d60c0116102da575b8161026460c093836102f6565b810103126101b857806001600160801b0361027f8193610318565b918161028d60208301610318565b938161029b60408501610318565b93816102a960608301610318565b938d826102c460a06102bd60808801610318565b9601610318565b929a989694929550509497509450509396610100565b3d9150610257565b634e487b7160e01b5f52604160045260245ffd5b90601f8019910116810190811067ffffffffffffffff8211176102e257604052565b51906001600160801b03821682036101b85756fea264697066735822122047b31034ba6d0d5a88fb953996f2d97fa501664a716d124ff2e42e0782119d9164736f6c63430008230033";
+export declare const code = "0x60808060405234601557610362908161001a8239f35b5f80fdfe6080806040526004361015610012575f80fd5b5f3560e01c63d8f172c414610025575f80fd5b346101b85760603660031901126101b8576004356001600160a01b03811691908290036101b857602435906044356001600160a01b038116908190036101b85760e0820182811067ffffffffffffffff8211176102e2576040525f825260208201925f845260408301925f8452606081015f8152608082015f815260a08301915f835260c0840196611000604051906100be81836102f6565b36823788526040516349e2903160e11b8152600481018790526024810188905260c0816044818e5afa9081156101c4575f905f925f91885f925f925f91610243575b506001600160801b039081169091529081168852908116865290811684529182168b521685525f5b60808110156101cf5760405163ecdcc72d60e01b8152600481018890526024810189905260448101829052906020826064818f5afa80156101c4575f90610187575b600192506001600160801b038b519116908260051b015201610128565b506020823d82116101bc575b816101a0602093836102f6565b810103126101b8576101b3600192610318565b61016a565b5f80fd5b3d9150610193565b6040513d5f823e3d90fd5b506001600160801b039283899593818094818e816040519c51168c52511660208b0152511660408901525116606087015251166080850152511660a08301525160c082015f905b60808210610224576110c084f35b6020806001926001600160801b03865116815201930191019091610216565b965050505050505060c0813d60c0116102da575b8161026460c093836102f6565b810103126101b857806001600160801b0361027f8193610318565b918161028d60208301610318565b938161029b60408501610318565b93816102a960608301610318565b938d826102c460a06102bd60808801610318565b9601610318565b929a989694929550509497509450509396610100565b3d9150610257565b634e487b7160e01b5f52604160045260245ffd5b90601f8019910116810190811067ffffffffffffffff8211176102e257604052565b51906001600160801b03821682036101b85756fea264697066735822122048ab3e1a986178f7e3c65d73416611318a31ef34d18800cb6a1f1ba4dad746b364736f6c63430008230033";

package/lib/esm/queries/GetPosition.js

@@ -68,4 +68,4 @@ export const abi = [
     },
 ];
 /** @internal Deployless `GetPosition` query bytecode. */
-export const code = "0x60808060405234601557610362908161001a8239f35b5f80fdfe6080806040526004361015610012575f80fd5b5f3560e01c63d8f172c414610025575f80fd5b346101b85760603660031901126101b8576004356001600160a01b03811691908290036101b857602435906044356001600160a01b038116908190036101b85760e0820182811067ffffffffffffffff8211176102e2576040525f825260208201925f845260408301925f8452606081015f8152608082015f815260a08301915f835260c0840196611000604051906100be81836102f6565b36823788526040516349e2903160e11b8152600481018790526024810188905260c0816044818e5afa9081156101c4575f905f925f91885f925f925f91610243575b506001600160801b039081169091529081168852908116865290811684529182168b521685525f5b60808110156101cf5760405163ecdcc72d60e01b8152600481018890526024810189905260448101829052906020826064818f5afa80156101c4575f90610187575b600192506001600160801b038b519116908260051b015201610128565b506020823d82116101bc575b816101a0602093836102f6565b810103126101b8576101b3600192610318565b61016a565b5f80fd5b3d9150610193565b6040513d5f823e3d90fd5b506001600160801b039283899593818094818e816040519c51168c52511660208b0152511660408901525116606087015251166080850152511660a08301525160c082015f905b60808210610224576110c084f35b6020806001926001600160801b03865116815201930191019091610216565b965050505050505060c0813d60c0116102da575b8161026460c093836102f6565b810103126101b857806001600160801b0361027f8193610318565b918161028d60208301610318565b938161029b60408501610318565b93816102a960608301610318565b938d826102c460a06102bd60808801610318565b9601610318565b929a989694929550509497509450509396610100565b3d9150610257565b634e487b7160e01b5f52604160045260245ffd5b90601f8019910116810190811067ffffffffffffffff8211176102e257604052565b51906001600160801b03821682036101b85756fea264697066735822122047b31034ba6d0d5a88fb953996f2d97fa501664a716d124ff2e42e0782119d9164736f6c63430008230033";
+export const code = "0x60808060405234601557610362908161001a8239f35b5f80fdfe6080806040526004361015610012575f80fd5b5f3560e01c63d8f172c414610025575f80fd5b346101b85760603660031901126101b8576004356001600160a01b03811691908290036101b857602435906044356001600160a01b038116908190036101b85760e0820182811067ffffffffffffffff8211176102e2576040525f825260208201925f845260408301925f8452606081015f8152608082015f815260a08301915f835260c0840196611000604051906100be81836102f6565b36823788526040516349e2903160e11b8152600481018790526024810188905260c0816044818e5afa9081156101c4575f905f925f91885f925f925f91610243575b506001600160801b039081169091529081168852908116865290811684529182168b521685525f5b60808110156101cf5760405163ecdcc72d60e01b8152600481018890526024810189905260448101829052906020826064818f5afa80156101c4575f90610187575b600192506001600160801b038b519116908260051b015201610128565b506020823d82116101bc575b816101a0602093836102f6565b810103126101b8576101b3600192610318565b61016a565b5f80fd5b3d9150610193565b6040513d5f823e3d90fd5b506001600160801b039283899593818094818e816040519c51168c52511660208b0152511660408901525116606087015251166080850152511660a08301525160c082015f905b60808210610224576110c084f35b6020806001926001600160801b03865116815201930191019091610216565b965050505050505060c0813d60c0116102da575b8161026460c093836102f6565b810103126101b857806001600160801b0361027f8193610318565b918161028d60208301610318565b938161029b60408501610318565b93816102a960608301610318565b938d826102c460a06102bd60808801610318565b9601610318565b929a989694929550509497509450509396610100565b3d9150610257565b634e487b7160e01b5f52604160045260245ffd5b90601f8019910116810190811067ffffffffffffffff8211176102e257604052565b51906001600160801b03821682036101b85756fea264697066735822122048ab3e1a986178f7e3c65d73416611318a31ef34d18800cb6a1f1ba4dad746b364736f6c63430008230033";