@morpho-dev/router 0.6.0 → 0.7.0

package/dist/index.node.mjs

@@ -5256,7 +5256,8 @@ var OfferListResponse = class extends SuccessResponse {};
 __decorate([ApiProperty({
 	type: "string",
 	nullable: true,
-	example: offerCursorExample
+	example: offerCursorExample,
+	description: "Pagination cursor. Offer hash (0x...) for maker queries; base64url-encoded cursor for obligation queries."
 })], OfferListResponse.prototype, "cursor", void 0);
 __decorate([ApiProperty({
 	type: () => [OfferListItemResponse],
@@ -5809,11 +5810,17 @@ const configRulesLoanTokenExample = {
 	chain_id: 1,
 	address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
 };
+const configRulesOracleExample = {
+	type: "oracle",
+	chain_id: 1,
+	address: "0xDddd770BADd886dF3864029e4B377B5F6a2B6b83"
+};
 const configRulesChecksumExample = "f1d2d2f924e986ac86fdf7b36c94bcdf";
 const configRulesPayloadExample = [
 	configRulesMaturityExample,
 	configRulesCallbackExample,
-	configRulesLoanTokenExample
+	configRulesLoanTokenExample,
+	configRulesOracleExample
 ];
 const configContractNames = [
 	"mempool",
@@ -5964,7 +5971,7 @@ __decorate([
 		name: "types",
 		type: ["string"],
 		required: false,
-		example: "maturity,loan_token",
+		example: "maturity,loan_token,oracle",
 		description: "Filter by rule types (comma-separated).",
 		style: "form",
 		explode: false
@@ -6195,6 +6202,9 @@ function isValidBase64urlJson(val) {
 		return false;
 	}
 }
+function isValidOfferHashCursor(val) {
+	return /^0x[a-f0-9]{64}$/i.test(val);
+}
 const csvArray = (schema) => z$1.preprocess((value) => {
 	if (value === void 0) return void 0;
 	if (Array.isArray(value)) {
@@ -6220,10 +6230,11 @@ const PaginationQueryParams = z$1.object({
 const ConfigRuleTypes = z$1.enum([
 	"maturity",
 	"callback",
-	"loan_token"
+	"loan_token",
+	"oracle"
 ]);
 const GetConfigRulesQueryParams = z$1.object({
-	cursor: z$1.string().regex(/^(maturity|callback|loan_token):[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|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"
 	}),
@@ -6233,7 +6244,7 @@ const GetConfigRulesQueryParams = z$1.object({
 	}),
 	types: csvArray(ConfigRuleTypes).meta({
 		description: "Filter by rule types (comma-separated).",
-		example: "maturity,loan_token"
+		example: "maturity,loan_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).",
@@ -6254,8 +6265,11 @@ const GetConfigContractsQueryParams = z$1.object({
 		example: "1,8453"
 	})
 });
-const GetOffersQueryParams = z$1.object({
-	...PaginationQueryParams.shape,
+const GetOffersQueryParams = PaginationQueryParams.omit({ cursor: true }).extend({
+	cursor: z$1.string().optional().meta({
+		description: "Pagination cursor. Use offer hash (0x...) for maker queries, base64url for obligation queries.",
+		example: "eyJzaWRlIjoic2VsbCIsImN1cnJlbnRQcmljZSI6IjEwMDAwMDAwMDAwMDAwMDAwMDAiLCJibG9ja051bWJlciI6MSwiYXNzZXRzIjoiMTAwMDAwMDAwMDAwMDAwMDAwMCIsImhhc2giOiIweGRmZDY4NTllM2UwODJkMTkzODlhMWFlYzFiZGFkN2U4ZDkyZDk2YjFhYTc5NDBkYTkxYTMxMjVkMzFlM2JlNWIiLCJ0b3RhbFJldHVybmVkIjoxMCwibm93IjoxNjAwMDAwMDAwfQ"
+	}),
 	side: z$1.enum(["buy", "sell"]).optional().meta({
 		description: "Side of the offer. Required when using obligation_id.",
 		example: "buy"
@@ -6279,11 +6293,29 @@ const GetOffersQueryParams = z$1.object({
 		});
 		return;
 	}
-	if (hasMaker) return;
+	if (hasMaker) {
+		if (val.cursor !== void 0 && !isValidOfferHashCursor(val.cursor)) ctx.addIssue({
+			code: "custom",
+			path: ["cursor"],
+			message: "Cursor must be a 32-byte hex offer hash when filtering by maker"
+		});
+		return;
+	}
 	if (!hasObligation || !hasSide) ctx.addIssue({
 		code: "custom",
 		message: "Must provide either maker or both obligation_id and side"
 	});
+	if (val.cursor !== void 0 && !isValidBase64urlJson(val.cursor)) ctx.addIssue({
+		code: "custom",
+		path: ["cursor"],
+		message: "Invalid cursor format. Must be a valid base64url-encoded cursor object"
+	});
+}).transform((val) => {
+	if (val.maker && val.cursor) return {
+		...val,
+		cursor: val.cursor.toLowerCase()
+	};
+	return val;
 });
 const GetObligationsQueryParams = z$1.object({
 	...PaginationQueryParams.shape,
@@ -6559,13 +6591,18 @@ const assets = {
 		"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
 		"0x6B175474E89094C44Da98b954EedeAC495271d0F",
 		"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-		"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
+		"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+		"0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c",
+		"0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0"
 	],
 	[ChainId.BASE.toString()]: [
 		"0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
 		"0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb",
 		"0x4200000000000000000000000000000000000006",
-		"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
+		"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+		"0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf",
+		"0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452",
+		"0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42"
 	],
 	[ChainId["ETHEREUM-VIRTUAL-TESTNET"].toString()]: [
 		"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
@@ -6581,6 +6618,43 @@ const assets = {
 		"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
 	]
 };
+const oracles$1 = {
+	[ChainId.ETHEREUM.toString()]: [
+		"0xDddd770BADd886dF3864029e4B377B5F6a2B6b83",
+		"0x9CB3f4276bcD149b3668e1a645a964bC12877b89",
+		"0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2",
+		"0x6Eb9F4128CeBc8B885A4d8562Db1Addf097f7348",
+		"0xbD60A6770b27E084E8617335ddE769241B0e71D8",
+		"0xAe12416c1F21B0698c27fe042D9309C83baC6597"
+	],
+	[ChainId.BASE.toString()]: [
+		"0xD09048c8B568Dbf5f189302beA26c9edABFC4858",
+		"0xFEa2D58cEfCb9fcb597723c6bAE66fFE4193aFE4",
+		"0x05D2618404668D725B66c0f32B39e4EC15B393dC",
+		"0xE1bb8E5b4930eC9FeC7f7943FCF6227649F14B37",
+		"0x663BECd10daE6C4A3Dcd89F1d76c1174199639B9",
+		"0x10b95702a0ce895972C91e432C4f7E19811D320E",
+		"0x8C87DbD7A0c647A4291592Bc2994dbF95880fE2F",
+		"0x4A11590e5326138B514E08A9B52202D42077Ca65",
+		"0xa54122f0E0766258377Ffe732e454A3248f454F4"
+	],
+	[ChainId["ETHEREUM-VIRTUAL-TESTNET"].toString()]: [
+		"0xDddd770BADd886dF3864029e4B377B5F6a2B6b83",
+		"0x9CB3f4276bcD149b3668e1a645a964bC12877b89",
+		"0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2",
+		"0x6Eb9F4128CeBc8B885A4d8562Db1Addf097f7348",
+		"0xbD60A6770b27E084E8617335ddE769241B0e71D8",
+		"0xAe12416c1F21B0698c27fe042D9309C83baC6597"
+	],
+	[ChainId.ANVIL.toString()]: [
+		"0xDddd770BADd886dF3864029e4B377B5F6a2B6b83",
+		"0x9CB3f4276bcD149b3668e1a645a964bC12877b89",
+		"0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2",
+		"0x6Eb9F4128CeBc8B885A4d8562Db1Addf097f7348",
+		"0xbD60A6770b27E084E8617335ddE769241B0e71D8",
+		"0xAe12416c1F21B0698c27fe042D9309C83baC6597"
+	]
+};
 const configs = {
 	ethereum: {
 		callbacks: [
@@ -6647,7 +6721,7 @@ const configs = {
 //#endregion
 //#region src/gatekeeper/ConfigRules.ts
 /**
-* Build the configured rules (maturities + callback addresses + loan tokens) for the provided chains.
+* Build the configured rules (maturities + callback addresses + loan tokens + oracles) for the provided chains.
 * @param chains - Chains to include in the configured rules.
 * @returns Sorted list of config rules.
 */
@@ -6679,6 +6753,12 @@ function buildConfigRules(chains) {
 			chain_id: chain.id,
 			address: normalizeAddress(address)
 		});
+		const oracles = oracles$1[chain.id.toString()] ?? [];
+		for (const address of oracles) rules.push({
+			type: "oracle",
+			chain_id: chain.id,
+			address: normalizeAddress(address)
+		});
 	}
 	rules.sort(compareConfigRules);
 	return rules;
@@ -6700,6 +6780,10 @@ function buildConfigRulesChecksum(rules) {
 			hash.update(`callback:${rule.chain_id}:${rule.callback_type}:${rule.address}\n`);
 			continue;
 		}
+		if (rule.type === "oracle") {
+			hash.update(`oracle:${rule.chain_id}:${rule.address}\n`);
+			continue;
+		}
 		hash.update(`loan_token:${rule.chain_id}:${rule.address}\n`);
 	}
 	return hash.digest("hex");
@@ -6716,6 +6800,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 === "oracle" && right.type === "oracle") return left.address.localeCompare(right.address);
 	return 0;
 }
 
@@ -6760,6 +6845,7 @@ async function getConfigRules(query, chains) {
 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()}`;
 	return `loan_token:${rule.chain_id}:${rule.address.toLowerCase()}`;
 }
 function parseCursor(cursor) {
@@ -6792,13 +6878,16 @@ function parseCursor(cursor) {
 			address: parseAddress(addressValue, "Cursor address")
 		};
 	}
-	const addressValue = rest.join(":");
-	if (!addressValue) throw new BadRequestError("Cursor must be in the format loan_token:chain_id:address");
-	return {
-		type,
-		chain_id,
-		address: parseAddress(addressValue, "Cursor address")
-	};
+	if (type === "loan_token" || type === "oracle") {
+		const addressValue = rest.join(":");
+		if (!addressValue) throw new BadRequestError(`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");
 }
 function findStartIndex(rules, cursor) {
 	let low = 0;
@@ -6816,7 +6905,7 @@ function parseAddress(address, label) {
 	return address.toLowerCase();
 }
 function isConfigRuleType(value) {
-	return value === "maturity" || value === "callback" || value === "loan_token";
+	return value === "maturity" || value === "callback" || value === "loan_token" || value === "oracle";
 }
 function isMaturityType(value) {
 	return Object.values(MaturityType).includes(value);
@@ -9280,9 +9369,9 @@ function create$5(db) {
 				blockNumber: r.blockNumber
 			}));
 		},
-		upsert: async (oracles$1) => {
-			if (oracles$1.length === 0) return;
-			const rows = oracles$1.map((o) => ({
+		upsert: async (oracles$2) => {
+			if (oracles$2.length === 0) return;
+			const rows = oracles$2.map((o) => ({
 				chainId: o.chainId,
 				address: o.address.toLowerCase(),
 				price: o.price !== null ? o.price.toString() : null,
@@ -10478,6 +10567,7 @@ var Rules_exports = /* @__PURE__ */ __exportAll({
 	callback: () => callback,
 	chains: () => chains,
 	maturity: () => maturity,
+	oracle: () => oracle,
 	sameMaker: () => sameMaker,
 	token: () => token,
 	validity: () => validity
@@ -10616,6 +10706,16 @@ const token = ({ assetsByChainId }) => single("token", "Validates that offer loa
 	if (offer.collaterals.some((collateral) => !allowedAssets.includes(collateral.asset.toLowerCase()))) return { message: "Collateral is not allowed" };
 });
 /**
+* A validation rule that checks if the offer's oracle addresses are allowed for its chain.
+* @param oraclesByChainId - Allowed oracles indexed by chain id.
+* @returns The issue that was found. If the offer is valid, this will be undefined.
+*/
+const oracle = ({ oraclesByChainId }) => single("oracle", "Validates that offer collateral oracles are in the allowed oracle list for the offer chain", (offer) => {
+	const allowedOracles = oraclesByChainId[offer.chainId]?.map((oracle) => oracle.toLowerCase());
+	if (!allowedOracles || allowedOracles.length === 0) return { message: `No allowed oracles for chain ${offer.chainId}` };
+	if (offer.collaterals.some((collateral) => !allowedOracles.includes(collateral.oracle.toLowerCase()))) return { message: "Oracle is not allowed" };
+});
+/**
 * A batch validation rule that ensures all offers in a tree have the same maker address.
 * Returns an issue only for the first non-conforming offer.
 * This rule is signing-agnostic; signer verification is handled at the collector level.
@@ -10646,7 +10746,11 @@ const amountMutualExclusivity = () => single("amount_mutual_exclusivity", "Valid
 //#region src/gatekeeper/morphoRules.ts
 const morphoRules = (chains$3) => {
 	const assetsByChainId = {};
-	for (const chain of chains$3) assetsByChainId[chain.id] = assets[chain.id.toString()] ?? [];
+	const oraclesByChainId = {};
+	for (const chain of chains$3) {
+		assetsByChainId[chain.id] = assets[chain.id.toString()] ?? [];
+		oraclesByChainId[chain.id] = oracles$1[chain.id.toString()] ?? [];
+	}
 	return [
 		sameMaker(),
 		amountMutualExclusivity(),
@@ -10660,7 +10764,8 @@ const morphoRules = (chains$3) => {
 			],
 			allowedAddresses: chains$3.flatMap((c) => getCallbackAddresses(c.name))
 		}),
-		token({ assetsByChainId })
+		token({ assetsByChainId }),
+		oracle({ oraclesByChainId })
 	];
 };