@morpho-dev/router 0.7.2 → 0.9.0

package/dist/index.node.mjs

@@ -12,7 +12,7 @@ import "@opentelemetry/propagator-aws-xray";
 import "@opentelemetry/resources";
 import "@opentelemetry/sdk-trace-node";
 import "@opentelemetry/semantic-conventions";
-import { and, asc, eq, gt, gte, inArray, lte, ne, sql } from "drizzle-orm";
+import { and, asc, desc, eq, gt, gte, inArray, lte, ne, sql } from "drizzle-orm";
 import { anvil, base, mainnet } from "viem/chains";
 import * as z$1 from "zod";
 import { StandardMerkleTree } from "@openzeppelin/merkle-tree";
@@ -566,7 +566,7 @@ var utils_exports = /* @__PURE__ */ __exportAll({
 
 //#endregion
 //#region src/indexer/collectors/Admin.ts
-function create$20(parameters) {
+function create$21(parameters) {
 	const collector = "admin";
 	const { client, db, options: { maxBatchSize = 25, maxBlockNumber } = {} } = parameters;
 	const maxBlockNumberBI = maxBlockNumber !== void 0 ? BigInt(maxBlockNumber) : void 0;
@@ -806,8 +806,8 @@ const names = [
 	"positions",
 	"prices"
 ];
-function create$19({ name, collect, client, db, options }) {
-	const admin = create$20({
+function create$20({ name, collect, client, db, options }) {
+	const admin = create$21({
 		client,
 		db,
 		options
@@ -973,18 +973,18 @@ const MorphoV2 = 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)",
@@ -996,12 +996,12 @@ const MorphoV2 = 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
@@ -1273,8 +1273,8 @@ const chains$2 = {
 		name: "ethereum-virtual-testnet",
 		custom: {
 			morpho: {
-				address: "0x634b095371e4e45feed94c1a45c37798e173ea50",
-				blockCreated: 23226700
+				address: "0xc9f3c65996fc46b9500608b2c9a9152c01c540f7",
+				blockCreated: 23226871
 			},
 			morphoBlue: {
 				address: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb",
@@ -1420,13 +1420,13 @@ var MissingBlockNumberError = class extends BaseError {
 
 //#endregion
 //#region src/core/ChainRegistry.ts
-var ChainRegistry_exports = /* @__PURE__ */ __exportAll({ create: () => create$18 });
+var ChainRegistry_exports = /* @__PURE__ */ __exportAll({ create: () => create$19 });
 /**
 * Creates a chain registry from a list of chains.
 * @param chains - Array of chain objects to register.
 * @returns A registry for looking up chains by ID. {@link ChainRegistry}
 */
-function create$18(chains) {
+function create$19(chains) {
 	const byId = /* @__PURE__ */ new Map();
 	for (const chain of chains) byId.set(chain.id, chain);
 	return {
@@ -2080,7 +2080,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),
@@ -2101,7 +2101,8 @@ const OfferSchema = () => {
 		callback: z$1.object({
 			address: z$1.string().transform(transformAddress),
 			data: z$1.string().transform(transformHex)
-		})
+		}),
+		receiverIfMakerIsSeller: z$1.string().transform(transformAddress)
 	}).refine((data) => data.start < data.expiry, {
 		message: "start must be before expiry",
 		path: ["start"]
@@ -2117,8 +2118,12 @@ const OfferSchema = () => {
 * @returns The created offer.
 */
 function from$14(input) {
+	const normalizedInput = {
+		...input,
+		receiverIfMakerIsSeller: input.receiverIfMakerIsSeller ?? input.maker
+	};
 	try {
-		return OfferSchema().parse(input);
+		return OfferSchema().parse(normalizedInput);
 	} catch (error) {
 		throw new InvalidOfferError(error);
 	}
@@ -2152,7 +2157,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),
@@ -2170,6 +2175,7 @@ const serialize = (offer) => ({
 		address: offer.callback.address,
 		data: offer.callback.data
 	},
+	receiverIfMakerIsSeller: offer.receiverIfMakerIsSeller,
 	hash: hash(offer)
 });
 /**
@@ -2197,14 +2203,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));
@@ -2213,12 +2218,13 @@ function random$1(config) {
 		address: zeroAddress,
 		data: "0x"
 	};
+	const maker = config?.maker ?? address();
 	return from$14({
-		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,
@@ -2231,7 +2237,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) => {
@@ -2283,7 +2290,7 @@ const types = {
 			type: "uint256"
 		},
 		{
-			name: "price",
+			name: "tick",
 			type: "uint256"
 		},
 		{
@@ -2317,6 +2324,10 @@ const types = {
 		{
 			name: "callback",
 			type: "Callback"
+		},
+		{
+			name: "receiverIfMakerIsSeller",
+			type: "address"
 		}
 	],
 	Collateral: [
@@ -2351,7 +2362,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,
@@ -2362,7 +2373,8 @@ function hash(offer) {
 			callback: {
 				address: offer.callback.address.toLowerCase(),
 				data: offer.callback.data
-			}
+			},
+			receiverIfMakerIsSeller: offer.receiverIfMakerIsSeller.toLowerCase()
 		},
 		primaryType: "Offer",
 		types
@@ -2402,7 +2414,7 @@ const OfferAbi = [
 		type: "uint256"
 	},
 	{
-		name: "price",
+		name: "tick",
 		type: "uint256"
 	},
 	{
@@ -2465,6 +2477,10 @@ const OfferAbi = [
 			name: "data",
 			type: "bytes"
 		}]
+	},
+	{
+		name: "receiverIfMakerIsSeller",
+		type: "address"
 	}
 ];
 function encode$1(offer) {
@@ -2473,7 +2489,7 @@ function encode$1(offer) {
 		offer.assets,
 		offer.obligationUnits,
 		offer.obligationShares,
-		offer.price,
+		BigInt(offer.tick),
 		BigInt(offer.maturity),
 		BigInt(offer.expiry),
 		offer.group,
@@ -2483,7 +2499,8 @@ function encode$1(offer) {
 		offer.loanToken,
 		BigInt(offer.start),
 		offer.collaterals,
-		offer.callback
+		offer.callback,
+		offer.receiverIfMakerIsSeller
 	]);
 }
 function decode$1(data) {
@@ -2498,7 +2515,7 @@ function decode$1(data) {
 		assets: decoded[1],
 		obligationUnits: decoded[2],
 		obligationShares: decoded[3],
-		price: decoded[4],
+		tick: Number(decoded[4]),
 		maturity: from$16(Number(decoded[5])),
 		expiry: Number(decoded[6]),
 		group: decoded[7],
@@ -2517,7 +2534,8 @@ function decode$1(data) {
 		callback: {
 			address: decoded[14].address,
 			data: decoded[14].data
-		}
+		},
+		receiverIfMakerIsSeller: decoded[15]
 	});
 }
 /**
@@ -2593,6 +2611,12 @@ const takeEvent = {
 			indexed: false,
 			internalType: "bool"
 		},
+		{
+			name: "sellerReceiver",
+			type: "address",
+			indexed: false,
+			internalType: "address"
+		},
 		{
 			name: "group",
 			type: "bytes32",
@@ -2778,20 +2802,99 @@ function from$12(parameters) {
 	};
 }
 
+//#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 {
+	name = "Tick.InvalidTickError";
+	constructor(tick) {
+		super(`Invalid tick: ${tick}. Tick must be an integer between 0 and ${TICK_RANGE}.`);
+	}
+};
+var InvalidPriceError = class extends BaseError {
+	name = "Tick.InvalidPriceError";
+	constructor(price) {
+		super(`Invalid price: ${price}. Price must be between 0 and ${MAX_PRICE}.`);
+	}
+};
+
 //#endregion
 //#region src/core/Quote.ts
 var Quote_exports = /* @__PURE__ */ __exportAll({
 	InvalidQuoteError: () => InvalidQuoteError,
-	QuoteSchema: () => QuoteSchema,
 	from: () => from$11,
 	fromSnakeCase: () => fromSnakeCase,
 	random: () => random
 });
-const QuoteSchema = z$1.object({
+const SideInputSchema = z$1.object({ tick: z$1.number().int().min(0).max(TICK_RANGE).nullable() }).strict();
+const QuoteInputSchema = z$1.object({
 	obligationId: z$1.string().transform(transformHex),
-	ask: z$1.object({ price: z$1.bigint({ coerce: true }).min(0n).max(maxUint256) }),
-	bid: z$1.object({ price: z$1.bigint({ coerce: true }).min(0n).max(maxUint256) })
-});
+	ask: SideInputSchema,
+	bid: SideInputSchema
+}).strict();
 /**
 * Creates a quote for a given obligation.
 * @constructor
@@ -2801,16 +2904,16 @@ const QuoteSchema = z$1.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$11(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);
@@ -2837,8 +2940,8 @@ function fromSnakeCase(snake) {
 function random() {
 	return from$11({
 		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 {
@@ -2847,6 +2950,12 @@ var InvalidQuoteError = class extends BaseError {
 		super("Invalid quote.", { cause: error });
 	}
 };
+function sideFromTick(side) {
+	return {
+		tick: side.tick,
+		price: side.tick === null ? 0n : tickToPrice(side.tick)
+	};
+}
 
 //#endregion
 //#region src/core/TradingFee.ts
@@ -3361,7 +3470,7 @@ const BrandTypeId = Symbol.for("mempool/Brand");
 
 //#endregion
 //#region src/database/drizzle/VERSION.ts
-const VERSION = "router_v1.6";
+const VERSION = "router_v1.8";
 
 //#endregion
 //#region src/database/drizzle/schema.ts
@@ -3513,10 +3622,7 @@ const offers = s.table(EnumTableName.OFFERS, {
 		precision: 78,
 		scale: 0
 	}).notNull().default("0"),
-	price: numeric("price", {
-		precision: 78,
-		scale: 0
-	}).notNull(),
+	tick: integer("tick").notNull(),
 	maturity: integer("maturity").notNull(),
 	expiry: integer("expiry").notNull(),
 	start: integer("start").notNull(),
@@ -3527,6 +3633,7 @@ const offers = s.table(EnumTableName.OFFERS, {
 	buy: boolean("buy").notNull(),
 	callbackAddress: varchar("callback_address", { length: 42 }).notNull(),
 	callbackData: text("callback_data").notNull(),
+	receiverIfMakerIsSeller: varchar("receiver_if_maker_is_seller", { length: 42 }),
 	blockNumber: bigint("block_number", { mode: "number" }).notNull(),
 	updatedAt: timestamp("updated_at").defaultNow().notNull()
 }, (table) => [
@@ -3581,6 +3688,7 @@ const lots = s.table(EnumTableName.LOTS, {
 	user: varchar("user", { length: 42 }).notNull(),
 	contract: varchar("contract", { length: 42 }).notNull(),
 	group: varchar("group", { length: 66 }).notNull(),
+	obligationId: varchar("obligation_id", { length: 66 }).notNull(),
 	lower: numeric("lower", {
 		precision: 78,
 		scale: 0
@@ -3595,7 +3703,8 @@ const lots = s.table(EnumTableName.LOTS, {
 			table.chainId,
 			table.user,
 			table.contract,
-			table.group
+			table.group,
+			table.obligationId
 		],
 		name: "lots_pk"
 	}),
@@ -3631,6 +3740,7 @@ const offsets = s.table(EnumTableName.OFFSETS, {
 	user: varchar("user", { length: 42 }).notNull(),
 	contract: varchar("contract", { length: 42 }).notNull(),
 	group: varchar("group", { length: 66 }).notNull(),
+	obligationId: varchar("obligation_id", { length: 66 }).notNull(),
 	value: numeric("value", {
 		precision: 78,
 		scale: 0
@@ -3640,7 +3750,8 @@ const offsets = s.table(EnumTableName.OFFSETS, {
 		table.chainId,
 		table.user,
 		table.contract,
-		table.group
+		table.group,
+		table.obligationId
 	],
 	name: "offsets_pk"
 }), foreignKey({
@@ -4231,6 +4342,7 @@ function decodeCallbacks(parameters) {
 			positionContract: loanToken,
 			positionUser: offer.maker,
 			group: offer.group,
+			obligationId: obligationId(offer),
 			size: offer.assets
 		});
 		callbacks.push({
@@ -4903,7 +5015,7 @@ async function* collectPrices(parameters) {
 //#region src/indexer/collectors/CollectorBuilder.ts
 function createBuilder(parameters) {
 	const { client, db, gatekeeper, options: { maxBlockNumber, blockWindow, interval } = {} } = parameters;
-	const createCollector = (name, collect) => create$19({
+	const createCollector = (name, collect) => create$20({
 		name,
 		collect,
 		client,
@@ -4995,7 +5107,7 @@ const from$7 = (parameters) => {
 //#endregion
 //#region src/indexer/Indexer.ts
 var Indexer_exports = /* @__PURE__ */ __exportAll({
-	create: () => create$17,
+	create: () => create$18,
 	from: () => from$6
 });
 function from$6(config) {
@@ -5011,7 +5123,7 @@ function from$6(config) {
 		retryAttempts,
 		retryDelayMs
 	});
-	return create$17({
+	return create$18({
 		client,
 		collectors: [
 			offersCollector,
@@ -5021,7 +5133,7 @@ function from$6(config) {
 		]
 	});
 }
-function create$17(params) {
+function create$18(params) {
 	const { collectors, client } = params;
 	const indexerId = `${client.chain.id.toString()}.indexer`;
 	const tracer = getTracer(`router.${indexerId}`);
@@ -5050,12 +5162,12 @@ function create$17(params) {
 
 //#endregion
 //#region src/api/Health.ts
-var Health_exports = /* @__PURE__ */ __exportAll({ create: () => create$16 });
+var Health_exports = /* @__PURE__ */ __exportAll({ create: () => create$17 });
 const DEFAULT_MAX_ALLOWED_LAG = 5;
 /**
 * Create a health service that exposes collector and chain block numbers.
 */
-function create$16(parameters) {
+function create$17(parameters) {
 	const { db, maxAllowedLag = DEFAULT_MAX_ALLOWED_LAG, healthClients, chainRegistry } = parameters;
 	const loadSnapshot = async () => {
 		const [collectorRows, chainRows, remoteBlockByChainId] = await Promise.all([
@@ -5169,8 +5281,10 @@ async function getRemoteBlockNumbers(healthClients) {
 //#region src/api/Schema/BookResponse.ts
 var BookResponse_exports = /* @__PURE__ */ __exportAll({ from: () => from$5 });
 function from$5(level) {
+	const price = tickToPrice(level.tick);
 	return {
-		price: level.price.toString(),
+		tick: level.tick,
+		price: price.toString(),
 		assets: level.assets.toString(),
 		count: level.count
 	};
@@ -5217,6 +5331,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$4(obligation, quote) {
@@ -5230,8 +5345,14 @@ function from$4(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()
+		}
 	};
 }
 
@@ -5275,11 +5396,12 @@ function from$3(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({
@@ -5346,7 +5468,7 @@ var InternalServerError = class extends APIError {
 		super(STATUS_CODE.INTERNAL_SERVER_ERROR, message, "INTERNAL_SERVER_ERROR");
 	}
 };
-var BadRequestError = class extends APIError {
+var BadRequestError$1 = class extends APIError {
 	constructor(message = "Invalid JSON format", details) {
 		super(STATUS_CODE.BAD_REQUEST, message, "BAD_REQUEST", details);
 	}
@@ -5368,7 +5490,7 @@ function success(args) {
 */
 function failure(err) {
 	if (err instanceof APIError) return handleAPIError(err);
-	if (err instanceof SyntaxError) return handleAPIError(new BadRequestError(err.message));
+	if (err instanceof SyntaxError) return handleAPIError(new BadRequestError$1(err.message));
 	if (err instanceof z$1.ZodError) return handleAPIError(handleZodError(err));
 	return handleAPIError(new InternalServerError());
 }
@@ -5418,7 +5540,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: {
@@ -5437,11 +5559,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",
@@ -5478,7 +5601,7 @@ const validateOfferExample = {
 	assets: "369216000000000000000000",
 	obligation_units: "0",
 	obligation_shares: "0",
-	price: "2750000000000000000",
+	tick: 495,
 	maturity: 1761922799,
 	expiry: 1761922799,
 	start: 1761922790,
@@ -5495,7 +5618,8 @@ const validateOfferExample = {
 	callback: {
 		address: "0x0000000000000000000000000000000000000000",
 		data: "0x"
-	}
+	},
+	receiver_if_maker_is_seller: "0x7b093658BE7f90B63D7c359e8f408e503c2D9401"
 };
 const routerStatusExample = {
 	status: "live",
@@ -5566,11 +5690,23 @@ __decorate([ApiProperty({
 	example: validateOfferExample.callback.data
 })], ValidateCallbackRequest.prototype, "data", void 0);
 var AskResponse = class {};
+__decorate([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([ApiProperty({
 	type: "string",
 	example: "1000000000000000000"
 })], AskResponse.prototype, "price", void 0);
 var BidResponse = class {};
+__decorate([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([ApiProperty({
 	type: "string",
 	example: "1000000000000000000"
@@ -5622,9 +5758,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
@@ -5641,6 +5779,10 @@ __decorate([ApiProperty({
 	type: "string",
 	example: offerExample.offer.callback_data
 })], OfferDataResponse.prototype, "callback_data", void 0);
+__decorate([ApiProperty({
+	type: "string",
+	example: offerExample.offer.receiver_if_maker_is_seller
+})], OfferDataResponse.prototype, "receiver_if_maker_is_seller", void 0);
 var OfferListItemResponse = class {};
 __decorate([ApiProperty({
 	type: () => OfferDataResponse,
@@ -5865,9 +6007,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
@@ -5908,6 +6052,10 @@ __decorate([ApiProperty({
 	type: () => ValidateCallbackRequest,
 	example: validateOfferExample.callback
 })], ValidateOfferRequest.prototype, "callback", void 0);
+__decorate([ApiProperty({
+	type: "string",
+	example: validateOfferExample.receiver_if_maker_is_seller
+})], ValidateOfferRequest.prototype, "receiver_if_maker_is_seller", void 0);
 var ValidateOffersRequest = class {};
 __decorate([ApiProperty({
 	type: () => [ValidateOfferRequest],
@@ -5967,9 +6115,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",
@@ -5983,6 +6138,7 @@ const positionExample = {
 	chain_id: 1,
 	contract: "0xC9A9C45C0eB717f8b5F193Af6bAa05A1c0Ac5078",
 	user: "0x7b093658BE7f90B63D7c359e8f408e503c2D9401",
+	obligation_id: "0x12590ae1aee324a005be565f3bcdd16dbf8daf7969b26c181c8b8f467dad9f67",
 	reserved: "200000000000000000000",
 	block_number: 21345678
 };
@@ -5999,6 +6155,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
@@ -6026,7 +6188,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() {}
@@ -6036,7 +6198,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",
@@ -6061,7 +6223,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,
@@ -6255,6 +6417,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,
@@ -6264,6 +6431,7 @@ const configRulesChecksumExample = "f1d2d2f924e986ac86fdf7b36c94bcdf";
 const configRulesPayloadExample = [
 	configRulesMaturityExample,
 	configRulesLoanTokenExample,
+	configRulesCollateralTokenExample,
 	configRulesOracleExample
 ];
 const configContractNames = [
@@ -6390,7 +6558,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",
@@ -6410,7 +6578,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
@@ -6440,13 +6608,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."
 	}),
 	ApiQuery({
 		name: "cursor",
 		type: "string",
 		example: obligationCursorExample,
-		description: "Obligation id cursor for pagination."
+		description: "Pagination cursor in base64url-encoded format."
 	}),
 	ApiQuery({
 		name: "limit",
@@ -6490,6 +6658,15 @@ __decorate([
 		style: "form",
 		explode: false
 	}),
+	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
+	}),
 	ApiResponse({
 		status: 200,
 		description: "Success",
@@ -6528,7 +6705,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",
@@ -6616,6 +6793,7 @@ function from$2(position) {
 		chain_id: position.chainId,
 		contract: position.contract,
 		user: position.user,
+		obligation_id: position.obligationId,
 		reserved: position.reserved.toString(),
 		block_number: position.blockNumber
 	};
@@ -6624,11 +6802,13 @@ function from$2(position) {
 //#endregion
 //#region src/api/Schema/requests.ts
 const MAX_LIMIT = 100;
-const DEFAULT_LIMIT$4 = 20;
+const DEFAULT_LIMIT$5 = 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) {
@@ -6660,8 +6840,8 @@ const PaginationQueryParams = z$1.object({
 		description: "Pagination cursor in base64url-encoded format",
 		example: "eyJzaWRlIjoic2VsbCIsImN1cnJlbnRQcmljZSI6IjEwMDAwMDAwMDAwMDAwMDAwMDAiLCJibG9ja051bWJlciI6MSwiYXNzZXRzIjoiMTAwMDAwMDAwMDAwMDAwMDAwMCIsImhhc2giOiIweGRmZDY4NTllM2UwODJkMTkzODlhMWFlYzFiZGFkN2U4ZDkyZDk2YjFhYTc5NDBkYTkxYTMxMjVkMzFlM2JlNWIiLCJ0b3RhbFJldHVybmVkIjoxMCwibm93IjoxNjAwMDAwMDAwfQ"
 	}),
-	limit: z$1.string().regex(/^[1-9]\d*$/, { message: "Limit must be a positive integer" }).transform((val) => Number.parseInt(val, 10)).pipe(z$1.number().max(MAX_LIMIT, { message: `Limit cannot exceed ${MAX_LIMIT}` })).optional().default(DEFAULT_LIMIT$4).meta({
-		description: `Limit maximum: ${MAX_LIMIT}. Default: ${DEFAULT_LIMIT$4}`,
+	limit: z$1.string().regex(/^[1-9]\d*$/, { message: "Limit must be a positive integer" }).transform((val) => Number.parseInt(val, 10)).pipe(z$1.number().max(MAX_LIMIT, { message: `Limit cannot exceed ${MAX_LIMIT}` })).optional().default(DEFAULT_LIMIT$5).meta({
+		description: `Limit maximum: ${MAX_LIMIT}. Default: ${DEFAULT_LIMIT$5}`,
 		example: 10
 	})
 });
@@ -6669,10 +6849,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"
 	}),
@@ -6682,7 +6863,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).",
@@ -6757,9 +6938,12 @@ const GetOffersQueryParams = PaginationQueryParams.omit({ cursor: true }).extend
 });
 const GetObligationsQueryParams = z$1.object({
 	...PaginationQueryParams.shape,
-	cursor: z$1.string().optional().meta({
-		description: "Obligation id cursor",
-		example: "0x1234567890123456789012345678901234567890123456789012345678901234"
+	cursor: z$1.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(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).",
@@ -6776,18 +6960,35 @@ const GetObligationsQueryParams = z$1.object({
 	maturities: csvArray(z$1.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(z$1.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 = z$1.object({ obligation_id: z$1.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;
 	}
@@ -6800,8 +7001,8 @@ const BookPaginationQueryParams = z$1.object({
 		description: "Pagination cursor in base64url-encoded format for book levels",
 		example: "eyJzaWRlIjoiYnV5IiwibGFzdFJhdGUiOiIxMDAwMDAwMDAwMDAwMDAwMDAwIiwib2ZmZXJzQ3Vyc29yIjpudWxsfQ"
 	}),
-	limit: z$1.string().regex(/^[1-9]\d*$/, { message: "Limit must be a positive integer" }).transform((val) => Number.parseInt(val, 10)).pipe(z$1.number().max(MAX_LIMIT, { message: `Limit cannot exceed ${MAX_LIMIT}` })).optional().default(DEFAULT_LIMIT$4).meta({
-		description: `Limit maximum: ${MAX_LIMIT}. Default: ${DEFAULT_LIMIT$4}`,
+	limit: z$1.string().regex(/^[1-9]\d*$/, { message: "Limit must be a positive integer" }).transform((val) => Number.parseInt(val, 10)).pipe(z$1.number().max(MAX_LIMIT, { message: `Limit cannot exceed ${MAX_LIMIT}` })).optional().default(DEFAULT_LIMIT$5).meta({
+		description: `Limit maximum: ${MAX_LIMIT}. Default: ${DEFAULT_LIMIT$5}`,
 		example: 10
 	})
 });
@@ -6885,7 +7086,7 @@ async function getBook(params, db) {
 			side: query.side,
 			levels_count: levels.length,
 			has_next_cursor: nextCursor != null,
-			first_level_price: firstLevel?.price.toString() ?? null,
+			first_level_tick: firstLevel?.tick ?? null,
 			first_level_assets: firstLevel?.assets.toString() ?? null,
 			first_level_count: firstLevel?.count ?? null
 		});
@@ -6978,7 +7179,7 @@ async function getConfigContracts(query, chainRegistry) {
 }
 function parseCursor$1(cursor) {
 	const [chain, address] = cursor.split(":", 2);
-	if (!chain || !address) throw new BadRequestError("Cursor must be in the format chain_id:0x...");
+	if (!chain || !address) throw new BadRequestError$1("Cursor must be in the format chain_id:0x...");
 	return {
 		chain_id: Number.parseInt(chain, 10),
 		address: address.toLowerCase()
@@ -7037,6 +7238,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",
@@ -7077,26 +7305,26 @@ 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]
 	}
 };
 
 //#endregion
 //#region src/gatekeeper/ConfigRules.ts
 /**
-* Build the configured rules (maturities + callback addresses + loan tokens + oracles) for the provided chains.
+* Build the configured rules (maturities + callback addresses + loan tokens + collateral tokens + oracles) for the provided chains.
 * @param chains - Chains to include in the configured rules.
 * @returns Sorted list of config rules.
 */
@@ -7116,6 +7344,12 @@ function buildConfigRules(chains) {
 			chain_id: chain.id,
 			address: normalizeAddress(address)
 		});
+		const collateralTokens = collateralAssets[chain.id.toString()] ?? [];
+		for (const address of collateralTokens) rules.push({
+			type: "collateral_token",
+			chain_id: chain.id,
+			address: normalizeAddress(address)
+		});
 		const oracles$2 = oracles[chain.id.toString()] ?? [];
 		for (const address of oracles$2) rules.push({
 			type: "oracle",
@@ -7143,6 +7377,10 @@ function buildConfigRulesChecksum(rules) {
 			hash.update(`callback:${rule.chain_id}:${rule.callback_type}:${rule.address}\n`);
 			continue;
 		}
+		if (rule.type === "collateral_token") {
+			hash.update(`collateral_token:${rule.chain_id}:${rule.address}\n`);
+			continue;
+		}
 		if (rule.type === "oracle") {
 			hash.update(`oracle:${rule.chain_id}:${rule.address}\n`);
 			continue;
@@ -7163,6 +7401,7 @@ function compareConfigRules(left, right) {
 		return left.address.localeCompare(right.address);
 	}
 	if (left.type === "loan_token" && right.type === "loan_token") return left.address.localeCompare(right.address);
+	if (left.type === "collateral_token" && right.type === "collateral_token") return left.address.localeCompare(right.address);
 	if (left.type === "oracle" && right.type === "oracle") return left.address.localeCompare(right.address);
 	return 0;
 }
@@ -7193,8 +7432,8 @@ async function getConfigRules(query, chains) {
 	} catch (err) {
 		return failure(err);
 	}
-	if (cursorRule && typeFilter && !typeFilter.has(cursorRule.type)) return failure(new BadRequestError("Cursor type must match requested rule types"));
-	if (cursorRule && chainFilter && !chainFilter.has(cursorRule.chain_id)) return failure(new BadRequestError("Cursor chain_id must match requested chains"));
+	if (cursorRule && typeFilter && !typeFilter.has(cursorRule.type)) return failure(new BadRequestError$1("Cursor type must match requested rule types"));
+	if (cursorRule && chainFilter && !chainFilter.has(cursorRule.chain_id)) return failure(new BadRequestError$1("Cursor chain_id must match requested chains"));
 	const startIndex = cursorRule ? findStartIndex(filteredRules, cursorRule) : 0;
 	const page = filteredRules.slice(startIndex, startIndex + limit);
 	const nextCursor = startIndex + limit < filteredRules.length && page.length > 0 ? formatCursor(page.at(-1)) : null;
@@ -7209,19 +7448,20 @@ function formatCursor(rule) {
 	if (rule.type === "maturity") return `maturity:${rule.chain_id}:${rule.timestamp}:${rule.name}`;
 	if (rule.type === "callback") return `callback:${rule.chain_id}:${rule.callback_type}:${rule.address.toLowerCase()}`;
 	if (rule.type === "oracle") return `oracle:${rule.chain_id}:${rule.address.toLowerCase()}`;
+	if (rule.type === "collateral_token") return `collateral_token:${rule.chain_id}:${rule.address.toLowerCase()}`;
 	return `loan_token:${rule.chain_id}:${rule.address.toLowerCase()}`;
 }
 function parseCursor(cursor) {
 	const [type, chain, ...rest] = cursor.split(":");
-	if (!type || !chain || rest.length === 0) throw new BadRequestError("Cursor must be in the format type:chain_id:<value>");
-	if (!isConfigRuleType(type)) throw new BadRequestError("Cursor has an invalid rule type");
+	if (!type || !chain || rest.length === 0) throw new BadRequestError$1("Cursor must be in the format type:chain_id:<value>");
+	if (!isConfigRuleType(type)) throw new BadRequestError$1("Cursor has an invalid rule type");
 	const chain_id = Number.parseInt(chain, 10);
-	if (!Number.isFinite(chain_id)) throw new BadRequestError("Cursor has an invalid chain_id");
+	if (!Number.isFinite(chain_id)) throw new BadRequestError$1("Cursor has an invalid chain_id");
 	if (type === "maturity") {
 		const timestampValue = Number.parseInt(rest[0] ?? "", 10);
 		const nameValue = rest.slice(1).join(":");
-		if (!Number.isFinite(timestampValue) || nameValue.length === 0) throw new BadRequestError("Cursor must be in the format maturity:chain_id:timestamp:name");
-		if (!isMaturityType(nameValue)) throw new BadRequestError("Cursor has an invalid maturity name");
+		if (!Number.isFinite(timestampValue) || nameValue.length === 0) throw new BadRequestError$1("Cursor must be in the format maturity:chain_id:timestamp:name");
+		if (!isMaturityType(nameValue)) throw new BadRequestError$1("Cursor has an invalid maturity name");
 		return {
 			type,
 			chain_id,
@@ -7232,8 +7472,8 @@ function parseCursor(cursor) {
 	if (type === "callback") {
 		const callbackTypeValue = rest[0] ?? "";
 		const addressValue = rest.slice(1).join(":");
-		if (!callbackTypeValue || !addressValue) throw new BadRequestError("Cursor must be in the format callback:chain_id:callback_type:address");
-		if (!isCallbackType(callbackTypeValue)) throw new BadRequestError("Cursor has an invalid callback type");
+		if (!callbackTypeValue || !addressValue) throw new BadRequestError$1("Cursor must be in the format callback:chain_id:callback_type:address");
+		if (!isCallbackType(callbackTypeValue)) throw new BadRequestError$1("Cursor has an invalid callback type");
 		return {
 			type,
 			chain_id,
@@ -7241,16 +7481,16 @@ function parseCursor(cursor) {
 			address: parseAddress(addressValue, "Cursor address")
 		};
 	}
-	if (type === "loan_token" || type === "oracle") {
+	if (type === "loan_token" || type === "collateral_token" || type === "oracle") {
 		const addressValue = rest.join(":");
-		if (!addressValue) throw new BadRequestError(`Cursor must be in the format ${type}:chain_id:address`);
+		if (!addressValue) throw new BadRequestError$1(`Cursor must be in the format ${type}:chain_id:address`);
 		return {
 			type,
 			chain_id,
 			address: parseAddress(addressValue, "Cursor address")
 		};
 	}
-	throw new BadRequestError("Cursor has an invalid rule type");
+	throw new BadRequestError$1("Cursor has an invalid rule type");
 }
 function findStartIndex(rules, cursor) {
 	let low = 0;
@@ -7264,11 +7504,11 @@ function findStartIndex(rules, cursor) {
 	return low;
 }
 function parseAddress(address, label) {
-	if (!/^0x[a-fA-F0-9]{40}$/.test(address)) throw new BadRequestError(`${label} must be a valid 20-byte address`);
+	if (!/^0x[a-fA-F0-9]{40}$/.test(address)) throw new BadRequestError$1(`${label} must be a valid 20-byte address`);
 	return address.toLowerCase();
 }
 function isConfigRuleType(value) {
-	return value === "maturity" || value === "callback" || value === "loan_token" || value === "oracle";
+	return value === "maturity" || value === "callback" || value === "loan_token" || value === "collateral_token" || value === "oracle";
 }
 function isMaturityType(value) {
 	return Object.values(MaturityType).includes(value);
@@ -7277,7 +7517,7 @@ function parseMaturity(value) {
 	try {
 		return from$16(value);
 	} catch (err) {
-		throw new BadRequestError(err instanceof Error ? err.message : "Invalid maturity timestamp");
+		throw new BadRequestError$1(err instanceof Error ? err.message : "Invalid maturity timestamp");
 	}
 }
 function isCallbackType(value) {
@@ -7373,7 +7613,7 @@ async function getHealth(query, db, chainRegistry) {
 	try {
 		const parsed = safeParse("get_health", query);
 		if (!parsed.success) return failure(parsed.error);
-		const snapshot = await create$16({
+		const snapshot = await create$17({
 			db,
 			chainRegistry
 		}).getSnapshot();
@@ -7402,7 +7642,7 @@ async function getHealthChains(query, db, healthClients, chainRegistry) {
 	try {
 		const parsed = safeParse("get_health_chains", query);
 		if (!parsed.success) return failure(parsed.error);
-		const snapshot = await create$16({
+		const snapshot = await create$17({
 			db,
 			healthClients,
 			chainRegistry
@@ -7434,7 +7674,7 @@ async function getHealthCollectors(query, db, chainRegistry) {
 	try {
 		const parsed = safeParse("get_health_collectors", query);
 		if (!parsed.success) return failure(parsed.error);
-		const snapshot = await create$16({
+		const snapshot = await create$17({
 			db,
 			chainRegistry
 		}).getSnapshot();
@@ -7463,39 +7703,274 @@ async function getHealthCollectors(query, db, chainRegistry) {
 	}
 }
 
+//#endregion
+//#region src/database/readers/ObligationsListing.ts
+const SORT_FIELDS = [
+	"id",
+	"ask",
+	"bid",
+	"maturity"
+];
+const CURSOR_ID_REGEX = /^0x[a-f0-9]{64}$/i;
+const INT32_MIN = -2147483648;
+const INT32_MAX = 2147483647;
+const INT32_MAX_BIGINT = BigInt(INT32_MAX);
+const MAX_CURSOR_SORT_FIELDS = 4;
+const DEFAULT_LIMIT$4 = 20;
+var BadRequestError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "ObligationsListingBadRequestError";
+	}
+};
+/**
+* Creates the obligations listing reader facade.
+* @param parameters - Reader dependencies.
+* @returns Obligations listing reader.
+*/
+function create$16(parameters) {
+	const { db } = parameters;
+	return { list: async (queryParameters) => {
+		const { ids, chainId: chainIds, loanToken: loanTokens, collateralToken: collateralTokens, maturity: maturities, sort: sortTokens, cursor: encodedCursor, limit: requestedLimit } = queryParameters ?? {};
+		const limit = requestedLimit ?? DEFAULT_LIMIT$4;
+		if (!Number.isInteger(limit) || limit <= 0) throw new BadRequestError("Limit must be a positive integer");
+		const cursorPayload = encodedCursor ? decodeCursorPayload(encodedCursor) : void 0;
+		const requestedSort = normalizeSort(sortTokens);
+		const cursorSort = cursorPayload ? normalizeSort(cursorPayload.sort) : void 0;
+		if (cursorSort !== void 0 && sortTokens !== void 0 && !hasSameSort(requestedSort, cursorSort)) throw new BadRequestError("Cursor sort does not match requested sort");
+		const sort = sortTokens !== void 0 ? requestedSort : cursorSort ?? requestedSort;
+		const cursorValues = cursorPayload ? cursorValuesFromPayload(cursorPayload) : void 0;
+		const now$3 = now();
+		const loanTokenFilter = loanTokens !== void 0 && loanTokens.length > 0 ? sql`(${sql.join(loanTokens.map((token) => sql`LOWER(${obligations.loanToken}) = ${token.toLowerCase()}`), sql` OR `)})` : void 0;
+		const collateralFilter = collateralTokens !== void 0 && collateralTokens.length > 0 ? sql`EXISTS (
+          SELECT 1 FROM ${obligationCollateralsV2} oc
+          WHERE oc.obligation_id = ${obligations.obligationId}
+          AND (${sql.join(collateralTokens.map((token) => sql`LOWER(oc.asset) = ${token.toLowerCase()}`), sql` OR `)})
+        )` : void 0;
+		const bestAskTick = db.select({ askTick: offers.tick }).from(offers).innerJoin(groups, and(eq(offers.groupChainId, groups.chainId), eq(offers.groupMaker, groups.maker), eq(offers.group, groups.group))).leftJoin(validations, eq(offers.hash, validations.offerHash)).leftJoin(status, eq(validations.statusId, status.id)).where(and(eq(offers.obligationId, obligations.obligationId), eq(offers.buy, false), gte(offers.expiry, now$3), gte(offers.maturity, now$3), lte(offers.start, now$3), sql`(${status.code} IS NULL OR ${status.code} = ${Status.VALID})`)).orderBy(desc(offers.tick)).limit(1).as("best_ask_tick");
+		const bestBidTick = db.select({ bidTick: offers.tick }).from(offers).innerJoin(groups, and(eq(offers.groupChainId, groups.chainId), eq(offers.groupMaker, groups.maker), eq(offers.group, groups.group))).leftJoin(validations, eq(offers.hash, validations.offerHash)).leftJoin(status, eq(validations.statusId, status.id)).where(and(eq(offers.obligationId, obligations.obligationId), eq(offers.buy, true), gte(offers.expiry, now$3), gte(offers.maturity, now$3), lte(offers.start, now$3), sql`(${status.code} IS NULL OR ${status.code} = ${Status.VALID})`)).orderBy(asc(offers.tick)).limit(1).as("best_bid_tick");
+		const obligationsWithQuotes = db.select({
+			obligationId: obligations.obligationId,
+			chainId: obligations.chainId,
+			loanToken: obligations.loanToken,
+			collaterals: sql`ARRAY_AGG(jsonb_build_object('asset', ${obligationCollateralsV2.asset}, 'oracle', ${oracles$1.address}, 'lltv', ${obligationCollateralsV2.lltv}))`.as("collaterals"),
+			maturity: obligations.maturity,
+			askTick: sql`MAX(${bestAskTick.askTick})`.as("ask_tick"),
+			bidTick: sql`MAX(${bestBidTick.bidTick})`.as("bid_tick"),
+			ask: sql`COALESCE(MAX(${bestAskTick.askTick}) + 1, 0)`.as("ask"),
+			bid: sql`COALESCE(MAX(${bestBidTick.bidTick}) + 1, 0)`.as("bid")
+		}).from(obligations).innerJoin(obligationCollateralsV2, eq(obligations.obligationId, obligationCollateralsV2.obligationId)).innerJoin(oracles$1, sql`${obligationCollateralsV2.oracleChainId} = ${oracles$1.chainId}
+         AND ${obligationCollateralsV2.oracleAddress} = ${oracles$1.address}`).leftJoinLateral(bestAskTick, sql`true`).leftJoinLateral(bestBidTick, sql`true`).groupBy(obligations.obligationId).where(and(ids !== void 0 && ids.length > 0 ? inArray(obligations.obligationId, ids) : void 0, chainIds !== void 0 && chainIds.length > 0 ? inArray(obligations.chainId, chainIds) : void 0, loanTokenFilter, maturities !== void 0 && maturities.length > 0 ? inArray(obligations.maturity, maturities) : gte(obligations.maturity, now$3), collateralFilter)).as("obligations_with_quotes");
+		const sortColumns = {
+			id: obligationsWithQuotes.obligationId,
+			ask: obligationsWithQuotes.ask,
+			bid: obligationsWithQuotes.bid,
+			maturity: obligationsWithQuotes.maturity
+		};
+		const rows = await db.select({
+			obligationId: obligationsWithQuotes.obligationId,
+			chainId: obligationsWithQuotes.chainId,
+			loanToken: obligationsWithQuotes.loanToken,
+			collaterals: obligationsWithQuotes.collaterals,
+			maturity: obligationsWithQuotes.maturity,
+			askTick: obligationsWithQuotes.askTick,
+			bidTick: obligationsWithQuotes.bidTick,
+			ask: obligationsWithQuotes.ask,
+			bid: obligationsWithQuotes.bid
+		}).from(obligationsWithQuotes).where(buildCursorFilter(sortColumns, sort, cursorValues)).orderBy(...buildOrderBy(sortColumns, sort)).limit(limit + 1);
+		const hasMore = rows.length > limit;
+		const listedRows = (hasMore ? rows.slice(0, limit) : rows).map((row) => {
+			return {
+				obligation: from$15({
+					chainId: row.chainId,
+					loanToken: row.loanToken,
+					collaterals: row.collaterals.sort((left, right) => left.asset.localeCompare(right.asset)).map((collateral) => from$17({
+						asset: collateral.asset,
+						oracle: collateral.oracle,
+						lltv: from$18(BigInt(collateral.lltv))
+					})),
+					maturity: row.maturity
+				}),
+				quote: from$11({
+					obligationId: row.obligationId,
+					ask: { tick: row.askTick },
+					bid: { tick: row.bidTick }
+				}),
+				cursorValues: {
+					id: row.obligationId,
+					ask: toBigInt(row.ask),
+					bid: toBigInt(row.bid),
+					maturity: row.maturity
+				}
+			};
+		});
+		const nextCursor = hasMore && listedRows.length > 0 ? encodeCursorPayload({
+			sort: sortToTokens(sort),
+			id: listedRows[listedRows.length - 1].cursorValues.id,
+			ask: listedRows[listedRows.length - 1].cursorValues.ask.toString(),
+			bid: listedRows[listedRows.length - 1].cursorValues.bid.toString(),
+			maturity: listedRows[listedRows.length - 1].cursorValues.maturity
+		}) : null;
+		return {
+			obligations: listedRows.map((row) => ({
+				obligation: row.obligation,
+				quote: row.quote
+			})),
+			nextCursor
+		};
+	} };
+}
+function isSortField(value) {
+	return SORT_FIELDS.includes(value);
+}
+function parseSortToken(token) {
+	const direction = token.startsWith("-") ? "desc" : "asc";
+	const rawField = token.startsWith("-") ? token.slice(1) : token;
+	if (!isSortField(rawField)) throw new BadRequestError(`Invalid sort field: ${rawField}`);
+	return {
+		field: rawField,
+		direction
+	};
+}
+function normalizeSort(sortTokens) {
+	const parsed = sortTokens?.length ? sortTokens.map(parseSortToken) : [{
+		field: "id",
+		direction: "asc"
+	}];
+	return parsed.some((entry) => entry.field === "id") ? parsed : [...parsed, {
+		field: "id",
+		direction: "asc"
+	}];
+}
+function sortToTokens(sortEntries) {
+	return sortEntries.map((entry) => entry.direction === "desc" ? `-${entry.field}` : entry.field);
+}
+function hasSameSort(left, right) {
+	if (left.length !== right.length) return false;
+	return left.every((sortEntry, index) => sortEntry.field === right[index]?.field && sortEntry.direction === right[index]?.direction);
+}
+function decodeCursorPayload(cursor) {
+	let decoded;
+	try {
+		decoded = JSON.parse(Buffer.from(cursor, "base64url").toString("utf8"));
+	} catch {
+		throw new BadRequestError("Invalid cursor format");
+	}
+	if (decoded === null || typeof decoded !== "object") throw new BadRequestError("Invalid cursor payload");
+	const payload = decoded;
+	const sortTokens = parseCursorSortTokens(payload.sort);
+	if (typeof payload.id !== "string" || !CURSOR_ID_REGEX.test(payload.id)) throw new BadRequestError("Invalid cursor obligation id");
+	const ask = parseCursorNonNegativeInt32(payload.ask, "ask");
+	const bid = parseCursorNonNegativeInt32(payload.bid, "bid");
+	if (!isInt32(payload.maturity)) throw new BadRequestError("Invalid cursor maturity value");
+	return {
+		sort: sortTokens,
+		id: payload.id,
+		ask,
+		bid,
+		maturity: payload.maturity
+	};
+}
+function parseCursorSortTokens(value) {
+	if (!Array.isArray(value) || value.length === 0 || value.length > MAX_CURSOR_SORT_FIELDS) throw new BadRequestError("Invalid cursor sort");
+	const sortEntries = value.map((token) => {
+		if (typeof token !== "string") throw new BadRequestError("Invalid cursor sort");
+		try {
+			return parseSortToken(token);
+		} catch {
+			throw new BadRequestError("Invalid cursor sort");
+		}
+	});
+	if (new Set(sortEntries.map((entry) => entry.field)).size !== sortEntries.length) throw new BadRequestError("Invalid cursor sort");
+	return sortToTokens(sortEntries);
+}
+function parseCursorNonNegativeInt32(value, field) {
+	if (typeof value !== "string" || !/^\d+$/.test(value)) throw new BadRequestError(`Invalid cursor ${field} value`);
+	if (BigInt(value) > INT32_MAX_BIGINT) throw new BadRequestError(`Invalid cursor ${field} value`);
+	return value;
+}
+function isInt32(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value >= INT32_MIN && value <= INT32_MAX;
+}
+function encodeCursorPayload(payload) {
+	return Buffer.from(JSON.stringify(payload), "utf8").toString("base64url");
+}
+function cursorValuesFromPayload(payload) {
+	return {
+		id: payload.id,
+		ask: BigInt(payload.ask),
+		bid: BigInt(payload.bid),
+		maturity: payload.maturity
+	};
+}
+function cursorComparisonValue(cursorValues, field) {
+	switch (field) {
+		case "id": return cursorValues.id;
+		case "maturity": return cursorValues.maturity;
+		case "ask": return cursorValues.ask.toString();
+		case "bid": return cursorValues.bid.toString();
+	}
+}
+function buildCursorFilter(columns, sortEntries, cursorValues) {
+	if (cursorValues === void 0) return void 0;
+	const comparisons = sortEntries.map((sortEntry, index) => {
+		const equals = sortEntries.slice(0, index).map((previous) => {
+			return sql`${columns[previous.field]} = ${cursorComparisonValue(cursorValues, previous.field)}`;
+		});
+		const comparison = sortEntry.direction === "asc" ? sql`${columns[sortEntry.field]} > ${cursorComparisonValue(cursorValues, sortEntry.field)}` : sql`${columns[sortEntry.field]} < ${cursorComparisonValue(cursorValues, sortEntry.field)}`;
+		return equals.length > 0 ? sql`(${sql.join([...equals, comparison], sql` AND `)})` : sql`(${comparison})`;
+	});
+	return comparisons.length > 0 ? sql`(${sql.join(comparisons, sql` OR `)})` : void 0;
+}
+function buildOrderBy(columns, sortEntries) {
+	return sortEntries.map((sortEntry) => sortEntry.direction === "asc" ? asc(columns[sortEntry.field]) : desc(columns[sortEntry.field]));
+}
+function toBigInt(value) {
+	if (typeof value === "bigint") return value;
+	if (typeof value === "number") return BigInt(value);
+	return BigInt(value.split(".")[0] ?? "0");
+}
+
 //#endregion
 //#region src/api/Controllers/getObligation.ts
+function toPayloadError$1(err) {
+	if (err instanceof BadRequestError) return new BadRequestError$1(err.message);
+	return err;
+}
 async function getObligation(params, db) {
 	const logger = getLogger();
 	const result = safeParse("get_obligation", params, (issue) => issue.message);
 	if (!result.success) return failure(result.error);
 	const query = result.data;
 	try {
-		const { obligations } = await db.offers.getObligations({ ids: [query.obligation_id] });
-		if (obligations.length === 0) return failure(new NotFoundError("Obligation not found"));
-		const obligation = obligations[0];
-		const [quote] = await db.offers.getQuotes({ obligationIds: [id(obligation)] });
+		const listing = await db.readers.obligations.list({
+			ids: [query.obligation_id],
+			limit: 1
+		});
+		if (listing.obligations.length === 0) return failure(new NotFoundError("Obligation not found"));
+		const obligation = listing.obligations[0];
 		return success({
-			data: from$4(obligation, quote ?? {
-				obligationId: id(obligation),
-				ask: { price: 0n },
-				bid: { price: 0n }
-			}),
+			data: from$4(obligation.obligation, obligation.quote),
 			cursor: null
 		});
 	} catch (err) {
+		const payloadError = toPayloadError$1(err);
 		logger.error({
-			err,
+			err: payloadError,
 			msg: "Error get obligation",
-			errorMessage: err instanceof Error ? err.message : String(err),
-			errorStack: err instanceof Error ? err.stack : void 0
+			errorMessage: payloadError instanceof Error ? payloadError.message : String(payloadError),
+			errorStack: payloadError instanceof Error ? payloadError.stack : void 0
 		});
-		return failure(err);
+		return failure(payloadError);
 	}
 }
 
 //#endregion
 //#region src/api/Controllers/getObligations.ts
+function toPayloadError(err) {
+	if (err instanceof BadRequestError) return new BadRequestError$1(err.message);
+	return err;
+}
 async function getObligations$1(queryParameters, db) {
 	const logger = getLogger();
 	const result = safeParse("get_obligations", queryParameters, (issue) => issue.message);
@@ -7506,31 +7981,28 @@ async function getObligations$1(queryParameters, db) {
 		const loanTokens = query.loan_tokens?.length ? query.loan_tokens : void 0;
 		const collateralTokens = query.collateral_tokens?.length ? query.collateral_tokens : void 0;
 		const maturities = query.maturities?.length ? query.maturities : void 0;
-		const { obligations, nextCursor } = await db.offers.getObligations({
-			cursor: query.cursor,
-			limit: query.limit,
+		const listing = await db.readers.obligations.list({
 			chainId: chainIds,
 			loanToken: loanTokens,
 			collateralToken: collateralTokens,
-			maturity: maturities
+			maturity: maturities,
+			sort: query.sort,
+			cursor: query.cursor,
+			limit: query.limit
 		});
-		const quotes = await db.offers.getQuotes({ obligationIds: obligations.map((o) => id(o)) });
 		return success({
-			data: obligations.map((o) => from$4(o, quotes.find((q) => q.obligationId === id(o)) ?? {
-				obligationId: id(o),
-				ask: { price: 0n },
-				bid: { price: 0n }
-			})),
-			cursor: nextCursor ?? null
+			data: listing.obligations.map((item) => from$4(item.obligation, item.quote)),
+			cursor: listing.nextCursor
 		});
 	} catch (err) {
+		const payloadError = toPayloadError(err);
 		logger.error({
-			err,
+			err: payloadError,
 			msg: "Error get obligations",
-			errorMessage: err instanceof Error ? err.message : String(err),
-			errorStack: err instanceof Error ? err.stack : void 0
+			errorMessage: payloadError instanceof Error ? payloadError.message : String(payloadError),
+			errorStack: payloadError instanceof Error ? payloadError.stack : void 0
 		});
-		return failure(err);
+		return failure(payloadError);
 	}
 }
 
@@ -7564,6 +8036,7 @@ function create$15(config) {
 				groupMaker: offer.maker.toLowerCase(),
 				callbackAddress: offer.callback.address.toLowerCase(),
 				callbackData: offer.callback.data,
+				receiverIfMakerIsSeller: offer.receiverIfMakerIsSeller.toLowerCase(),
 				blockNumber
 			})));
 			if (offersRows.length === 0) return [];
@@ -7615,7 +8088,7 @@ function create$15(config) {
 				assets: offers.assets,
 				obligationUnits: offers.obligationUnits,
 				obligationShares: offers.obligationShares,
-				price: offers.price,
+				tick: offers.tick,
 				maturity: offers.maturity,
 				expiry: offers.expiry,
 				start: offers.start,
@@ -7626,16 +8099,18 @@ function create$15(config) {
 				loanToken: obligations.loanToken,
 				callbackAddress: offers.callbackAddress,
 				callbackData: offers.callbackData,
+				receiverIfMakerIsSeller: offers.receiverIfMakerIsSeller,
 				collaterals: collateralsLateral.collaterals,
 				blockNumber: offers.blockNumber
 			}).from(offers).innerJoin(obligations, eq(offers.obligationId, obligations.obligationId)).innerJoinLateral(collateralsLateral, sql`true`).where(and(cursor !== null && cursor !== void 0 ? gt(offers.hash, cursor) : void 0, maker !== void 0 ? eq(offers.groupMaker, maker.toLowerCase()) : void 0)).orderBy(asc(offers.hash)).limit(limit)).map((row) => {
+				const receiverIfMakerIsSeller = (row.receiverIfMakerIsSeller ?? row.maker).toLowerCase();
 				return {
 					hash: row.hash,
 					maker: row.maker,
 					assets: BigInt(row.assets),
 					obligationUnits: BigInt(row.obligationUnits),
 					obligationShares: BigInt(row.obligationShares),
-					price: BigInt(row.price),
+					tick: row.tick,
 					maturity: from$16(row.maturity),
 					expiry: row.expiry,
 					start: row.start,
@@ -7653,6 +8128,7 @@ function create$15(config) {
 						address: row.callbackAddress,
 						data: row.callbackData
 					},
+					receiverIfMakerIsSeller,
 					consumed: 0n,
 					available: 0n,
 					takeable: 0n,
@@ -7677,64 +8153,30 @@ function create$15(config) {
 			}
 			throw new Error("Invalid parameters");
 		},
-		getObligations: async (parameters) => {
-			const { ids, chainId: chainIds, loanToken: loanTokens, collateralToken: collateralTokens, maturity: maturities, cursor, limit = DEFAULT_LIMIT$3 } = parameters ?? {};
-			const now$1 = now();
-			const loanTokenFilter = loanTokens !== void 0 && loanTokens.length > 0 ? sql`(${sql.join(loanTokens.map((token) => sql`LOWER(${obligations.loanToken}) = ${token.toLowerCase()}`), sql` OR `)})` : void 0;
-			const collateralFilter = collateralTokens !== void 0 && collateralTokens.length > 0 ? sql`EXISTS (
-              SELECT 1 FROM ${obligationCollateralsV2} oc
-              WHERE oc.obligation_id = ${obligations.obligationId}
-              AND (${sql.join(collateralTokens.map((token) => sql`LOWER(oc.asset) = ${token.toLowerCase()}`), sql` OR `)})
-            )` : void 0;
-			const result = await db.select({
-				obligationId: obligations.obligationId,
-				chainId: obligations.chainId,
-				loanToken: obligations.loanToken,
-				collaterals: sql`ARRAY_AGG(jsonb_build_object('asset', ${obligationCollateralsV2.asset}, 'oracle', ${oracles$1.address}, 'lltv', ${obligationCollateralsV2.lltv}))`.as("collaterals"),
-				maturity: obligations.maturity
-			}).from(obligations).innerJoin(obligationCollateralsV2, eq(obligations.obligationId, obligationCollateralsV2.obligationId)).innerJoin(oracles$1, sql`${obligationCollateralsV2.oracleChainId} = ${oracles$1.chainId}
-             AND ${obligationCollateralsV2.oracleAddress} = ${oracles$1.address}`).groupBy(obligations.obligationId).where(and(cursor !== null && cursor !== void 0 ? gt(obligations.obligationId, cursor) : sql`true`, ids !== void 0 && ids.length > 0 ? inArray(obligations.obligationId, ids) : void 0, chainIds !== void 0 && chainIds.length > 0 ? inArray(obligations.chainId, chainIds) : void 0, loanTokenFilter, maturities !== void 0 && maturities.length > 0 ? inArray(obligations.maturity, maturities) : gte(obligations.maturity, now$1), collateralFilter)).orderBy(asc(obligations.obligationId)).limit(limit);
-			const items = [];
-			for (const row of result) items.push(from$15({
-				chainId: row.chainId,
-				loanToken: row.loanToken,
-				collaterals: row.collaterals.sort((a, b) => a.asset.localeCompare(b.asset)).map((c) => from$17({
-					asset: c.asset,
-					oracle: c.oracle,
-					lltv: from$18(BigInt(c.lltv))
-				})),
-				maturity: row.maturity
-			}));
-			const returnedItems = Array.from(items.values());
-			return {
-				obligations: returnedItems,
-				nextCursor: returnedItems.length === limit && returnedItems.length > 0 ? result[result.length - 1].obligationId : null
-			};
-		},
 		getQuotes: async (parameters) => {
 			const { obligationIds } = parameters;
 			if (obligationIds.length === 0) return [];
 			const now$2 = now();
 			const query = ({ side }) => db.selectDistinctOn([offers.obligationId], {
 				obligationId: offers.obligationId,
-				price: offers.price
-			}).from(offers).innerJoin(groups, and(eq(offers.groupChainId, groups.chainId), eq(offers.groupMaker, groups.maker), eq(offers.group, groups.group))).leftJoin(validations, eq(offers.hash, validations.offerHash)).leftJoin(status, eq(validations.statusId, status.id)).where(and(inArray(offers.obligationId, obligationIds), eq(offers.buy, side === "buy"), gte(offers.expiry, now$2), gte(offers.maturity, now$2), lte(offers.start, now$2), sql`(${status.code} IS NULL OR ${status.code} = ${Status.VALID})`)).orderBy(offers.obligationId, side === "buy" ? sql`${offers.price}::numeric ASC` : sql`${offers.price}::numeric DESC`);
+				tick: offers.tick
+			}).from(offers).innerJoin(groups, and(eq(offers.groupChainId, groups.chainId), eq(offers.groupMaker, groups.maker), eq(offers.group, groups.group))).leftJoin(validations, eq(offers.hash, validations.offerHash)).leftJoin(status, eq(validations.statusId, status.id)).where(and(inArray(offers.obligationId, obligationIds), eq(offers.buy, side === "buy"), gte(offers.expiry, now$2), gte(offers.maturity, now$2), lte(offers.start, now$2), sql`(${status.code} IS NULL OR ${status.code} = ${Status.VALID})`)).orderBy(offers.obligationId, side === "buy" ? sql`${offers.tick} ASC` : sql`${offers.tick} DESC`);
 			const [bestBuys, bestSells] = await Promise.all([query({ side: "buy" }), query({ side: "sell" })]);
 			const quotes = /* @__PURE__ */ new Map();
 			for (const row of bestSells) quotes.set(row.obligationId, {
-				ask: { price: BigInt(row.price) },
-				bid: { price: 0n }
+				ask: { tick: row.tick },
+				bid: { tick: null }
 			});
 			for (const row of bestBuys) {
 				const quote = quotes.get(row.obligationId);
 				if (!quote) {
 					quotes.set(row.obligationId, {
-						ask: { price: 0n },
-						bid: { price: BigInt(row.price) }
+						ask: { tick: null },
+						bid: { tick: row.tick }
 					});
 					continue;
 				}
-				quote.bid = { price: BigInt(row.price) };
+				quote.bid = { tick: row.tick };
 			}
 			return Array.from(quotes.entries()).map(([id, quote]) => {
 				return from$11({
@@ -7834,7 +8276,7 @@ async function getOffersQuery(db, parameters) {
 		obligationUnits: offers.obligationUnits,
 		obligationShares: offers.obligationShares,
 		consumed: groups.consumed,
-		price: offers.price,
+		tick: offers.tick,
 		maturity: offers.maturity,
 		expiry: offers.expiry,
 		start: offers.start,
@@ -7845,6 +8287,7 @@ async function getOffersQuery(db, parameters) {
 		loanToken: obligations.loanToken,
 		callbackAddress: offers.callbackAddress,
 		callbackData: offers.callbackData,
+		receiverIfMakerIsSeller: offers.receiverIfMakerIsSeller,
 		collaterals: collateralsLateral.collaterals,
 		blockNumber: offers.blockNumber,
 		available: sql`${availableExpr}::numeric`.as("available"),
@@ -7866,13 +8309,14 @@ async function getOffersQuery(db, parameters) {
                     )
                   END
                 ) > 0` : void 0)).orderBy(asc(offers.hash)).limit(limit)).map((row) => {
+		const receiverIfMakerIsSeller = (row.receiverIfMakerIsSeller ?? row.maker).toLowerCase();
 		return {
 			hash: row.hash,
 			maker: row.maker,
 			assets: BigInt(row.assets),
 			obligationUnits: BigInt(row.obligationUnits),
 			obligationShares: BigInt(row.obligationShares),
-			price: BigInt(row.price),
+			tick: row.tick,
 			maturity: from$16(row.maturity),
 			expiry: row.expiry,
 			start: row.start,
@@ -7890,6 +8334,7 @@ async function getOffersQuery(db, parameters) {
 				address: row.callbackAddress,
 				data: row.callbackData
 			},
+			receiverIfMakerIsSeller,
 			consumed: BigInt(row.consumed),
 			available: BigInt(String(row.available ?? "0").split(".")[0] ?? "0"),
 			takeable: BigInt(String(row.takeable ?? "0").split(".")[0] ?? "0"),
@@ -7980,7 +8425,7 @@ async function getUserPositions(queryParameters, db) {
 async function validateOffers(body, gatekeeper) {
 	const logger = getLogger();
 	const result = safeParse("validate_offers", body, (issue) => issue.message);
-	if (!result.success) return failure(new BadRequestError(result.error.issues[0]?.message ?? "Invalid request body"));
+	if (!result.success) return failure(new BadRequestError$1(result.error.issues[0]?.message ?? "Invalid request body"));
 	const { offers: rawOffers } = result.data;
 	const parsedOffers = [];
 	const offerIndexByHash = /* @__PURE__ */ new Map();
@@ -7996,7 +8441,7 @@ async function validateOffers(body, gatekeeper) {
 		} catch (err) {
 			let message = err instanceof Error ? err.message : String(err);
 			if (err instanceof InvalidOfferError) message = err.formattedMessage;
-			return failure(new BadRequestError(`Offer at index ${i} failed to parse: ${message}`));
+			return failure(new BadRequestError$1(`Offer at index ${i} failed to parse: ${message}`));
 		}
 	}
 	try {
@@ -8271,7 +8716,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$16(offerData.obligation.maturity),
 				expiry: offerData.expiry,
 				start: offerData.start,
@@ -8288,7 +8733,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),
@@ -8305,13 +8751,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) {
@@ -8335,10 +8783,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$11({
+				obligationId: item.id,
+				ask: { tick: item.ask.tick },
+				bid: { tick: item.bid.tick }
 			})
 		};
 		return returned;
@@ -8630,6 +9078,7 @@ function create$12(config) {
 	return {
 		get: async (parameters) => {
 			const { side, obligationId, cursor: cursorString, limit = DEFAULT_LIMIT$2 } = parameters;
+			const tickSortDirection = side === "sell" ? "asc" : "desc";
 			const inputCursor = LevelCursor.decode(cursorString, logger);
 			if (cursorString != null && inputCursor === null) return {
 				levels: [],
@@ -8644,23 +9093,23 @@ function create$12(config) {
 				cursor: inputCursor?.offersCursor ?? void 0,
 				limit: fetchLimit
 			});
-			const priceMap = /* @__PURE__ */ new Map();
+			const tickMap = /* @__PURE__ */ new Map();
 			for (const row of rows) {
-				const priceKey = row.price.toString();
-				const existing = priceMap.get(priceKey);
+				const existing = tickMap.get(row.tick);
 				if (existing) {
 					existing.assets += row.takeable;
 					existing.count += 1;
-				} else priceMap.set(priceKey, {
+				} else tickMap.set(row.tick, {
 					assets: row.takeable,
 					count: 1
 				});
 			}
-			const levels = Array.from(priceMap.entries()).map(([price, data]) => ({
-				price: BigInt(price),
-				assets: data.assets,
-				count: data.count
+			const levels = Array.from(tickMap.entries()).map(([tick, level]) => ({
+				tick,
+				assets: level.assets,
+				count: level.count
 			}));
+			levels.sort((a, b) => tickSortDirection === "asc" ? a.tick - b.tick : b.tick - a.tick);
 			const paginatedLevels = levels.slice(0, limit);
 			const hasMore = levels.length > limit || offersNextCursor !== null;
 			const lastLevel = paginatedLevels[paginatedLevels.length - 1];
@@ -8706,14 +9155,14 @@ async function _getOffers(db, params) {
         AND (s.code IS NULL OR s.code = ${Status.VALID})
       ORDER BY
         o.group_chain_id, o.group_maker, o."group_group",
-        o.price::numeric ${priceSortDirection === "asc" ? sql`ASC` : sql`DESC`}, o.block_number ASC, o.assets DESC, o.hash ASC
+        o.tick ${priceSortDirection === "asc" ? sql`ASC` : sql`DESC`}, o.block_number ASC, o.assets DESC, o.hash ASC
     ),
     enriched AS (
       SELECT
         w.*,
         g.consumed, g.chain_id, obl.loan_token,
         CASE WHEN ${priceSortDirection === "asc" ? sql`TRUE` : sql`FALSE`}
-          THEN w.price::numeric ELSE -w.price::numeric END AS price_norm,
+          THEN w.tick ELSE -w.tick END AS tick_norm,
         w.block_number AS block_norm,
         -w.assets AS assets_norm,
         w.hash AS hash_norm
@@ -8730,33 +9179,35 @@ async function _getOffers(db, params) {
       FROM enriched e
       ${cursor != null ? sql`
         WHERE
-        (e.price_norm, e.block_norm, e.assets_norm, e.hash_norm)
+        (e.tick_norm, e.block_norm, e.assets_norm, e.hash_norm)
           > (
               CASE WHEN ${priceSortDirection === "asc" ? sql`TRUE` : sql`FALSE`}
-                THEN ${cursor.price}::numeric ELSE -${cursor.price}::numeric END,
+                THEN ${cursor.tick}::integer ELSE -${cursor.tick}::integer END,
               ${cursor.blockNumber},
               -${cursor.assets}::numeric,
               ${cursor.hash}
             )` : sql``}
-      ORDER BY e.price::numeric ${priceSortDirection === "asc" ? sql`ASC` : sql`DESC`}, e.block_number ASC, e.assets DESC, e.hash ASC
+      ORDER BY e.tick ${priceSortDirection === "asc" ? sql`ASC` : sql`DESC`}, e.block_number ASC, e.assets DESC, e.hash ASC
       LIMIT ${limit}
     ),
-    -- Compute sum of offsets per position
+    -- Compute sum of offsets per position and obligation
     position_offsets AS (
       SELECT
         chain_id,
         "user",
         contract,
+        obligation_id,
         SUM(value::numeric) AS total_offset
       FROM ${offsets}
-      GROUP BY chain_id, "user", contract
+      GROUP BY chain_id, "user", contract, obligation_id
     ),
-    -- Compute position_consumed: sum of consumed from all groups with lots on each position (converted to lot terms)
+    -- Compute position_consumed: sum of consumed from all groups with lots on each position+obligation (converted to lot terms)
     position_consumed AS (
       SELECT
         l.chain_id,
         l.contract,
         l."user",
+        l.obligation_id,
         SUM(
           CASE
             WHEN wo.assets::numeric > 0
@@ -8773,7 +9224,7 @@ async function _getOffers(db, params) {
         ON wo.group_chain_id = g.chain_id
         AND LOWER(wo.group_maker) = LOWER(g.maker)
         AND wo.group_group = g."group"
-      GROUP BY l.chain_id, l.contract, l."user"
+      GROUP BY l.chain_id, l.contract, l."user", l.obligation_id
     ),
     -- Compute callback contributions with lot balance
     callback_contributions AS (
@@ -8781,7 +9232,7 @@ async function _getOffers(db, params) {
         p.hash,
         p.obligation_id,
         p.assets,
-        p.price,
+        p.tick,
         p.obligation_units,
         p.obligation_shares,
         p.maturity,
@@ -8791,6 +9242,7 @@ async function _getOffers(db, params) {
         p.buy,
         p.callback_address,
         p.callback_data,
+        p.receiver_if_maker_is_seller,
         p.block_number,
         p.group_chain_id,
         p.group_maker,
@@ -8826,6 +9278,7 @@ async function _getOffers(db, params) {
         AND LOWER(l.contract) = LOWER(c.position_contract)
         AND LOWER(l."user") = LOWER(c.position_user)
         AND l."group" = p.group_group
+        AND l.obligation_id = p.obligation_id
       LEFT JOIN ${positions} pos
         ON pos.chain_id = c.position_chain_id
         AND LOWER(pos.contract) = LOWER(c.position_contract)
@@ -8834,10 +9287,12 @@ async function _getOffers(db, params) {
         ON pos_offsets.chain_id = c.position_chain_id
         AND LOWER(pos_offsets.contract) = LOWER(c.position_contract)
         AND LOWER(pos_offsets."user") = LOWER(c.position_user)
+        AND pos_offsets.obligation_id = p.obligation_id
       LEFT JOIN position_consumed pc
         ON pc.chain_id = c.position_chain_id
         AND LOWER(pc.contract) = LOWER(c.position_contract)
         AND LOWER(pc."user") = LOWER(c.position_user)
+        AND pc.obligation_id = p.obligation_id
     ),
     -- Compute contribution per callback in loan terms (loan token only — collateral positions are not indexed)
     callback_loan_contribution AS (
@@ -8855,7 +9310,7 @@ async function _getOffers(db, params) {
         hash,
         obligation_id,
         assets,
-        price,
+        tick,
         obligation_units,
         obligation_shares,
         maturity,
@@ -8865,6 +9320,7 @@ async function _getOffers(db, params) {
         buy,
         callback_address,
         callback_data,
+        receiver_if_maker_is_seller,
         block_number,
         group_chain_id,
         group_maker,
@@ -8881,16 +9337,17 @@ async function _getOffers(db, params) {
         WHERE clc.callback_id IS NOT NULL
         ORDER BY clc.hash, clc.position_chain_id, clc.position_contract, clc.position_user, clc.contribution_in_loan DESC
       ) deduped
-      GROUP BY hash, obligation_id, assets, price, obligation_units, obligation_shares, maturity, expiry, start, group_group, buy,
-               callback_address, callback_data, block_number, group_chain_id, group_maker,
-               consumed, chain_id, loan_token, session
+      GROUP BY hash, obligation_id, assets, tick, obligation_units, obligation_shares, maturity, expiry, start, group_group, buy,
+        callback_address, callback_data, block_number, group_chain_id, group_maker,
+               consumed, chain_id, loan_token, session, receiver_if_maker_is_seller
       UNION ALL
       -- Sell offers without callbacks: collateral positions not indexed, takeable = assets - consumed
       SELECT
-        p.hash, p.obligation_id, p.assets, p.price,
+        p.hash, p.obligation_id, p.assets, p.tick,
         p.obligation_units, p.obligation_shares,
         p.maturity, p.expiry, p.start, p.group_group,
         p.buy, p.callback_address, p.callback_data,
+        p.receiver_if_maker_is_seller,
         p.block_number, p.group_chain_id, p.group_maker,
         p.consumed, p.chain_id, p.loan_token, p.session,
         0 AS total_available
@@ -8909,7 +9366,7 @@ async function _getOffers(db, params) {
       oc.obligation_units,
       oc.obligation_shares,
       oc.consumed,
-      oc.price,
+      oc.tick,
       oc.maturity,
       oc.expiry,
       oc.start,
@@ -8919,6 +9376,7 @@ async function _getOffers(db, params) {
       oc.loan_token,
       oc.callback_address,
       oc.callback_data,
+      oc.receiver_if_maker_is_seller,
       oc.block_number,
       oc.session,
       COALESCE(oc.total_available, 0) AS available,
@@ -8941,20 +9399,21 @@ async function _getOffers(db, params) {
       ))
     END > 0
     ORDER BY
-      oc.price::numeric ${priceSortDirection === "asc" ? sql`ASC` : sql`DESC`},
+      oc.tick ${priceSortDirection === "asc" ? sql`ASC` : sql`DESC`},
       oc.block_number ASC,
       oc.assets DESC,
       oc.hash ASC;
   `);
 	return {
 		rows: raw.rows.map((row) => {
+			const receiverIfMakerIsSeller = (row.receiver_if_maker_is_seller ?? row.group_maker).toLowerCase();
 			return {
 				hash: row.hash,
 				maker: row.group_maker,
 				assets: BigInt(row.assets),
 				obligationUnits: BigInt(row.obligation_units ?? 0),
 				obligationShares: BigInt(row.obligation_shares ?? 0),
-				price: BigInt(row.price),
+				tick: row.tick,
 				maturity: row.maturity,
 				expiry: row.expiry,
 				start: row.start,
@@ -8972,6 +9431,7 @@ async function _getOffers(db, params) {
 					address: row.callback_address,
 					data: row.callback_data
 				},
+				receiverIfMakerIsSeller,
 				blockNumber: row.block_number,
 				consumed: BigInt(row.consumed ?? 0),
 				available: BigInt(String(row.available ?? "0").split(".")[0] ?? "0"),
@@ -8986,7 +9446,7 @@ let Cursor;
 	function encode(row, totalReturned, now, side) {
 		return Buffer.from(JSON.stringify({
 			side,
-			price: row.price.toString(),
+			tick: row.tick,
 			blockNumber: row.blockNumber,
 			assets: row.assets.toString(),
 			hash: row.hash,
@@ -8997,10 +9457,9 @@ let Cursor;
 	_Cursor.encode = encode;
 	function decode(cursorString, logger) {
 		if (cursorString == null) return null;
-		const isNumericString = (value) => typeof value === "string" && /^-?\d+$/.test(value);
 		try {
 			const v = JSON.parse(Buffer.from(cursorString, "base64url").toString("utf8"));
-			if ((v?.side === "buy" || v?.side === "sell") && isNumericString(v?.price) && typeof v?.blockNumber === "number" && Number.isInteger(v.blockNumber) && isNumericString(v?.assets) && isHex(v?.hash) && typeof v?.totalReturned === "number" && Number.isInteger(v.totalReturned) && typeof v?.now === "number" && Number.isInteger(v.now)) return v;
+			if ((v?.side === "buy" || v?.side === "sell") && typeof v?.tick === "number" && Number.isInteger(v.tick) && typeof v?.blockNumber === "number" && Number.isInteger(v.blockNumber) && typeof v?.assets === "string" && /^-?\d+$/.test(v.assets) && isHex(v?.hash) && typeof v?.totalReturned === "number" && Number.isInteger(v.totalReturned) && typeof v?.now === "number" && Number.isInteger(v.now)) return v;
 			throw new Error("Invalid cursor");
 		} catch {
 			logger.error({
@@ -9018,7 +9477,7 @@ let LevelCursor;
 	function encode(lastLevel, offersCursor, side, now) {
 		return Buffer.from(JSON.stringify({
 			side,
-			lastPrice: lastLevel.price.toString(),
+			lastTick: lastLevel.tick,
 			now,
 			offersCursor
 		})).toString("base64url");
@@ -9026,10 +9485,9 @@ let LevelCursor;
 	_LevelCursor.encode = encode;
 	function decode(cursorString, logger) {
 		if (cursorString == null) return null;
-		const isNumericString = (value) => typeof value === "string" && /^-?\d+$/.test(value);
 		try {
 			const v = JSON.parse(Buffer.from(cursorString, "base64url").toString("utf8"));
-			if ((v?.side === "buy" || v?.side === "sell") && isNumericString(v?.lastPrice) && typeof v?.now === "number" && Number.isInteger(v.now) && (v?.offersCursor === null || typeof v?.offersCursor === "string")) return v;
+			if ((v?.side === "buy" || v?.side === "sell") && typeof v?.lastTick === "number" && Number.isInteger(v.lastTick) && typeof v?.now === "number" && Number.isInteger(v.now) && (v?.offersCursor === null || typeof v?.offersCursor === "string")) return v;
 			throw new Error("Invalid book cursor");
 		} catch {
 			logger.error({
@@ -9172,31 +9630,33 @@ function create$9(db) {
 function create$8(db) {
 	return {
 		get: async (parameters) => {
-			const { chainId, user, contract, group } = parameters ?? {};
+			const { chainId, user, contract, group, obligationId } = parameters ?? {};
 			const conditions = [];
 			if (chainId !== void 0) conditions.push(eq(lots.chainId, chainId));
 			if (user !== void 0) conditions.push(eq(lots.user, user.toLowerCase()));
 			if (contract !== void 0) conditions.push(eq(lots.contract, contract.toLowerCase()));
 			if (group !== void 0) conditions.push(eq(lots.group, group));
+			if (obligationId !== void 0) conditions.push(eq(lots.obligationId, obligationId));
 			return (await db.select().from(lots).where(conditions.length > 0 ? and(...conditions) : void 0)).map((row) => ({
 				chainId: row.chainId,
 				user: row.user,
 				contract: row.contract,
 				group: row.group,
+				obligationId: row.obligationId,
 				lower: BigInt(row.lower),
 				upper: BigInt(row.upper)
 			}));
 		},
 		create: async (parameters) => {
 			if (parameters.length === 0) return;
-			const lotsByPositionGroup = /* @__PURE__ */ new Map();
+			const lotsByKey = /* @__PURE__ */ new Map();
 			for (const offer of parameters) {
-				const key = `${offer.positionChainId}-${offer.positionContract}-${offer.positionUser}-${offer.group}`.toLowerCase();
-				const existing = lotsByPositionGroup.get(key);
-				if (!existing || offer.size > existing.size) lotsByPositionGroup.set(key, offer);
+				const key = `${offer.positionChainId}-${offer.positionContract}-${offer.positionUser}-${offer.group}-${offer.obligationId}`.toLowerCase();
+				const existing = lotsByKey.get(key);
+				if (!existing || offer.size > existing.size) lotsByKey.set(key, offer);
 			}
-			for (const offer of lotsByPositionGroup.values()) if ((await db.select().from(lots).where(and(eq(lots.chainId, offer.positionChainId), eq(lots.contract, offer.positionContract.toLowerCase()), eq(lots.user, offer.positionUser.toLowerCase()), eq(lots.group, offer.group.toLowerCase()))).limit(1)).length === 0) {
-				const maxUpperResult = await db.select({ maxUpper: sql`COALESCE(MAX(${lots.upper}::numeric), 0)` }).from(lots).where(and(eq(lots.chainId, offer.positionChainId), eq(lots.contract, offer.positionContract.toLowerCase()), eq(lots.user, offer.positionUser.toLowerCase())));
+			for (const offer of lotsByKey.values()) if ((await db.select().from(lots).where(and(eq(lots.chainId, offer.positionChainId), eq(lots.contract, offer.positionContract.toLowerCase()), eq(lots.user, offer.positionUser.toLowerCase()), eq(lots.group, offer.group.toLowerCase()), eq(lots.obligationId, offer.obligationId.toLowerCase()))).limit(1)).length === 0) {
+				const maxUpperResult = await db.select({ maxUpper: sql`COALESCE(MAX(${lots.upper}::numeric), 0)` }).from(lots).where(and(eq(lots.chainId, offer.positionChainId), eq(lots.contract, offer.positionContract.toLowerCase()), eq(lots.user, offer.positionUser.toLowerCase()), eq(lots.obligationId, offer.obligationId.toLowerCase())));
 				const newLower = BigInt(maxUpperResult[0]?.maxUpper ?? "0");
 				const newUpper = newLower + offer.size;
 				await db.insert(lots).values({
@@ -9204,6 +9664,7 @@ function create$8(db) {
 					user: offer.positionUser.toLowerCase(),
 					contract: offer.positionContract.toLowerCase(),
 					group: offer.group.toLowerCase(),
+					obligationId: offer.obligationId.toLowerCase(),
 					lower: newLower.toString(),
 					upper: newUpper.toString()
 				});
@@ -9220,55 +9681,79 @@ function create$8(db) {
 * @returns Obligations domain. {@link ObligationsDomain}
 */
 function create$7(db) {
-	return { create: async (obligations$1) => {
-		if (obligations$1.length === 0) return;
-		const obligationsById = /* @__PURE__ */ new Map();
-		for (const obligation of obligations$1) {
-			const id$1 = id(obligation).toLowerCase();
-			if (!obligationsById.get(id$1)) obligationsById.set(id$1, obligation);
-		}
-		try {
-			await db.transaction(async (dbTx) => {
-				const obligationRows = obligations$1.map((obligation) => ({
-					obligationId: id(obligation),
-					chainId: obligation.chainId,
-					loanToken: obligation.loanToken.toLowerCase(),
-					maturity: obligation.maturity
-				}));
-				for (const batch of batch$1(obligationRows, DEFAULT_BATCH_SIZE$1)) await dbTx.insert(obligations).values(batch).onConflictDoNothing();
-				const collateralRows = obligations$1.flatMap((obligation) => {
-					return obligation.collaterals.map((collateral) => ({
+	return {
+		get: async (parameters) => {
+			const chainIds = parameters?.chainId;
+			const now$1 = now();
+			return (await db.select({
+				chainId: obligations.chainId,
+				loanToken: obligations.loanToken,
+				collaterals: sql`ARRAY_AGG(jsonb_build_object('asset', ${obligationCollateralsV2.asset}, 'oracle', ${oracles$1.address}, 'lltv', ${obligationCollateralsV2.lltv}))`.as("collaterals"),
+				maturity: obligations.maturity
+			}).from(obligations).innerJoin(obligationCollateralsV2, eq(obligations.obligationId, obligationCollateralsV2.obligationId)).innerJoin(oracles$1, sql`${obligationCollateralsV2.oracleChainId} = ${oracles$1.chainId}
+             AND ${obligationCollateralsV2.oracleAddress} = ${oracles$1.address}`).groupBy(obligations.obligationId).where(and(chainIds !== void 0 && chainIds.length > 0 ? inArray(obligations.chainId, chainIds) : void 0, gte(obligations.maturity, now$1))).orderBy(asc(obligations.obligationId))).map((row) => from$15({
+				chainId: row.chainId,
+				loanToken: row.loanToken,
+				collaterals: row.collaterals.sort((left, right) => left.asset.localeCompare(right.asset)).map((collateral) => from$17({
+					asset: collateral.asset,
+					oracle: collateral.oracle,
+					lltv: from$18(BigInt(collateral.lltv))
+				})),
+				maturity: row.maturity
+			}));
+		},
+		create: async (obligations$1) => {
+			if (obligations$1.length === 0) return;
+			const obligationsById = /* @__PURE__ */ new Map();
+			for (const obligation of obligations$1) {
+				const id$1 = id(obligation).toLowerCase();
+				if (!obligationsById.get(id$1)) obligationsById.set(id$1, obligation);
+			}
+			try {
+				await db.transaction(async (dbTx) => {
+					const obligationRows = obligations$1.map((obligation) => ({
 						obligationId: id(obligation),
-						asset: collateral.asset.toLowerCase(),
-						oracleChainId: obligation.chainId,
-						oracleAddress: collateral.oracle.toLowerCase(),
-						lltv: collateral.lltv
+						chainId: obligation.chainId,
+						loanToken: obligation.loanToken.toLowerCase(),
+						maturity: obligation.maturity
 					}));
+					for (const batch of batch$1(obligationRows, DEFAULT_BATCH_SIZE$1)) await dbTx.insert(obligations).values(batch).onConflictDoNothing();
+					const collateralRows = obligations$1.flatMap((obligation) => {
+						return obligation.collaterals.map((collateral) => ({
+							obligationId: id(obligation),
+							asset: collateral.asset.toLowerCase(),
+							oracleChainId: obligation.chainId,
+							oracleAddress: collateral.oracle.toLowerCase(),
+							lltv: collateral.lltv
+						}));
+					});
+					for (const batch of batch$1(collateralRows, DEFAULT_BATCH_SIZE$1)) await dbTx.insert(obligationCollateralsV2).values(batch).onConflictDoNothing();
 				});
-				for (const batch of batch$1(collateralRows, DEFAULT_BATCH_SIZE$1)) await dbTx.insert(obligationCollateralsV2).values(batch).onConflictDoNothing();
-			});
-		} catch (err) {
-			const error = err instanceof Error ? err : new Error(String(err));
-			throw new Error("Obligations.create failed. Ensure oracles exist before inserting obligations.", { cause: error });
+			} catch (err) {
+				const error = err instanceof Error ? err : new Error(String(err));
+				throw new Error("Obligations.create failed. Ensure oracles exist before inserting obligations.", { cause: error });
+			}
 		}
-	} };
+	};
 }
 
 //#endregion
 //#region src/database/domains/Offsets.ts
 function create$6(db) {
 	return { get: async (parameters) => {
-		const { chainId, user, contract, group } = parameters ?? {};
+		const { chainId, user, contract, group, obligationId } = parameters ?? {};
 		const conditions = [];
 		if (chainId !== void 0) conditions.push(eq(offsets.chainId, chainId));
 		if (user !== void 0) conditions.push(eq(offsets.user, user.toLowerCase()));
 		if (contract !== void 0) conditions.push(eq(offsets.contract, contract.toLowerCase()));
 		if (group !== void 0) conditions.push(eq(offsets.group, group));
+		if (obligationId !== void 0) conditions.push(eq(offsets.obligationId, obligationId));
 		return (await db.select().from(offsets).where(conditions.length > 0 ? and(...conditions) : void 0)).map((row) => ({
 			chainId: row.chainId,
 			user: row.user,
 			contract: row.contract,
 			group: row.group,
+			obligationId: row.obligationId,
 			value: BigInt(row.value)
 		}));
 	} };
@@ -9418,7 +9903,8 @@ const create$4 = (db) => {
 				if (!parsed.chainId || !parsed.contract) throw new Error("Invalid cursor format");
 				cursor = {
 					chainId: parsed.chainId,
-					contract: parsed.contract
+					contract: parsed.contract,
+					obligationId: parsed.obligationId ?? null
 				};
 			}
 			const raw = await db.execute(sql`
@@ -9427,16 +9913,18 @@ const create$4 = (db) => {
             chain_id,
             "user",
             contract,
+            obligation_id,
             SUM(value::numeric) AS total_offset
           FROM ${offsets}
           WHERE LOWER("user") = LOWER(${user})
-          GROUP BY chain_id, "user", contract
+          GROUP BY chain_id, "user", contract, obligation_id
         ),
         position_consumed AS (
           SELECT
             l.chain_id,
             l.contract,
             l."user",
+            l.obligation_id,
             SUM(
               CASE
                 WHEN offer_agg.assets > 0
@@ -9462,50 +9950,64 @@ const create$4 = (db) => {
             AND LOWER(offer_agg.group_maker) = LOWER(g.maker)
             AND offer_agg."group_group" = g."group"
           WHERE LOWER(l."user") = LOWER(${user})
-          GROUP BY l.chain_id, l.contract, l."user"
+          GROUP BY l.chain_id, l.contract, l."user", l.obligation_id
         ),
         position_max_lot AS (
           SELECT
             chain_id,
             contract,
             "user",
+            obligation_id,
             MAX(upper::numeric) AS max_upper
           FROM ${lots}
           WHERE LOWER("user") = LOWER(${user})
-          GROUP BY chain_id, contract, "user"
+          GROUP BY chain_id, contract, "user", obligation_id
+        ),
+        per_obligation AS (
+          SELECT
+            pml.chain_id,
+            pml.contract,
+            pml."user",
+            pml.obligation_id,
+            GREATEST(0,
+              COALESCE(pml.max_upper, 0)
+              - COALESCE(po.total_offset, 0)
+              - COALESCE(pc.consumed, 0)
+            )::text AS reserved_balance
+          FROM position_max_lot pml
+          LEFT JOIN position_offsets po
+            ON po.chain_id = pml.chain_id
+            AND LOWER(po.contract) = LOWER(pml.contract)
+            AND LOWER(po."user") = LOWER(pml."user")
+            AND po.obligation_id = pml.obligation_id
+          LEFT JOIN position_consumed pc
+            ON pc.chain_id = pml.chain_id
+            AND LOWER(pc.contract) = LOWER(pml.contract)
+            AND LOWER(pc."user") = LOWER(pml."user")
+            AND pc.obligation_id = pml.obligation_id
         )
         SELECT
           p.chain_id,
           p.contract,
           p."user",
           p.block_number,
-          GREATEST(0,
-            COALESCE(pml.max_upper, 0)
-            - COALESCE(po.total_offset, 0)
-            - COALESCE(pc.consumed, 0)
-          )::text AS reserved_balance
+          po.obligation_id,
+          COALESCE(po.reserved_balance, '0') AS reserved_balance
         FROM ${positions} p
-        LEFT JOIN position_offsets po
+        LEFT JOIN per_obligation po
           ON po.chain_id = p.chain_id
           AND LOWER(po.contract) = LOWER(p.contract)
           AND LOWER(po."user") = LOWER(p."user")
-        LEFT JOIN position_consumed pc
-          ON pc.chain_id = p.chain_id
-          AND LOWER(pc.contract) = LOWER(p.contract)
-          AND LOWER(pc."user") = LOWER(p."user")
-        LEFT JOIN position_max_lot pml
-          ON pml.chain_id = p.chain_id
-          AND LOWER(pml.contract) = LOWER(p.contract)
-          AND LOWER(pml."user") = LOWER(p."user")
         WHERE LOWER(p."user") = LOWER(${user})
           AND p."user" != ${zeroAddress}
-          ${cursor !== null ? sql`AND (p.chain_id, p.contract) > (${cursor.chainId}, ${cursor.contract})` : sql``}
-        ORDER BY p.chain_id ASC, p.contract ASC
+          ${cursor !== null ? sql`AND (p.chain_id, p.contract, COALESCE(po.obligation_id, '')) > (${cursor.chainId}, ${cursor.contract}, ${cursor.obligationId ?? ""})` : sql``}
+        ORDER BY p.chain_id ASC, p.contract ASC, po.obligation_id ASC NULLS FIRST
         LIMIT ${limit}
       `);
 			const nextCursor = raw.rows.length === limit ? Buffer.from(JSON.stringify({
 				chainId: raw.rows[raw.rows.length - 1].chain_id.toString(),
-				contract: raw.rows[raw.rows.length - 1].contract
+				contract: raw.rows[raw.rows.length - 1].contract,
+				obligationId: raw.rows[raw.rows.length - 1].obligation_id
 			})).toString("base64url") : null;
 			return {
 				positions: raw.rows.map((row) => ({
@@ -9513,6 +10015,7 @@ const create$4 = (db) => {
 					contract: row.contract,
 					user: row.user,
 					blockNumber: row.block_number,
+					obligationId: row.obligation_id,
 					reserved: BigInt(row.reserved_balance.split(".")[0] ?? "0")
 				})),
 				nextCursor
@@ -9791,7 +10294,10 @@ function create$1(db) {
 
 //#endregion
 //#region src/database/Database.ts
-var Database_exports = /* @__PURE__ */ __exportAll({ connect: () => connect$1 });
+var Database_exports = /* @__PURE__ */ __exportAll({
+	connect: () => connect$1,
+	getSchemaNamesForMigration: () => getSchemaNamesForMigration
+});
 function createDomains(core, chainRegistry) {
 	return {
 		book: create$12({ db: core }),
@@ -9813,6 +10319,9 @@ function createDomains(core, chainRegistry) {
 		transfers: create$3(core)
 	};
 }
+function createReaders(core) {
+	return { obligations: create$16({ db: core }) };
+}
 const AUGMENT_CACHE = /* @__PURE__ */ new WeakMap();
 function augmentWithDomains(base, chainRegistry) {
 	const cached = AUGMENT_CACHE.get(base)?.get(chainRegistry);
@@ -9824,6 +10333,7 @@ function augmentWithDomains(base, chainRegistry) {
 		});
 	};
 	const dms = createDomains(wrapped, chainRegistry);
+	const readers = createReaders(wrapped);
 	Object.defineProperties(wrapped, {
 		book: {
 			value: dms.book,
@@ -9880,6 +10390,10 @@ function augmentWithDomains(base, chainRegistry) {
 		transfers: {
 			value: dms.transfers,
 			enumerable: true
+		},
+		readers: {
+			value: readers,
+			enumerable: true
 		}
 	});
 	const chainRegistryMap = AUGMENT_CACHE.get(base);
@@ -9888,6 +10402,7 @@ function augmentWithDomains(base, chainRegistry) {
 	return wrapped;
 }
 const InMemoryDbMap = /* @__PURE__ */ new Map();
+const LEGACY_SCHEMA_START_MINOR = 7;
 /**
 * Connect to the database.
 * @notice If no connection string is provided, an in-process PGLite database is created.
@@ -9942,9 +10457,26 @@ function applyMigrations(kind, driver) {
 async function preMigrate(driver) {
 	const tracer = getTracer("db.preMigrate");
 	await startActiveSpan(tracer, "db.preMigrate", async () => {
-		await driver.execute(`create schema if not exists "${VERSION}"`);
+		const schemaNames = getSchemaNamesForMigration(VERSION);
+		for (const schemaName of schemaNames) await driver.execute(`create schema if not exists "${schemaName}"`);
 	});
 }
+/**
+* Build the list of router schemas that should exist before running migrations.
+* @param version - Current schema version (e.g. `router_v1.8`).
+* @returns Ordered schema names from `router_v1.7` to current, or just current if parsing fails.
+*/
+function getSchemaNamesForMigration(version) {
+	const parsed = /^router_v(?<major>\d+)\.(?<minor>\d+)$/.exec(version);
+	if (!parsed?.groups?.major || !parsed.groups.minor) return [version];
+	const major = Number.parseInt(parsed.groups.major, 10);
+	const currentMinor = Number.parseInt(parsed.groups.minor, 10);
+	if (!Number.isInteger(major) || !Number.isInteger(currentMinor)) return [version];
+	if (currentMinor < LEGACY_SCHEMA_START_MINOR) return [version];
+	const schemaNames = [];
+	for (let minor = LEGACY_SCHEMA_START_MINOR; minor <= currentMinor; minor += 1) schemaNames.push(`router_v${major}.${minor}`);
+	return schemaNames;
+}
 async function postMigrate(driver) {
 	const tracer = getTracer("db.postMigrate");
 	await startActiveSpan(tracer, "db.postMigrate", async () => {
@@ -10214,15 +10746,16 @@ async function postMigrate(driver) {
     RETURNS trigger
     LANGUAGE plpgsql AS $$
     BEGIN
-      INSERT INTO "${VERSION}"."offsets" (chain_id, "user", contract, "group", value)
+      INSERT INTO "${VERSION}"."offsets" (chain_id, "user", contract, "group", obligation_id, value)
       VALUES (
         OLD.chain_id,
         OLD."user",
         OLD.contract,
         OLD."group",
+        OLD.obligation_id,
         OLD.upper::numeric - OLD.lower::numeric
       )
-      ON CONFLICT (chain_id, "user", contract, "group") DO NOTHING;
+      ON CONFLICT (chain_id, "user", contract, "group", obligation_id) DO NOTHING;
       RETURN OLD;
     END;
     $$;
@@ -10476,10 +11009,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
 });
 /**
@@ -10499,7 +11033,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$16(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." };
@@ -10507,15 +11041,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.
@@ -10558,21 +11102,24 @@ const amountMutualExclusivity = () => single("amount_mutual_exclusivity", "Valid
 //#region src/gatekeeper/morphoRules.ts
 const morphoRules = (chains$3) => {
 	const assetsByChainId = {};
+	const collateralAssetsByChainId = {};
 	const oraclesByChainId = {};
 	for (const chain of chains$3) {
 		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$3 }),
-		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 })
 	];
 };
@@ -10755,5 +11302,5 @@ var mempool_exports = /* @__PURE__ */ __exportAll({
 });
 
 //#endregion
-export { Abi_exports as Abi, BookResponse_exports as BookResponse, BooksController, BrandTypeId, Callback_exports as Callback, Chain_exports as Chain, ChainHealth, ChainRegistry_exports as ChainRegistry, ChainsHealthResponse, Collateral_exports as Collateral, CollectorHealth, CollectorsHealthResponse, ConfigContractsController, ConfigRulesController, Database_exports as Database, ERC4626_exports as ERC4626, Errors_exports as Errors, Format_exports as Format, Gatekeeper_exports as Gatekeeper, Client_exports as GatekeeperClient, Health_exports as Health, HealthController, Indexer_exports as Indexer, LLTV_exports as LLTV, Liquidity_exports as Liquidity, Logger_exports as Logger, Maturity_exports as Maturity, mempool_exports as Mempool, Obligation_exports as Obligation, ObligationResponse_exports as ObligationResponse, ObligationsController, Offer_exports as Offer, OfferResponse_exports as OfferResponse, OffersController, drizzle_exports as OffersSchema, OpenApi, Oracle_exports as Oracle, Position_exports as Position, PositionResponse_exports as PositionResponse, Quote_exports as Quote, RouterApi_exports as RouterApi, Client_exports$1 as RouterClient, RouterStatusResponse, Rules_exports as Rules, time_exports as Time, TradingFee_exports as TradingFee, Transfer_exports as Transfer, Tree_exports as Tree, UsersController, utils_exports as Utils, ValidateController, Gate_exports as Validation, morphoRules, parse, safeParse };
+export { Abi_exports as Abi, BookResponse_exports as BookResponse, BooksController, BrandTypeId, Callback_exports as Callback, Chain_exports as Chain, ChainHealth, ChainRegistry_exports as ChainRegistry, ChainsHealthResponse, Collateral_exports as Collateral, CollectorHealth, CollectorsHealthResponse, ConfigContractsController, ConfigRulesController, Database_exports as Database, ERC4626_exports as ERC4626, Errors_exports as Errors, Format_exports as Format, Gatekeeper_exports as Gatekeeper, Client_exports as GatekeeperClient, Health_exports as Health, HealthController, Indexer_exports as Indexer, LLTV_exports as LLTV, Liquidity_exports as Liquidity, Logger_exports as Logger, Maturity_exports as Maturity, mempool_exports as Mempool, Obligation_exports as Obligation, ObligationResponse_exports as ObligationResponse, ObligationsController, Offer_exports as Offer, OfferResponse_exports as OfferResponse, OffersController, drizzle_exports as OffersSchema, OpenApi, Oracle_exports as Oracle, Position_exports as Position, PositionResponse_exports as PositionResponse, Quote_exports as Quote, RouterApi_exports as RouterApi, Client_exports$1 as RouterClient, RouterStatusResponse, Rules_exports as Rules, Tick_exports as Tick, time_exports as Time, TradingFee_exports as TradingFee, Transfer_exports as Transfer, Tree_exports as Tree, UsersController, utils_exports as Utils, ValidateController, Gate_exports as Validation, morphoRules, parse, safeParse };
 //# sourceMappingURL=index.node.mjs.map