@morpho-dev/router 0.7.2 → 0.9.0

package/dist/index.browser.js

@@ -52,11 +52,191 @@ let openapi_metadata_decorators = require("openapi-metadata/decorators");
 let openapi_fetch = require("openapi-fetch");
 openapi_fetch = __toESM(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
 	};
@@ -103,6 +283,7 @@ var ObligationResponse_exports = /* @__PURE__ */ __exportAll({ from: () => from$
 * Creates an `ObligationResponse` from a `Obligation`.
 * @constructor
 * @param obligation - {@link Obligation}
+* @param quote - {@link Quote}
 * @returns The created `ObligationResponse`. {@link ObligationResponse}
 */
 function from$14(obligation, quote) {
@@ -116,8 +297,14 @@ function from$14(obligation, quote) {
 			oracle: c.oracle
 		})),
 		maturity: obligation.maturity,
-		ask: { price: quote.ask.price.toString() },
-		bid: { price: quote.bid.price.toString() }
+		ask: {
+			tick: quote.ask.tick,
+			price: quote.ask.price.toString()
+		},
+		bid: {
+			tick: quote.bid.tick,
+			price: quote.bid.price.toString()
+		}
 	};
 }
 
@@ -163,18 +350,18 @@ const MorphoV2 = (0, viem.parseAbi)([
 	"function setFeeSetter(address newFeeSetter)",
 	"function setObligationTradingFee(bytes32 id, uint256 index, uint256 newTradingFee)",
 	"function setOwner(address newOwner)",
-	"function setTradingFeeRecipient(address recipient)",
+	"function setTradingFeeRecipient(address feeRecipient)",
 	"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 take(uint256 buyerAssets, uint256 sellerAssets, uint256 obligationUnits, uint256 obligationShares, address taker, address takerCallback, bytes takerCallbackData, address receiverIfTakerIsSeller, ((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, address receiverIfMakerIsSeller) offer, (uint8 v, bytes32 r, bytes32 s) sig, bytes32 root, bytes32[] proof) 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 withdraw((address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation, uint256 obligationUnits, uint256 shares, address onBehalf, address receiver) returns (uint256, uint256)",
+	"function withdrawCollateral((address loanToken, (address token, uint256 lltv, address oracle)[] collaterals, uint256 maturity) obligation, address collateral, uint256 assets, address onBehalf, address receiver)",
 	"function withdrawable(bytes32 id) view returns (uint256)",
 	"event Constructor(address indexed owner)",
 	"event Consume(address indexed user, bytes32 indexed group, uint256 amount)",
@@ -186,12 +373,12 @@ const MorphoV2 = (0, viem.parseAbi)([
 	"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 SetTradingFeeRecipient(address indexed feeRecipient)",
 	"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)"
+	"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, address sellerReceiver, bytes32 group, uint256 consumed)",
+	"event Withdraw(address caller, bytes32 indexed id, uint256 obligationUnits, uint256 shares, address indexed onBehalf, address indexed receiver)",
+	"event WithdrawCollateral(address caller, bytes32 indexed id, address indexed collateral, uint256 assets, address indexed onBehalf, address receiver)"
 ]);
 
 //#endregion
@@ -404,105 +591,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({
@@ -607,8 +695,8 @@ const chains$1 = {
 		name: "ethereum-virtual-testnet",
 		custom: {
 			morpho: {
-				address: "0x634b095371e4e45feed94c1a45c37798e173ea50",
-				blockCreated: 23226700
+				address: "0xc9f3c65996fc46b9500608b2c9a9152c01c540f7",
+				blockCreated: 23226871
 			},
 			morphoBlue: {
 				address: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb",
@@ -1549,7 +1637,7 @@ const OfferSchema = () => {
 		assets: zod.bigint({ coerce: true }).min(0n).max(viem.maxUint256),
 		obligationUnits: zod.bigint({ coerce: true }).min(0n).max(viem.maxUint256).optional().default(0n),
 		obligationShares: zod.bigint({ coerce: true }).min(0n).max(viem.maxUint256).optional().default(0n),
-		price: zod.bigint({ coerce: true }).min(0n).max(viem.maxUint256),
+		tick: zod.coerce.number().int().min(0).max(990),
 		maturity: MaturitySchema,
 		expiry: zod.number().int().max(Number.MAX_SAFE_INTEGER),
 		start: zod.number().int().max(Number.MAX_SAFE_INTEGER),
@@ -1570,7 +1658,8 @@ const OfferSchema = () => {
 		callback: zod.object({
 			address: zod.string().transform(transformAddress),
 			data: zod.string().transform(transformHex)
-		})
+		}),
+		receiverIfMakerIsSeller: zod.string().transform(transformAddress)
 	}).refine((data) => data.start < data.expiry, {
 		message: "start must be before expiry",
 		path: ["start"]
@@ -1586,8 +1675,12 @@ const OfferSchema = () => {
 * @returns The created offer.
 */
 function from$9(input) {
+	const normalizedInput = {
+		...input,
+		receiverIfMakerIsSeller: input.receiverIfMakerIsSeller ?? input.maker
+	};
 	try {
-		return OfferSchema().parse(input);
+		return OfferSchema().parse(normalizedInput);
 	} catch (error) {
 		throw new InvalidOfferError(error);
 	}
@@ -1621,7 +1714,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),
@@ -1639,6 +1732,7 @@ const serialize = (offer) => ({
 		address: offer.callback.address,
 		data: offer.callback.data
 	},
+	receiverIfMakerIsSeller: offer.receiverIfMakerIsSeller,
 	hash: hash(offer)
 });
 /**
@@ -1666,14 +1760,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));
@@ -1682,12 +1775,13 @@ function random$1(config) {
 		address: viem.zeroAddress,
 		data: "0x"
 	};
+	const maker = config?.maker ?? address();
 	return from$9({
-		maker: config?.maker ?? address(),
+		maker,
 		assets: assetsScaled,
 		obligationUnits: config?.obligationUnits ?? 0n,
 		obligationShares: config?.obligationShares ?? 0n,
-		price,
+		tick,
 		maturity,
 		expiry: config?.expiry ?? maturity - 1,
 		start: config?.start ?? maturity - 10,
@@ -1700,7 +1794,8 @@ function random$1(config) {
 			...random$3(),
 			lltv
 		})).sort((a, b) => a.asset.localeCompare(b.asset)),
-		callback: config?.callback ?? emptyCallback
+		callback: config?.callback ?? emptyCallback,
+		receiverIfMakerIsSeller: config?.receiverIfMakerIsSeller ?? maker
 	});
 }
 const weightedChoice = (pairs) => {
@@ -1752,7 +1847,7 @@ const types = {
 			type: "uint256"
 		},
 		{
-			name: "price",
+			name: "tick",
 			type: "uint256"
 		},
 		{
@@ -1786,6 +1881,10 @@ const types = {
 		{
 			name: "callback",
 			type: "Callback"
+		},
+		{
+			name: "receiverIfMakerIsSeller",
+			type: "address"
 		}
 	],
 	Collateral: [
@@ -1820,7 +1919,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,
@@ -1831,7 +1930,8 @@ function hash(offer) {
 			callback: {
 				address: offer.callback.address.toLowerCase(),
 				data: offer.callback.data
-			}
+			},
+			receiverIfMakerIsSeller: offer.receiverIfMakerIsSeller.toLowerCase()
 		},
 		primaryType: "Offer",
 		types
@@ -1871,7 +1971,7 @@ const OfferAbi = [
 		type: "uint256"
 	},
 	{
-		name: "price",
+		name: "tick",
 		type: "uint256"
 	},
 	{
@@ -1934,6 +2034,10 @@ const OfferAbi = [
 			name: "data",
 			type: "bytes"
 		}]
+	},
+	{
+		name: "receiverIfMakerIsSeller",
+		type: "address"
 	}
 ];
 function encode$1(offer) {
@@ -1942,7 +2046,7 @@ function encode$1(offer) {
 		offer.assets,
 		offer.obligationUnits,
 		offer.obligationShares,
-		offer.price,
+		BigInt(offer.tick),
 		BigInt(offer.maturity),
 		BigInt(offer.expiry),
 		offer.group,
@@ -1952,7 +2056,8 @@ function encode$1(offer) {
 		offer.loanToken,
 		BigInt(offer.start),
 		offer.collaterals,
-		offer.callback
+		offer.callback,
+		offer.receiverIfMakerIsSeller
 	]);
 }
 function decode$1(data) {
@@ -1967,7 +2072,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],
@@ -1986,7 +2091,8 @@ function decode$1(data) {
 		callback: {
 			address: decoded[14].address,
 			data: decoded[14].data
-		}
+		},
+		receiverIfMakerIsSeller: decoded[15]
 	});
 }
 /**
@@ -2062,6 +2168,12 @@ const takeEvent = {
 			indexed: false,
 			internalType: "bool"
 		},
+		{
+			name: "sellerReceiver",
+			type: "address",
+			indexed: false,
+			internalType: "address"
+		},
 		{
 			name: "group",
 			type: "bytes32",
@@ -2251,16 +2363,16 @@ function from$7(parameters) {
 //#region src/core/Quote.ts
 var Quote_exports = /* @__PURE__ */ __exportAll({
 	InvalidQuoteError: () => InvalidQuoteError,
-	QuoteSchema: () => QuoteSchema,
 	from: () => from$6,
 	fromSnakeCase: () => fromSnakeCase,
 	random: () => random
 });
-const QuoteSchema = zod.object({
+const SideInputSchema = zod.object({ tick: zod.number().int().min(0).max(TICK_RANGE).nullable() }).strict();
+const QuoteInputSchema = zod.object({
 	obligationId: zod.string().transform(transformHex),
-	ask: zod.object({ price: zod.bigint({ coerce: true }).min(0n).max(viem.maxUint256) }),
-	bid: zod.object({ price: zod.bigint({ coerce: true }).min(0n).max(viem.maxUint256) })
-});
+	ask: SideInputSchema,
+	bid: SideInputSchema
+}).strict();
 /**
 * Creates a quote for a given obligation.
 * @constructor
@@ -2270,16 +2382,16 @@ const QuoteSchema = zod.object({
 *
 * @example
 * ```ts
-* const quote = Quote.from({ obligationId: "0x123", ask: { price: 100n }, bid: { price: 100n } });
+* const quote = Quote.from({ obligationId: "0x123", ask: { tick: 500 }, bid: { tick: 510 } });
 * ```
 */
 function from$6(parameters) {
 	try {
-		const parsedQuote = QuoteSchema.parse(parameters);
+		const parsedQuote = QuoteInputSchema.parse(parameters);
 		return {
 			obligationId: parsedQuote.obligationId,
-			ask: parsedQuote.ask,
-			bid: parsedQuote.bid
+			ask: sideFromTick(parsedQuote.ask),
+			bid: sideFromTick(parsedQuote.bid)
 		};
 	} catch (error) {
 		throw new InvalidQuoteError(error);
@@ -2306,8 +2418,8 @@ function fromSnakeCase(snake) {
 function random() {
 	return from$6({
 		obligationId: id(random$2()),
-		ask: { price: BigInt(int(1e6)) },
-		bid: { price: BigInt(int(1e6)) }
+		ask: { tick: int(TICK_RANGE + 1) },
+		bid: { tick: int(TICK_RANGE + 1) }
 	});
 }
 var InvalidQuoteError = class extends BaseError {
@@ -2316,6 +2428,12 @@ var InvalidQuoteError = class extends BaseError {
 		_defineProperty(this, "name", "Quote.InvalidQuoteError");
 	}
 };
+function sideFromTick(side) {
+	return {
+		tick: side.tick,
+		price: side.tick === null ? 0n : tickToPrice(side.tick)
+	};
+}
 
 //#endregion
 //#region src/core/TradingFee.ts
@@ -2868,11 +2986,12 @@ 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,
-			callback_data: input.callback.data
+			callback_data: input.callback.data,
+			receiver_if_maker_is_seller: input.receiverIfMakerIsSeller
 		},
 		offer_hash: input.hash,
 		obligation_id: id({
@@ -2922,7 +3041,7 @@ function __decorate(decorators, target, key, desc) {
 //#region src/api/Schema/openapi.ts
 const timestampExample = "2024-01-01T12:00:00.000Z";
 const offerCursorExample = "eyJvZmZzZXQiOjEwMH0";
-const obligationCursorExample = "0x25690ae1aee324a005be565f3bcdd16dbf8daf7969b26c181c8b8f467dad9abc";
+const obligationCursorExample = "eyJzb3J0IjpbImlkIl0sImlkIjoiMHgxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAiLCJhc2siOiIwIiwiYmlkIjoiMCIsIm1hdHVyaXR5IjoxNzYxOTIyODAwfQ";
 const offerExample = {
 	offer: {
 		obligation: {
@@ -2941,11 +3060,12 @@ const offerExample = {
 		obligation_shares: "0",
 		start: 1761922790,
 		expiry: 1761922799,
-		price: "2750000000000000000",
+		tick: 495,
 		group: "0x000000000000000000000000000000000000000000000000000000000008b8f4",
 		session: "0x0000000000000000000000000000000000000000000000000000000000000000",
 		callback: "0x0000000000000000000000000000000000000000",
-		callback_data: "0x"
+		callback_data: "0x",
+		receiver_if_maker_is_seller: "0x7b093658BE7f90B63D7c359e8f408e503c2D9401"
 	},
 	offer_hash: "0xac4bd8318ec914f89f8af913f162230575b0ac0696a19256bc12138c5cfe1427",
 	obligation_id: "0x25690ae1aee324a005be565f3bcdd16dbf8daf7969b26c181c8b8f467dad9abc",
@@ -2982,7 +3102,7 @@ const validateOfferExample = {
 	assets: "369216000000000000000000",
 	obligation_units: "0",
 	obligation_shares: "0",
-	price: "2750000000000000000",
+	tick: 495,
 	maturity: 1761922799,
 	expiry: 1761922799,
 	start: 1761922790,
@@ -2999,7 +3119,8 @@ const validateOfferExample = {
 	callback: {
 		address: "0x0000000000000000000000000000000000000000",
 		data: "0x"
-	}
+	},
+	receiver_if_maker_is_seller: "0x7b093658BE7f90B63D7c359e8f408e503c2D9401"
 };
 const routerStatusExample = {
 	status: "live",
@@ -3070,11 +3191,23 @@ __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	example: validateOfferExample.callback.data
 })], ValidateCallbackRequest.prototype, "data", void 0);
 var AskResponse = class {};
+__decorate([(0, openapi_metadata_decorators.ApiProperty)({
+	type: "number",
+	nullable: true,
+	example: 500,
+	description: "Best ask tick. Null when there is no active ask quote."
+})], AskResponse.prototype, "tick", void 0);
 __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	type: "string",
 	example: "1000000000000000000"
 })], AskResponse.prototype, "price", void 0);
 var BidResponse = class {};
+__decorate([(0, openapi_metadata_decorators.ApiProperty)({
+	type: "number",
+	nullable: true,
+	example: 500,
+	description: "Best bid tick. Null when there is no active bid quote."
+})], BidResponse.prototype, "tick", void 0);
 __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	type: "string",
 	example: "1000000000000000000"
@@ -3126,9 +3259,11 @@ __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	example: offerExample.offer.expiry
 })], OfferDataResponse.prototype, "expiry", void 0);
 __decorate([(0, openapi_metadata_decorators.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([(0, openapi_metadata_decorators.ApiProperty)({
 	type: "string",
 	example: offerExample.offer.group
@@ -3145,6 +3280,10 @@ __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	type: "string",
 	example: offerExample.offer.callback_data
 })], OfferDataResponse.prototype, "callback_data", void 0);
+__decorate([(0, openapi_metadata_decorators.ApiProperty)({
+	type: "string",
+	example: offerExample.offer.receiver_if_maker_is_seller
+})], OfferDataResponse.prototype, "receiver_if_maker_is_seller", void 0);
 var OfferListItemResponse = class {};
 __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	type: () => OfferDataResponse,
@@ -3369,9 +3508,11 @@ __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	required: false
 })], ValidateOfferRequest.prototype, "obligation_shares", void 0);
 __decorate([(0, openapi_metadata_decorators.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([(0, openapi_metadata_decorators.ApiProperty)({
 	type: "number",
 	example: validateOfferExample.maturity
@@ -3412,6 +3553,10 @@ __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	type: () => ValidateCallbackRequest,
 	example: validateOfferExample.callback
 })], ValidateOfferRequest.prototype, "callback", void 0);
+__decorate([(0, openapi_metadata_decorators.ApiProperty)({
+	type: "string",
+	example: validateOfferExample.receiver_if_maker_is_seller
+})], ValidateOfferRequest.prototype, "receiver_if_maker_is_seller", void 0);
 var ValidateOffersRequest = class {};
 __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	type: () => [ValidateOfferRequest],
@@ -3471,9 +3616,16 @@ __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	description: "List of validation issues. Returned when any offer fails validation."
 })], ValidationFailureResponse.prototype, "data", void 0);
 var BookLevelResponse = class {};
+__decorate([(0, openapi_metadata_decorators.ApiProperty)({
+	type: "number",
+	example: 495,
+	minimum: 0,
+	maximum: 990
+})], BookLevelResponse.prototype, "tick", void 0);
 __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	type: "string",
-	example: "2750000000000000000"
+	example: "500000000000000000",
+	description: "Price derived from tick, scaled by 1e18."
 })], BookLevelResponse.prototype, "price", void 0);
 __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	type: "string",
@@ -3487,6 +3639,7 @@ const positionExample = {
 	chain_id: 1,
 	contract: "0xC9A9C45C0eB717f8b5F193Af6bAa05A1c0Ac5078",
 	user: "0x7b093658BE7f90B63D7c359e8f408e503c2D9401",
+	obligation_id: "0x12590ae1aee324a005be565f3bcdd16dbf8daf7969b26c181c8b8f467dad9f67",
 	reserved: "200000000000000000000",
 	block_number: 21345678
 };
@@ -3503,6 +3656,12 @@ __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 	type: "string",
 	example: positionExample.user
 })], PositionListItemResponse.prototype, "user", void 0);
+__decorate([(0, openapi_metadata_decorators.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([(0, openapi_metadata_decorators.ApiProperty)({
 	type: "string",
 	example: positionExample.reserved
@@ -3530,7 +3689,7 @@ __decorate([(0, openapi_metadata_decorators.ApiProperty)({
 })], BookListResponse.prototype, "cursor", void 0);
 __decorate([(0, openapi_metadata_decorators.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() {}
@@ -3540,7 +3699,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)."
 	}),
 	(0, openapi_metadata_decorators.ApiParam)({
 		name: "obligationId",
@@ -3565,7 +3724,7 @@ __decorate([
 		name: "limit",
 		type: "number",
 		example: 10,
-		description: "Maximum number of price levels to return."
+		description: "Maximum number of tick levels to return."
 	}),
 	(0, openapi_metadata_decorators.ApiResponse)({
 		status: 200,
@@ -3759,6 +3918,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,
@@ -3768,6 +3932,7 @@ const configRulesChecksumExample = "f1d2d2f924e986ac86fdf7b36c94bcdf";
 const configRulesPayloadExample = [
 	configRulesMaturityExample,
 	configRulesLoanTokenExample,
+	configRulesCollateralTokenExample,
 	configRulesOracleExample
 ];
 const configContractNames = [
@@ -3894,7 +4059,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."
 	}),
 	(0, openapi_metadata_decorators.ApiQuery)({
 		name: "cursor",
@@ -3914,7 +4079,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
@@ -3944,13 +4109,13 @@ __decorate([
 		methods: ["get"],
 		path: "/v1/obligations",
 		summary: "List all obligations",
-		description: "Returns a list of obligations with their current best ask and bid. Obligations are sorted by their id in ascending order by default."
+		description: "Returns a list of obligations with their current best ask and bid. Sorting is customizable with the sort parameter and defaults to id ascending."
 	}),
 	(0, openapi_metadata_decorators.ApiQuery)({
 		name: "cursor",
 		type: "string",
 		example: obligationCursorExample,
-		description: "Obligation id cursor for pagination."
+		description: "Pagination cursor in base64url-encoded format."
 	}),
 	(0, openapi_metadata_decorators.ApiQuery)({
 		name: "limit",
@@ -3994,6 +4159,15 @@ __decorate([
 		style: "form",
 		explode: false
 	}),
+	(0, openapi_metadata_decorators.ApiQuery)({
+		name: "sort",
+		type: "string",
+		required: false,
+		example: "-ask,bid,maturity",
+		description: "Sort order as comma-separated fields (`id`, `ask`, `bid`, `maturity`). Prefix with `-` for descending order. Max 3 fields.",
+		style: "form",
+		explode: false
+	}),
 	(0, openapi_metadata_decorators.ApiResponse)({
 		status: 200,
 		description: "Success",
@@ -4032,7 +4206,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."
 	}),
 	(0, openapi_metadata_decorators.ApiParam)({
 		name: "userAddress",
@@ -4120,6 +4294,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
 	};
@@ -4129,10 +4304,12 @@ function from$1(position) {
 //#region src/api/Schema/requests.ts
 const MAX_LIMIT = 100;
 const DEFAULT_LIMIT = 20;
+const MAX_OBLIGATION_SORT_FIELDS = 3;
 const CONFIG_RULES_MAX_LIMIT = 1e3;
 const CONFIG_RULES_DEFAULT_LIMIT = 100;
 const CONFIG_CONTRACTS_MAX_LIMIT = 1e3;
 const CONFIG_CONTRACTS_DEFAULT_LIMIT = 1e3;
+const OBLIGATION_SORT_ENTRY_REGEX = /^-?(id|ask|bid|maturity)$/;
 /** Validate cursor is a valid base64url-encoded JSON object.
 * Domain layer handles semantic validation of cursor fields. */
 function isValidBase64urlJson(val) {
@@ -4173,10 +4350,11 @@ const ConfigRuleTypes = zod.enum([
 	"maturity",
 	"callback",
 	"loan_token",
+	"collateral_token",
 	"oracle"
 ]);
 const GetConfigRulesQueryParams = zod.object({
-	cursor: zod.string().regex(/^(maturity|callback|loan_token|oracle):[1-9]\d*:.+$/, { message: "Cursor must be in the format type:chain_id:<value>" }).optional().meta({
+	cursor: zod.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"
 	}),
@@ -4186,7 +4364,7 @@ const GetConfigRulesQueryParams = zod.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(zod.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).",
@@ -4261,9 +4439,12 @@ const GetOffersQueryParams = PaginationQueryParams.omit({ cursor: true }).extend
 });
 const GetObligationsQueryParams = zod.object({
 	...PaginationQueryParams.shape,
-	cursor: zod.string().optional().meta({
-		description: "Obligation id cursor",
-		example: "0x1234567890123456789012345678901234567890123456789012345678901234"
+	cursor: zod.string().optional().refine((val) => {
+		if (!val) return true;
+		return isValidBase64urlJson(val);
+	}, { message: "Invalid cursor format. Must be a valid base64url-encoded cursor object" }).meta({
+		description: "Pagination cursor in base64url-encoded format.",
+		example: "eyJzb3J0IjpbImlkIl0sImlkIjoiMHgxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAiLCJhc2siOiIwIiwiYmlkIjoiMCIsIm1hdHVyaXR5IjoxNzYxOTIyODAwfQ"
 	}),
 	chains: csvArray(zod.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).",
@@ -4280,18 +4461,35 @@ const GetObligationsQueryParams = zod.object({
 	maturities: csvArray(zod.string().regex(/^[1-9]\d*$/, { message: "Maturity must be a positive integer" }).transform((val) => Number.parseInt(val, 10))).meta({
 		description: "Filter by exact maturity timestamps (comma-separated, unix seconds).",
 		example: "1761922800,1764524800"
+	}),
+	sort: csvArray(zod.string().regex(OBLIGATION_SORT_ENTRY_REGEX, { message: "Sort entries must be one of: id, ask, bid, maturity (optionally prefixed with '-')" })).refine((entries) => entries === void 0 || entries.length <= MAX_OBLIGATION_SORT_FIELDS, { message: `Sort cannot include more than ${MAX_OBLIGATION_SORT_FIELDS} fields` }).superRefine((entries, ctx) => {
+		if (!entries) return;
+		const seen = /* @__PURE__ */ new Set();
+		for (const entry of entries) {
+			const field = entry.startsWith("-") ? entry.slice(1) : entry;
+			if (seen.has(field)) {
+				ctx.addIssue({
+					code: "custom",
+					message: `Duplicate sort field: ${field}`
+				});
+				return;
+			}
+			seen.add(field);
+		}
+	}).meta({
+		description: "Sort order as comma-separated fields. Prefix a field with '-' for descending order. Max 3 fields.",
+		example: "-ask,bid,maturity"
 	})
 });
 const GetObligationParams = zod.object({ obligation_id: zod.string({ error: "Obligation id is required and must be a valid 32-byte hex string" }).regex(/^0x[a-fA-F0-9]{64}$/, { error: "Obligation id must be a valid 32-byte hex string" }).transform((val) => val.toLowerCase()).meta({
 	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;
 	}
@@ -4452,7 +4650,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,
@@ -4469,7 +4667,8 @@ async function getOffers(apiClient, parameters) {
 				callback: {
 					address: offerData.callback,
 					data: offerData.callback_data
-				}
+				},
+				receiver_if_maker_is_seller: offerData.receiver_if_maker_is_seller
 			}),
 			hash: item.offer_hash,
 			consumed: BigInt(item.consumed),
@@ -4486,13 +4685,15 @@ async function getOffers(apiClient, parameters) {
 	};
 }
 async function getObligations(apiClient, parameters) {
+	const sort = parameters?.sort?.length ? parameters.sort.join(",") : void 0;
 	const { data, error, response } = await apiClient.GET("/v1/obligations", { params: { query: {
 		cursor: parameters?.cursor,
 		limit: parameters?.limit,
 		chains: parameters?.chainIds,
 		loan_tokens: parameters?.loanTokens,
 		collateral_tokens: parameters?.collateralTokens,
-		maturities: parameters?.maturities
+		maturities: parameters?.maturities,
+		sort
 	} } });
 	if (error !== void 0) {
 		switch (response.status) {
@@ -4516,10 +4717,10 @@ async function getObligations(apiClient, parameters) {
 		const { obligationId: _, ...returned } = {
 			id: () => id(obligation),
 			...obligation,
-			...fromSnakeCase({
-				obligation_id: item.id,
-				ask: item.ask,
-				bid: item.bid
+			...from$6({
+				obligationId: item.id,
+				ask: { tick: item.ask.tick },
+				bid: { tick: item.bid.tick }
 			})
 		};
 		return returned;
@@ -4800,6 +5001,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",
@@ -4840,19 +5068,19 @@ const oracles = {
 const configs = {
 	ethereum: {
 		callbacks: [{ type: Type$1.BuyWithEmptyCallback }, { type: Type$1.SellWithEmptyCallback }],
-		maturities: [MaturityType.EndOfMonth, MaturityType.EndOfNextMonth]
+		maturities: [MaturityType.EndOfWeek, MaturityType.EndOfNextWeek]
 	},
 	base: {
 		callbacks: [{ type: Type$1.BuyWithEmptyCallback }, { type: Type$1.SellWithEmptyCallback }],
-		maturities: [MaturityType.EndOfMonth, MaturityType.EndOfNextMonth]
+		maturities: [MaturityType.EndOfWeek, MaturityType.EndOfNextWeek]
 	},
 	"ethereum-virtual-testnet": {
 		callbacks: [{ type: Type$1.BuyWithEmptyCallback }, { type: Type$1.SellWithEmptyCallback }],
-		maturities: [MaturityType.EndOfMonth, MaturityType.EndOfNextMonth]
+		maturities: [MaturityType.EndOfWeek, MaturityType.EndOfNextWeek]
 	},
 	anvil: {
 		callbacks: [{ type: Type$1.BuyWithEmptyCallback }, { type: Type$1.SellWithEmptyCallback }],
-		maturities: [MaturityType.EndOfMonth, MaturityType.EndOfNextMonth]
+		maturities: [MaturityType.EndOfWeek, MaturityType.EndOfNextWeek]
 	}
 };
 
@@ -4862,10 +5090,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
 });
 /**
@@ -4885,7 +5114,7 @@ const chains = ({ chains }) => single("chain_ids", `Validates that offer chain i
 });
 const maturity = ({ maturities }) => single("maturity", `Validates that offer maturity is one of: [${maturities.join(", ")}]`, (offer) => {
 	const allowedMaturities = maturities.map((m) => from$11(m));
-	if (!allowedMaturities.includes(offer.maturity)) return { message: `Maturity must be end of current month (${allowedMaturities[0]}) or end of next month (${allowedMaturities[1]}). Got: ${offer.maturity}` };
+	if (!allowedMaturities.includes(offer.maturity)) return { message: `Maturity must be one of (${allowedMaturities.join(", ")}). Got: ${offer.maturity}` };
 });
 const callback = ({ callbacks }) => single("callback", `Validates callbacks: buy empty callback is ${callbacks.includes(Type$1.BuyWithEmptyCallback) ? "allowed" : "not allowed"}; sell empty callback is ${callbacks.includes(Type$1.SellWithEmptyCallback) ? "allowed" : "not allowed"}; non-empty callbacks are rejected`, (offer) => {
 	if (!isEmptyCallback(offer)) return { message: "Non-empty callbacks are not supported." };
@@ -4893,15 +5122,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.
@@ -4944,21 +5183,24 @@ 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 [
 		sameMaker(),
 		amountMutualExclusivity(),
 		chains({ chains: chains$2 }),
-		maturity({ maturities: [MaturityType.EndOfMonth, MaturityType.EndOfNextMonth] }),
+		maturity({ maturities: [MaturityType.EndOfWeek, MaturityType.EndOfNextWeek] }),
 		callback({
 			callbacks: [Type$1.BuyWithEmptyCallback, Type$1.SellWithEmptyCallback],
 			allowedAddresses: []
 		}),
-		token({ assetsByChainId }),
+		loanToken({ assetsByChainId }),
+		collateralToken({ collateralAssetsByChainId }),
 		oracle({ oraclesByChainId })
 	];
 };
@@ -5417,6 +5659,12 @@ Object.defineProperty(exports, 'Rules', {
     return Rules_exports;
   }
 });
+Object.defineProperty(exports, 'Tick', {
+  enumerable: true,
+  get: function () {
+    return Tick_exports;
+  }
+});
 Object.defineProperty(exports, 'Time', {
   enumerable: true,
   get: function () {