@morpho-dev/router 0.7.1 → 0.8.0

package/dist/index.browser.mjs

@@ -11,11 +11,191 @@ import { generateDocument } from "openapi-metadata";
 import { ApiBody, ApiOperation, ApiParam, ApiProperty, ApiQuery, ApiResponse, ApiTags } from "openapi-metadata/decorators";
 import createOpenApiFetchClient from "openapi-fetch";
 
+//#region \0@oxc-project+runtime@0.110.0/helpers/typeof.js
+function _typeof(o) {
+	"@babel/helpers - typeof";
+	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
+		return typeof o;
+	} : function(o) {
+		return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+	}, _typeof(o);
+}
+
+//#endregion
+//#region \0@oxc-project+runtime@0.110.0/helpers/toPrimitive.js
+function toPrimitive(t, r) {
+	if ("object" != _typeof(t) || !t) return t;
+	var e = t[Symbol.toPrimitive];
+	if (void 0 !== e) {
+		var i = e.call(t, r || "default");
+		if ("object" != _typeof(i)) return i;
+		throw new TypeError("@@toPrimitive must return a primitive value.");
+	}
+	return ("string" === r ? String : Number)(t);
+}
+
+//#endregion
+//#region \0@oxc-project+runtime@0.110.0/helpers/toPropertyKey.js
+function toPropertyKey(t) {
+	var i = toPrimitive(t, "string");
+	return "symbol" == _typeof(i) ? i : i + "";
+}
+
+//#endregion
+//#region \0@oxc-project+runtime@0.110.0/helpers/defineProperty.js
+function _defineProperty(e, r, t) {
+	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+		value: t,
+		enumerable: !0,
+		configurable: !0,
+		writable: !0
+	}) : e[r] = t, e;
+}
+
+//#endregion
+//#region src/utils/Errors.ts
+var Errors_exports = /* @__PURE__ */ __exportAll({
+	BaseError: () => BaseError,
+	ReorgError: () => ReorgError
+});
+/**
+* Base error class inherited by all errors thrown by mempool.
+*
+* @example
+* ```ts
+* import { Errors } from 'mempool'
+* throw new Errors.BaseError('An error occurred')
+* ```
+*/
+var BaseError = class BaseError extends Error {
+	constructor(shortMessage, options = {}) {
+		const details = (() => {
+			if (options.cause instanceof BaseError) {
+				if (options.cause.details) return options.cause.details;
+				if (options.cause.shortMessage) return options.cause.shortMessage;
+			}
+			if (options.cause && "details" in options.cause && typeof options.cause.details === "string") return options.cause.details;
+			if (options.cause?.message) return options.cause.message;
+			return options.details;
+		})();
+		const message = [
+			shortMessage || "An error occurred.",
+			...options.metaMessages ? ["", ...options.metaMessages] : [],
+			...details ? ["", details ? `Details: ${details}` : void 0] : []
+		].filter((x) => typeof x === "string").join("\n");
+		super(message, options.cause ? { cause: options.cause } : void 0);
+		_defineProperty(this, "details", void 0);
+		_defineProperty(this, "shortMessage", void 0);
+		_defineProperty(this, "cause", void 0);
+		_defineProperty(this, "name", "BaseError");
+		this.cause = options.cause;
+		this.details = details;
+		this.shortMessage = shortMessage;
+	}
+	walk(fn) {
+		return walk(this, fn);
+	}
+};
+/** @internal */
+function walk(err, fn) {
+	if (fn?.(err)) return err;
+	if (err && typeof err === "object" && "cause" in err && err.cause) return walk(err.cause, fn);
+	return fn ? null : err;
+}
+var ReorgError = class extends BaseError {
+	constructor(blockNumber) {
+		super(`Reorg detected at block number ${blockNumber}`);
+		_defineProperty(this, "name", "ReorgError");
+	}
+};
+
+//#endregion
+//#region src/core/Tick.ts
+var Tick_exports = /* @__PURE__ */ __exportAll({
+	InvalidPriceError: () => InvalidPriceError,
+	InvalidTickError: () => InvalidTickError,
+	MAX_PRICE: () => MAX_PRICE,
+	TICK_RANGE: () => TICK_RANGE,
+	priceToTick: () => priceToTick,
+	tickToPrice: () => tickToPrice
+});
+/** ln(1 + 0.025), scaled by 1e18. Matches TickLib onchain constant. */
+const LN_ONE_PLUS_DELTA = 24692612590371501n;
+/** ln(2), scaled by 1e18. Matches TickLib onchain constant. */
+const LN2 = 693147180559945309n;
+const WAD$1 = 10n ** 18n;
+const WAD_SQUARED = 10n ** 36n;
+const PRICE_STEP = 10n ** 13n;
+const HALF_TICK_RANGE = 495n;
+/** Tick domain supported by Morpho V2. */
+const TICK_RANGE = 990;
+/** Max allowed price (1e18 in wad). */
+const MAX_PRICE = WAD$1;
+/**
+* Converts a tick to a wad price using the same approximation and rounding as TickLib.
+* @param tick - Tick value in the inclusive range [0, 990].
+* @returns The price in wad units.
+* @throws {@link InvalidTickError} If tick is not an integer in range [0, 990].
+*/
+function tickToPrice(tick) {
+	assertTick(tick);
+	return divHalfDownUnchecked(divHalfDownUnchecked(WAD_SQUARED, WAD$1 + wExp(LN_ONE_PLUS_DELTA * (HALF_TICK_RANGE - BigInt(tick)))), PRICE_STEP) * PRICE_STEP;
+}
+/**
+* Returns the lowest tick with a higher-or-equal price.
+* @param price - Price in wad units.
+* @returns The first tick whose {@link tickToPrice} is greater than or equal to `price`.
+* @throws {@link InvalidPriceError} If price is outside [0, 1e18].
+*/
+function priceToTick(price) {
+	assertPrice(price);
+	let low = 0;
+	let high = TICK_RANGE;
+	while (low !== high) {
+		const mid = Math.floor((low + high) / 2);
+		if (tickToPrice(mid) < price) low = mid + 1;
+		else high = mid;
+	}
+	return low;
+}
+function divHalfDownUnchecked(x, d) {
+	return (x + (d - 1n) / 2n) / d;
+}
+function wExp(x) {
+	if (x < 0n) return WAD_SQUARED / wExp(-x);
+	const q = (x + LN2 / 2n) / LN2;
+	const r = x - q * LN2;
+	const secondTerm = r * r / (2n * WAD$1);
+	const thirdTerm = secondTerm * r / (3n * WAD$1);
+	return WAD$1 + r + secondTerm + thirdTerm << q;
+}
+function assertTick(tick) {
+	if (!Number.isInteger(tick) || tick < 0 || tick > TICK_RANGE) throw new InvalidTickError(tick);
+}
+function assertPrice(price) {
+	if (price < 0n || price > MAX_PRICE) throw new InvalidPriceError(price);
+}
+var InvalidTickError = class extends BaseError {
+	constructor(tick) {
+		super(`Invalid tick: ${tick}. Tick must be an integer between 0 and ${TICK_RANGE}.`);
+		_defineProperty(this, "name", "Tick.InvalidTickError");
+	}
+};
+var InvalidPriceError = class extends BaseError {
+	constructor(price) {
+		super(`Invalid price: ${price}. Price must be between 0 and ${MAX_PRICE}.`);
+		_defineProperty(this, "name", "Tick.InvalidPriceError");
+	}
+};
+
+//#endregion
 //#region src/api/Schema/BookResponse.ts
 var BookResponse_exports = /* @__PURE__ */ __exportAll({ from: () => from$15 });
 function from$15(level) {
+	const price = tickToPrice(level.tick);
 	return {
-		price: level.price.toString(),
+		tick: level.tick,
+		price: price.toString(),
 		assets: level.assets.toString(),
 		count: level.count
 	};
@@ -98,6 +278,61 @@ const MetaMorpho = parseAbi([
 //#region src/core/Abi/MetaMorphoFactory.ts
 const MetaMorphoFactory = parseAbi(["event CreateMetaMorpho(address indexed metaMorpho,address indexed caller,address initialOwner,uint256 initialTimelock,address indexed asset,string name,string symbol,bytes32 salt)", "function isMetaMorpho(address) view returns (bool)"]);
 
+//#endregion
+//#region src/core/Abi/MorphoV2.ts
+const MorphoV2 = parseAbi([
+	"constructor()",
+	"function collateralOf(bytes32 id, address user, address collateralToken) view returns (uint256)",
+	"function consume(bytes32 group, uint256 amount)",
+	"function consumed(address user, bytes32 group) view returns (uint256)",
+	"function debtOf(bytes32 id, address user) view returns (uint256)",
+	"function defaultFees(address loanToken, uint256 index) view returns (uint16)",
+	"function feeSetter() view returns (address)",
+	"function fees(bytes32 id) view returns (uint16[6])",
+	"function flashLoan(address token, uint256 assets, address callback, bytes data)",
+	"function isHealthy((address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation, bytes32 id, address borrower) view returns (bool)",
+	"function liquidate((address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation, (uint256 collateralIndex, uint256 repaid, uint256 seized)[] seizures, address borrower, bytes data) returns ((uint256 collateralIndex, uint256 repaid, uint256 seized)[])",
+	"function multicall(bytes[] calls)",
+	"function obligationCreated(bytes32 id) view returns (bool)",
+	"function obligationState(bytes32 id) view returns (uint128 totalUnits, uint128 totalShares, uint256 withdrawable, bool created)",
+	"function owner() view returns (address)",
+	"function repay((address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation, uint256 obligationUnits, address onBehalf)",
+	"function session(address user) view returns (bytes32)",
+	"function setDefaultTradingFee(address loanToken, uint256 index, uint256 newTradingFee)",
+	"function setFeeSetter(address newFeeSetter)",
+	"function setObligationTradingFee(bytes32 id, uint256 index, uint256 newTradingFee)",
+	"function setOwner(address newOwner)",
+	"function setTradingFeeRecipient(address recipient)",
+	"function sharesOf(bytes32 id, address user) view returns (uint256)",
+	"function shuffleSession()",
+	"function supplyCollateral((address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation, address collateral, uint256 assets, address onBehalf)",
+	"function take(uint256 buyerAssets, uint256 sellerAssets, uint256 obligationUnits, uint256 obligationShares, address taker, ((address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation, bool buy, address maker, uint256 assets, uint256 obligationUnits, uint256 obligationShares, uint256 start, uint256 expiry, uint256 tick, bytes32 group, bytes32 session, address callback, bytes callbackData) offer, (uint8 v, bytes32 r, bytes32 s) sig, bytes32 root, bytes32[] proof, address takerCallback, bytes takerCallbackData) returns (uint256, uint256, uint256, uint256)",
+	"function totalShares(bytes32 id) view returns (uint256)",
+	"function totalUnits(bytes32 id) view returns (uint256)",
+	"function touchObligation((address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation) returns (bytes32)",
+	"function tradingFee(bytes32 id, uint256 timeToMaturity) view returns (uint256)",
+	"function tradingFeeRecipient() view returns (address)",
+	"function withdraw((address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation, uint256 obligationUnits, uint256 shares, address onBehalf) returns (uint256, uint256)",
+	"function withdrawCollateral((address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation, address collateral, uint256 assets, address onBehalf)",
+	"function withdrawable(bytes32 id) view returns (uint256)",
+	"event Constructor(address indexed owner)",
+	"event Consume(address indexed user, bytes32 indexed group, uint256 amount)",
+	"event FlashLoan(address indexed caller, address indexed token, uint256 assets)",
+	"event Liquidate(address indexed caller, bytes32 indexed id, (uint256 collateralIndex, uint256 repaid, uint256 seized)[] seizures, address indexed borrower, uint256 totalRepaid, uint256 badDebt)",
+	"event ObligationCreated(bytes32 indexed id, (address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation)",
+	"event Repay(address indexed caller, bytes32 indexed id, uint256 obligationUnits, address indexed onBehalf)",
+	"event SetDefaultTradingFee(address indexed loanToken, uint256 indexed index, uint256 newTradingFee)",
+	"event SetFeeSetter(address indexed feeSetter)",
+	"event SetObligationTradingFee(bytes32 indexed id, uint256 indexed index, uint256 newTradingFee)",
+	"event SetOwner(address indexed owner)",
+	"event SetTradingFeeRecipient(address indexed recipient)",
+	"event ShuffleSession(address indexed user, bytes32 session)",
+	"event SupplyCollateral(address caller, bytes32 indexed id, address indexed collateral, uint256 assets, address indexed onBehalf)",
+	"event Take(address caller, bytes32 indexed id, address indexed maker, address indexed taker, bool offerIsBuy, uint256 buyerAssets, uint256 sellerAssets, uint256 obligationUnits, uint256 obligationShares, bool buyerIsLender, bool sellerIsBorrower, bytes32 group, uint256 consumed)",
+	"event Withdraw(address indexed caller, bytes32 indexed id, uint256 obligationUnits, uint256 shares, address indexed onBehalf)",
+	"event WithdrawCollateral(address caller, bytes32 indexed id, address indexed collateral, uint256 assets, address indexed onBehalf)"
+]);
+
 //#endregion
 //#region src/core/Abi/index.ts
 var Abi_exports = /* @__PURE__ */ __exportAll({
@@ -105,6 +340,7 @@ var Abi_exports = /* @__PURE__ */ __exportAll({
 	MetaMorpho: () => MetaMorpho,
 	MetaMorphoFactory: () => MetaMorphoFactory,
 	Morpho: () => Morpho,
+	MorphoV2: () => MorphoV2,
 	Oracle: () => Oracle
 });
 const Oracle = [{
@@ -307,105 +543,6 @@ function* batch$1(array, batchSize) {
 	for (let i = 0; i < array.length; i += batchSize) yield array.slice(i, i + batchSize);
 }
 
-//#endregion
-//#region \0@oxc-project+runtime@0.110.0/helpers/typeof.js
-function _typeof(o) {
-	"@babel/helpers - typeof";
-	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
-		return typeof o;
-	} : function(o) {
-		return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-	}, _typeof(o);
-}
-
-//#endregion
-//#region \0@oxc-project+runtime@0.110.0/helpers/toPrimitive.js
-function toPrimitive(t, r) {
-	if ("object" != _typeof(t) || !t) return t;
-	var e = t[Symbol.toPrimitive];
-	if (void 0 !== e) {
-		var i = e.call(t, r || "default");
-		if ("object" != _typeof(i)) return i;
-		throw new TypeError("@@toPrimitive must return a primitive value.");
-	}
-	return ("string" === r ? String : Number)(t);
-}
-
-//#endregion
-//#region \0@oxc-project+runtime@0.110.0/helpers/toPropertyKey.js
-function toPropertyKey(t) {
-	var i = toPrimitive(t, "string");
-	return "symbol" == _typeof(i) ? i : i + "";
-}
-
-//#endregion
-//#region \0@oxc-project+runtime@0.110.0/helpers/defineProperty.js
-function _defineProperty(e, r, t) {
-	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
-		value: t,
-		enumerable: !0,
-		configurable: !0,
-		writable: !0
-	}) : e[r] = t, e;
-}
-
-//#endregion
-//#region src/utils/Errors.ts
-var Errors_exports = /* @__PURE__ */ __exportAll({
-	BaseError: () => BaseError,
-	ReorgError: () => ReorgError
-});
-/**
-* Base error class inherited by all errors thrown by mempool.
-*
-* @example
-* ```ts
-* import { Errors } from 'mempool'
-* throw new Errors.BaseError('An error occurred')
-* ```
-*/
-var BaseError = class BaseError extends Error {
-	constructor(shortMessage, options = {}) {
-		const details = (() => {
-			if (options.cause instanceof BaseError) {
-				if (options.cause.details) return options.cause.details;
-				if (options.cause.shortMessage) return options.cause.shortMessage;
-			}
-			if (options.cause && "details" in options.cause && typeof options.cause.details === "string") return options.cause.details;
-			if (options.cause?.message) return options.cause.message;
-			return options.details;
-		})();
-		const message = [
-			shortMessage || "An error occurred.",
-			...options.metaMessages ? ["", ...options.metaMessages] : [],
-			...details ? ["", details ? `Details: ${details}` : void 0] : []
-		].filter((x) => typeof x === "string").join("\n");
-		super(message, options.cause ? { cause: options.cause } : void 0);
-		_defineProperty(this, "details", void 0);
-		_defineProperty(this, "shortMessage", void 0);
-		_defineProperty(this, "cause", void 0);
-		_defineProperty(this, "name", "BaseError");
-		this.cause = options.cause;
-		this.details = details;
-		this.shortMessage = shortMessage;
-	}
-	walk(fn) {
-		return walk(this, fn);
-	}
-};
-/** @internal */
-function walk(err, fn) {
-	if (fn?.(err)) return err;
-	if (err && typeof err === "object" && "cause" in err && err.cause) return walk(err.cause, fn);
-	return fn ? null : err;
-}
-var ReorgError = class extends BaseError {
-	constructor(blockNumber) {
-		super(`Reorg detected at block number ${blockNumber}`);
-		_defineProperty(this, "name", "ReorgError");
-	}
-};
-
 //#endregion
 //#region src/core/Chain.ts
 var Chain_exports = /* @__PURE__ */ __exportAll({
@@ -510,8 +647,8 @@ const chains$1 = {
 		name: "ethereum-virtual-testnet",
 		custom: {
 			morpho: {
-				address: "0x11a002d45db720ed47a80d2f3489cba5b833eaf5",
-				blockCreated: 0
+				address: "0x634b095371e4e45feed94c1a45c37798e173ea50",
+				blockCreated: 23226700
 			},
 			morphoBlue: {
 				address: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb",
@@ -1452,7 +1589,7 @@ const OfferSchema = () => {
 		assets: z$1.bigint({ coerce: true }).min(0n).max(maxUint256),
 		obligationUnits: z$1.bigint({ coerce: true }).min(0n).max(maxUint256).optional().default(0n),
 		obligationShares: z$1.bigint({ coerce: true }).min(0n).max(maxUint256).optional().default(0n),
-		price: z$1.bigint({ coerce: true }).min(0n).max(maxUint256),
+		tick: z$1.coerce.number().int().min(0).max(990),
 		maturity: MaturitySchema,
 		expiry: z$1.number().int().max(Number.MAX_SAFE_INTEGER),
 		start: z$1.number().int().max(Number.MAX_SAFE_INTEGER),
@@ -1524,7 +1661,7 @@ const serialize = (offer) => ({
 	assets: offer.assets.toString(),
 	obligationUnits: offer.obligationUnits.toString(),
 	obligationShares: offer.obligationShares.toString(),
-	price: offer.price.toString(),
+	tick: offer.tick,
 	maturity: Number(offer.maturity),
 	expiry: Number(offer.expiry),
 	start: Number(offer.start),
@@ -1569,14 +1706,13 @@ function random$1(config) {
 		[.98, 2]
 	]));
 	const buy = config?.buy !== void 0 ? config.buy : bool();
-	const ONE = 1000000000000000000n;
-	const qMin = buy ? 16 : 4;
-	const len = (buy ? 32 : 16) - qMin + 1;
-	const pricePairs = Array.from({ length: len }, (_, idx) => {
-		const q = qMin + idx;
-		return [BigInt(q) * (ONE / 4n), buy ? 1 + idx : 1 + (len - 1 - idx)];
+	const tickMin = buy ? 0 : 495;
+	const len = (buy ? 495 : 990) - tickMin + 1;
+	const tickPairs = Array.from({ length: len }, (_, idx) => {
+		const weight = buy ? 1 + idx : 1 + (len - 1 - idx);
+		return [tickMin + idx, weight];
 	});
-	const price = config?.price ?? weightedChoice(pricePairs);
+	const tick = config?.tick ?? weightedChoice(tickPairs);
 	const loanTokenDecimals = config?.assetsDecimals?.[loanToken] ?? 18;
 	const unit = BigInt(10) ** BigInt(loanTokenDecimals);
 	const amountBase = BigInt(100 + int(999901));
@@ -1590,7 +1726,7 @@ function random$1(config) {
 		assets: assetsScaled,
 		obligationUnits: config?.obligationUnits ?? 0n,
 		obligationShares: config?.obligationShares ?? 0n,
-		price,
+		tick,
 		maturity,
 		expiry: config?.expiry ?? maturity - 1,
 		start: config?.start ?? maturity - 10,
@@ -1655,7 +1791,7 @@ const types = {
 			type: "uint256"
 		},
 		{
-			name: "price",
+			name: "tick",
 			type: "uint256"
 		},
 		{
@@ -1723,7 +1859,7 @@ function hash(offer) {
 			assets: offer.assets,
 			obligationUnits: offer.obligationUnits,
 			obligationShares: offer.obligationShares,
-			price: offer.price,
+			tick: BigInt(offer.tick),
 			maturity: BigInt(offer.maturity),
 			expiry: BigInt(offer.expiry),
 			group: offer.group,
@@ -1774,7 +1910,7 @@ const OfferAbi = [
 		type: "uint256"
 	},
 	{
-		name: "price",
+		name: "tick",
 		type: "uint256"
 	},
 	{
@@ -1845,7 +1981,7 @@ function encode$1(offer) {
 		offer.assets,
 		offer.obligationUnits,
 		offer.obligationShares,
-		offer.price,
+		BigInt(offer.tick),
 		BigInt(offer.maturity),
 		BigInt(offer.expiry),
 		offer.group,
@@ -1870,7 +2006,7 @@ function decode$1(data) {
 		assets: decoded[1],
 		obligationUnits: decoded[2],
 		obligationShares: decoded[3],
-		price: decoded[4],
+		tick: Number(decoded[4]),
 		maturity: from$11(Number(decoded[5])),
 		expiry: Number(decoded[6]),
 		group: decoded[7],
@@ -2734,6 +2870,16 @@ const BrandTypeId = Symbol.for("mempool/Brand");
 //#endregion
 //#region src/api/Schema/OfferResponse.ts
 var OfferResponse_exports = /* @__PURE__ */ __exportAll({ from: () => from$2 });
+function normalizeChainId(chainId) {
+	const parsedChainId = Number(chainId);
+	if (!Number.isInteger(parsedChainId) || parsedChainId <= 0) throw new Error(`Invalid chain id: ${String(chainId)}`);
+	return parsedChainId;
+}
+function normalizeBlockNumber(blockNumber) {
+	const parsedBlockNumber = Number(blockNumber);
+	if (!Number.isInteger(parsedBlockNumber) || parsedBlockNumber < 0) throw new Error(`Invalid block number: ${String(blockNumber)}`);
+	return parsedBlockNumber;
+}
 /**
 * Creates an `OfferResponse` matching the Solidity Offer struct layout.
 * @constructor
@@ -2741,6 +2887,8 @@ var OfferResponse_exports = /* @__PURE__ */ __exportAll({ from: () => from$2 });
 * @returns The created `OfferResponse`. {@link OfferResponse}
 */
 function from$2(input) {
+	const chainId = normalizeChainId(input.chainId);
+	const blockNumber = normalizeBlockNumber(input.blockNumber);
 	const base = {
 		offer: {
 			obligation: {
@@ -2759,7 +2907,7 @@ function from$2(input) {
 			obligation_shares: input.obligationShares.toString(),
 			start: input.start,
 			expiry: input.expiry,
-			price: input.price.toString(),
+			tick: input.tick,
 			group: input.group,
 			session: input.session,
 			callback: input.callback.address,
@@ -2767,15 +2915,15 @@ function from$2(input) {
 		},
 		offer_hash: input.hash,
 		obligation_id: id({
-			chainId: input.chainId,
+			chainId,
 			loanToken: input.loanToken,
 			collaterals: [...input.collaterals],
 			maturity: input.maturity
 		}),
-		chain_id: input.chainId,
+		chain_id: chainId,
 		consumed: input.consumed.toString(),
 		takeable: input.takeable.toString(),
-		block_number: input.blockNumber
+		block_number: blockNumber
 	};
 	if (!input.proof || !input.root || !input.signature) return {
 		...base,
@@ -2832,7 +2980,7 @@ const offerExample = {
 		obligation_shares: "0",
 		start: 1761922790,
 		expiry: 1761922799,
-		price: "2750000000000000000",
+		tick: 495,
 		group: "0x000000000000000000000000000000000000000000000000000000000008b8f4",
 		session: "0x0000000000000000000000000000000000000000000000000000000000000000",
 		callback: "0x0000000000000000000000000000000000000000",
@@ -2873,7 +3021,7 @@ const validateOfferExample = {
 	assets: "369216000000000000000000",
 	obligation_units: "0",
 	obligation_shares: "0",
-	price: "2750000000000000000",
+	tick: 495,
 	maturity: 1761922799,
 	expiry: 1761922799,
 	start: 1761922790,
@@ -3017,9 +3165,11 @@ __decorate([ApiProperty({
 	example: offerExample.offer.expiry
 })], OfferDataResponse.prototype, "expiry", void 0);
 __decorate([ApiProperty({
-	type: "string",
-	example: offerExample.offer.price
-})], OfferDataResponse.prototype, "price", void 0);
+	type: "number",
+	example: offerExample.offer.tick,
+	minimum: 0,
+	maximum: 990
+})], OfferDataResponse.prototype, "tick", void 0);
 __decorate([ApiProperty({
 	type: "string",
 	example: offerExample.offer.group
@@ -3260,9 +3410,11 @@ __decorate([ApiProperty({
 	required: false
 })], ValidateOfferRequest.prototype, "obligation_shares", void 0);
 __decorate([ApiProperty({
-	type: "string",
-	example: validateOfferExample.price
-})], ValidateOfferRequest.prototype, "price", void 0);
+	type: "number",
+	example: validateOfferExample.tick,
+	minimum: 0,
+	maximum: 990
+})], ValidateOfferRequest.prototype, "tick", void 0);
 __decorate([ApiProperty({
 	type: "number",
 	example: validateOfferExample.maturity
@@ -3362,9 +3514,16 @@ __decorate([ApiProperty({
 	description: "List of validation issues. Returned when any offer fails validation."
 })], ValidationFailureResponse.prototype, "data", void 0);
 var BookLevelResponse = class {};
+__decorate([ApiProperty({
+	type: "number",
+	example: 495,
+	minimum: 0,
+	maximum: 990
+})], BookLevelResponse.prototype, "tick", void 0);
 __decorate([ApiProperty({
 	type: "string",
-	example: "2750000000000000000"
+	example: "500000000000000000",
+	description: "Price derived from tick, scaled by 1e18."
 })], BookLevelResponse.prototype, "price", void 0);
 __decorate([ApiProperty({
 	type: "string",
@@ -3378,6 +3537,7 @@ const positionExample = {
 	chain_id: 1,
 	contract: "0xC9A9C45C0eB717f8b5F193Af6bAa05A1c0Ac5078",
 	user: "0x7b093658BE7f90B63D7c359e8f408e503c2D9401",
+	obligation_id: "0x12590ae1aee324a005be565f3bcdd16dbf8daf7969b26c181c8b8f467dad9f67",
 	reserved: "200000000000000000000",
 	block_number: 21345678
 };
@@ -3394,6 +3554,12 @@ __decorate([ApiProperty({
 	type: "string",
 	example: positionExample.user
 })], PositionListItemResponse.prototype, "user", void 0);
+__decorate([ApiProperty({
+	type: "string",
+	nullable: true,
+	example: positionExample.obligation_id,
+	description: "Obligation id this reserved amount belongs to, or null if no lots exist."
+})], PositionListItemResponse.prototype, "obligation_id", void 0);
 __decorate([ApiProperty({
 	type: "string",
 	example: positionExample.reserved
@@ -3421,7 +3587,7 @@ __decorate([ApiProperty({
 })], BookListResponse.prototype, "cursor", void 0);
 __decorate([ApiProperty({
 	type: () => [BookLevelResponse],
-	description: "Aggregated book levels grouped by computed price."
+	description: "Aggregated book levels grouped by offer tick."
 })], BookListResponse.prototype, "data", void 0);
 let BooksController = class BooksController {
 	async getBook() {}
@@ -3431,7 +3597,7 @@ __decorate([
 		methods: ["get"],
 		path: "/v1/books/{obligationId}/{side}",
 		summary: "Get aggregated book",
-		description: "Returns aggregated book data for a given obligation and side. Offers are grouped by computed price with summed takeable amounts. Book levels are sorted by price (ascending for buy side, descending for sell side)."
+		description: "Returns aggregated book data for a given obligation and side. Offers are grouped by tick with summed takeable amounts, and each level includes the corresponding wad-scaled price. Book levels are sorted by tick (ascending for sell side, descending for buy side)."
 	}),
 	ApiParam({
 		name: "obligationId",
@@ -3456,7 +3622,7 @@ __decorate([
 		name: "limit",
 		type: "number",
 		example: 10,
-		description: "Maximum number of price levels to return."
+		description: "Maximum number of tick levels to return."
 	}),
 	ApiResponse({
 		status: 200,
@@ -3650,6 +3816,11 @@ const configRulesLoanTokenExample = {
 	chain_id: 1,
 	address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
 };
+const configRulesCollateralTokenExample = {
+	type: "collateral_token",
+	chain_id: 1,
+	address: "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0"
+};
 const configRulesOracleExample = {
 	type: "oracle",
 	chain_id: 1,
@@ -3659,6 +3830,7 @@ const configRulesChecksumExample = "f1d2d2f924e986ac86fdf7b36c94bcdf";
 const configRulesPayloadExample = [
 	configRulesMaturityExample,
 	configRulesLoanTokenExample,
+	configRulesCollateralTokenExample,
 	configRulesOracleExample
 ];
 const configContractNames = [
@@ -3785,7 +3957,7 @@ __decorate([
 		methods: ["get"],
 		path: "/v1/config/rules",
 		summary: "Get config rules",
-		description: "Returns configured rules (maturities, loan tokens, oracles) for supported chains."
+		description: "Returns configured rules (maturities, loan tokens, collateral tokens, oracles) for supported chains."
 	}),
 	ApiQuery({
 		name: "cursor",
@@ -3805,7 +3977,7 @@ __decorate([
 		name: "types",
 		type: ["string"],
 		required: false,
-		example: "maturity,loan_token,oracle",
+		example: "maturity,loan_token,collateral_token,oracle",
 		description: "Filter by rule types (comma-separated).",
 		style: "form",
 		explode: false
@@ -3923,7 +4095,7 @@ __decorate([
 		methods: ["get"],
 		path: "/v1/users/{userAddress}/positions",
 		summary: "Get user positions",
-		description: "Returns positions for a user with reserved balance. The reserved balance is the amount locked by active offers (max lot upper - offset - consumed)."
+		description: "Returns positions for a user with reserved balance per obligation. Each (position, obligation) pair is returned as a separate row. Positions with no lots return a single row with obligation_id = null and reserved = 0."
 	}),
 	ApiParam({
 		name: "userAddress",
@@ -4011,6 +4183,7 @@ function from$1(position) {
 		chain_id: position.chainId,
 		contract: position.contract,
 		user: position.user,
+		obligation_id: position.obligationId,
 		reserved: position.reserved.toString(),
 		block_number: position.blockNumber
 	};
@@ -4064,10 +4237,11 @@ const ConfigRuleTypes = z$1.enum([
 	"maturity",
 	"callback",
 	"loan_token",
+	"collateral_token",
 	"oracle"
 ]);
 const GetConfigRulesQueryParams = z$1.object({
-	cursor: z$1.string().regex(/^(maturity|callback|loan_token|oracle):[1-9]\d*:.+$/, { message: "Cursor must be in the format type:chain_id:<value>" }).optional().meta({
+	cursor: z$1.string().regex(/^(maturity|callback|loan_token|collateral_token|oracle):[1-9]\d*:.+$/, { message: "Cursor must be in the format type:chain_id:<value>" }).optional().meta({
 		description: "Pagination cursor in type:chain_id:<value> format",
 		example: "maturity:1:1730415600:end_of_next_month"
 	}),
@@ -4077,7 +4251,7 @@ const GetConfigRulesQueryParams = z$1.object({
 	}),
 	types: csvArray(ConfigRuleTypes).meta({
 		description: "Filter by rule types (comma-separated).",
-		example: "maturity,loan_token,oracle"
+		example: "maturity,loan_token,collateral_token,oracle"
 	}),
 	chains: csvArray(z$1.string().regex(/^[1-9]\d*$/, { message: "Chain must be a positive integer" }).transform((val) => Number.parseInt(val, 10))).meta({
 		description: "Filter by chain IDs (comma-separated).",
@@ -4177,12 +4351,11 @@ const GetObligationParams = z$1.object({ obligation_id: z$1.string({ error: "Obl
 	description: "Obligation id",
 	example: "0x1234567890123456789012345678901234567890123456789012345678901234"
 }) });
-/** Validate a book cursor format: {side, lastPrice, offersCursor} */
+/** Validate a book cursor format: {side, lastTick, offersCursor} */
 function isValidBookCursor(cursorString) {
-	const isNumericString = (value) => typeof value === "string" && /^-?\d+$/.test(value);
 	try {
 		const v = JSON.parse(Buffer.from(cursorString, "base64url").toString("utf8"));
-		return (v?.side === "buy" || v?.side === "sell") && isNumericString(v?.lastPrice) && (v?.offersCursor === null || typeof v?.offersCursor === "string");
+		return (v?.side === "buy" || v?.side === "sell") && typeof v?.lastTick === "number" && Number.isInteger(v.lastTick) && (v?.offersCursor === null || typeof v?.offersCursor === "string");
 	} catch {
 		return false;
 	}
@@ -4343,7 +4516,7 @@ async function getOffers(apiClient, parameters) {
 				assets: offerData.assets,
 				obligation_units: offerData.obligation_units,
 				obligation_shares: offerData.obligation_shares,
-				price: offerData.price,
+				tick: offerData.tick,
 				maturity: from$11(offerData.obligation.maturity),
 				expiry: offerData.expiry,
 				start: offerData.start,
@@ -4691,6 +4864,33 @@ const assets = {
 		"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
 	]
 };
+const collateralAssets = {
+	[ChainId.ETHEREUM.toString()]: [
+		"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+		"0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c",
+		"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+		"0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0"
+	],
+	[ChainId.BASE.toString()]: [
+		"0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+		"0x4200000000000000000000000000000000000006",
+		"0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf",
+		"0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452",
+		"0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42"
+	],
+	[ChainId["ETHEREUM-VIRTUAL-TESTNET"].toString()]: [
+		"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+		"0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c",
+		"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+		"0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0"
+	],
+	[ChainId.ANVIL.toString()]: [
+		"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+		"0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c",
+		"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+		"0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0"
+	]
+};
 const oracles = {
 	[ChainId.ETHEREUM.toString()]: [
 		"0xDddd770BADd886dF3864029e4B377B5F6a2B6b83",
@@ -4753,10 +4953,11 @@ var Rules_exports = /* @__PURE__ */ __exportAll({
 	amountMutualExclusivity: () => amountMutualExclusivity,
 	callback: () => callback,
 	chains: () => chains,
+	collateralToken: () => collateralToken,
+	loanToken: () => loanToken,
 	maturity: () => maturity,
 	oracle: () => oracle,
 	sameMaker: () => sameMaker,
-	token: () => token,
 	validity: () => validity
 });
 /**
@@ -4784,15 +4985,25 @@ const callback = ({ callbacks }) => single("callback", `Validates callbacks: buy
 	if (isEmptyCallback(offer) && !offer.buy && !callbacks.includes(Type$1.SellWithEmptyCallback)) return { message: "Sell offers with empty callback not allowed." };
 });
 /**
-* A validation rule that checks if the offer's tokens are allowed for its chain.
-* @param assetsByChainId - Allowed assets indexed by chain id.
+* A validation rule that checks if the offer's loan token is allowed for its chain.
+* @param assetsByChainId - Allowed loan tokens indexed by chain id.
+* @returns The issue that was found. If the offer is valid, this will be undefined.
+*/
+const loanToken = ({ assetsByChainId }) => single("loan_token", "Validates that offer loan token is in the allowed token list for the offer chain", (offer) => {
+	const allowedLoanTokens = assetsByChainId[offer.chainId]?.map((asset) => asset.toLowerCase());
+	if (!allowedLoanTokens || allowedLoanTokens.length === 0) return { message: `No allowed loan tokens for chain ${offer.chainId}` };
+	if (!allowedLoanTokens.includes(offer.loanToken.toLowerCase())) return { message: "Loan token is not allowed" };
+});
+/**
+* A validation rule that checks if the offer's collateral tokens are allowed for its chain.
+* @param collateralAssetsByChainId - Allowed collateral tokens indexed by chain id.
 * @returns The issue that was found. If the offer is valid, this will be undefined.
 */
-const token = ({ assetsByChainId }) => single("token", "Validates that offer loan token and collateral tokens are in the allowed assets list for the offer chain", (offer) => {
-	const allowedAssets = assetsByChainId[offer.chainId]?.map((asset) => asset.toLowerCase());
-	if (!allowedAssets || allowedAssets.length === 0) return { message: `No allowed assets for chain ${offer.chainId}` };
-	if (!allowedAssets.includes(offer.loanToken.toLowerCase())) return { message: "Loan token is not allowed" };
-	if (offer.collaterals.some((collateral) => !allowedAssets.includes(collateral.asset.toLowerCase()))) return { message: "Collateral is not allowed" };
+const collateralToken = ({ collateralAssetsByChainId }) => single("collateral_token", "Validates that offer collateral tokens are in the allowed token list for the offer chain", (offer) => {
+	const allowedCollateralTokens = collateralAssetsByChainId[offer.chainId]?.map((asset) => asset.toLowerCase()) ?? [];
+	if (allowedCollateralTokens.length === 0) return { message: `No allowed collateral tokens for chain ${offer.chainId}` };
+	if (offer.collaterals.length === 0) return { message: "At least one collateral token is required" };
+	if (offer.collaterals.some((collateral) => !allowedCollateralTokens.includes(collateral.asset.toLowerCase()))) return { message: "Collateral token is not allowed" };
 });
 /**
 * A validation rule that checks if the offer's oracle addresses are allowed for its chain.
@@ -4835,9 +5046,11 @@ const amountMutualExclusivity = () => single("amount_mutual_exclusivity", "Valid
 //#region src/gatekeeper/morphoRules.ts
 const morphoRules = (chains$2) => {
 	const assetsByChainId = {};
+	const collateralAssetsByChainId = {};
 	const oraclesByChainId = {};
 	for (const chain of chains$2) {
 		assetsByChainId[chain.id] = assets[chain.id.toString()] ?? [];
+		collateralAssetsByChainId[chain.id] = collateralAssets[chain.id.toString()] ?? [];
 		oraclesByChainId[chain.id] = oracles[chain.id.toString()] ?? [];
 	}
 	return [
@@ -4849,7 +5062,8 @@ const morphoRules = (chains$2) => {
 			callbacks: [Type$1.BuyWithEmptyCallback, Type$1.SellWithEmptyCallback],
 			allowedAddresses: []
 		}),
-		token({ assetsByChainId }),
+		loanToken({ assetsByChainId }),
+		collateralToken({ collateralAssetsByChainId }),
 		oracle({ oraclesByChainId })
 	];
 };
@@ -5175,5 +5389,5 @@ var utils_exports = /* @__PURE__ */ __exportAll({
 });
 
 //#endregion
-export { Abi_exports as Abi, BrandTypeId, Callback_exports as Callback, Chain_exports as Chain, ChainRegistry_exports as ChainRegistry, Collateral_exports as Collateral, ERC4626_exports as ERC4626, Errors_exports as Errors, Format_exports as Format, Gatekeeper_exports as Gatekeeper, Client_exports as GatekeeperClient, LLTV_exports as LLTV, Liquidity_exports as Liquidity, Maturity_exports as Maturity, MempoolClient_exports as Mempool, Obligation_exports as Obligation, Offer_exports as Offer, Oracle_exports as Oracle, Position_exports as Position, Quote_exports as Quote, Schema_exports as RouterApi, Client_exports$1 as RouterClient, Rules_exports as Rules, time_exports as Time, TradingFee_exports as TradingFee, Transfer_exports as Transfer, Tree_exports as Tree, utils_exports as Utils, Gate_exports as Validation, morphoRules };
+export { Abi_exports as Abi, BrandTypeId, Callback_exports as Callback, Chain_exports as Chain, ChainRegistry_exports as ChainRegistry, Collateral_exports as Collateral, ERC4626_exports as ERC4626, Errors_exports as Errors, Format_exports as Format, Gatekeeper_exports as Gatekeeper, Client_exports as GatekeeperClient, LLTV_exports as LLTV, Liquidity_exports as Liquidity, Maturity_exports as Maturity, MempoolClient_exports as Mempool, Obligation_exports as Obligation, Offer_exports as Offer, Oracle_exports as Oracle, Position_exports as Position, Quote_exports as Quote, Schema_exports as RouterApi, Client_exports$1 as RouterClient, Rules_exports as Rules, Tick_exports as Tick, time_exports as Time, TradingFee_exports as TradingFee, Transfer_exports as Transfer, Tree_exports as Tree, utils_exports as Utils, Gate_exports as Validation, morphoRules };
 //# sourceMappingURL=index.browser.mjs.map