@morpho-dev/router 0.0.18 → 0.0.20

package/dist/index.browser.mjs

@@ -1,9 +1,10 @@
-import { Errors, Offer, Format, Time, Maturity, LLTV } from '@morpho-dev/mempool';
+import { Errors, LLTV, Maturity, Offer, Format, Time } from '@morpho-dev/mempool';
 export * from '@morpho-dev/mempool';
 import { base, mainnet } from 'viem/chains';
+import { parseUnits, maxUint256, formatUnits, parseAbi } from 'viem';
 import { z } from 'zod/v4';
 import { createDocument } from 'zod-openapi';
-import { maxUint256, parseUnits, parseAbi } from 'viem';
+import { Base64 } from 'js-base64';
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -156,8 +157,6 @@ function* batch(array, batchSize) {
     yield array.slice(i, i + batchSize);
   }
 }
-
-// src/utils/cursor.ts
 function validateCursor(cursor) {
   if (!cursor || typeof cursor !== "object") {
     throw new Error("Cursor must be an object");
@@ -228,11 +227,11 @@ function validateCursor(cursor) {
   return true;
 }
 function encodeCursor(c) {
-  return Buffer.from(JSON.stringify(c)).toString("base64url");
+  return Base64.encodeURL(JSON.stringify(c));
 }
 function decodeCursor(token) {
   if (!token) return null;
-  const decoded = JSON.parse(Buffer.from(token, "base64url").toString());
+  const decoded = JSON.parse(Base64.decode(token));
   validateCursor(decoded);
   return decoded;
 }
@@ -344,19 +343,33 @@ var GetOffersQueryParams = z.object({
     example: "1500000000000000000"
   }),
   // Time range
-  min_maturity: z.bigint({ coerce: true }).min(0n).optional().transform((val) => val === void 0 ? void 0 : Number(val)).meta({
-    description: "Minimum maturity timestamp (Unix timestamp in seconds)",
-    example: "1700000000"
-  }),
-  max_maturity: z.bigint({ coerce: true }).min(0n).optional().transform((val) => val === void 0 ? void 0 : Number(val)).meta({
-    description: "Maximum maturity timestamp (Unix timestamp in seconds)",
-    example: "1800000000"
-  }),
-  min_expiry: z.bigint({ coerce: true }).min(0n).optional().transform((val) => val === void 0 ? void 0 : Number(val)).meta({
+  min_maturity: z.coerce.number().int().positive().transform((maturity, ctx) => {
+    try {
+      return Maturity.from(maturity);
+    } catch (e) {
+      ctx.addIssue({
+        code: "custom",
+        message: e.message
+      });
+      return z.NEVER;
+    }
+  }).optional(),
+  max_maturity: z.coerce.number().int().positive().transform((maturity, ctx) => {
+    try {
+      return Maturity.from(maturity);
+    } catch (e) {
+      ctx.addIssue({
+        code: "custom",
+        message: e.message
+      });
+      return z.NEVER;
+    }
+  }).optional(),
+  min_expiry: z.coerce.number().int().optional().meta({
     description: "Minimum expiry timestamp (Unix timestamp in seconds)",
     example: "1700000000"
   }),
-  max_expiry: z.bigint({ coerce: true }).min(0n).optional().transform((val) => val === void 0 ? void 0 : Number(val)).meta({
+  max_expiry: z.coerce.number().int().optional().meta({
     description: "Maximum expiry timestamp (Unix timestamp in seconds)",
     example: "1800000000"
   }),
@@ -378,51 +391,81 @@ var GetOffersQueryParams = z.object({
     {
       message: "Collateral tuple must be in format: asset:oracle:lltv#asset2:oracle2:lltv2. Oracle and lltv are optional. Asset must be 0x + 40 hex chars, oracle must be 0x + 40 hex chars, lltv must be a number (e.g., 80.5)."
     }
-  ).transform((val) => {
+  ).transform((val, ctx) => {
     return val.split("#").map((tuple) => {
       const parts = tuple.split(":");
       if (parts.length === 0 || !parts[0]) {
-        throw new z.ZodError([
-          {
-            code: "custom",
-            message: "Asset address is required for each collateral tuple",
-            path: ["collateral_tuple"],
-            input: val
-          }
-        ]);
+        ctx.addIssue({
+          code: "custom",
+          message: "Asset address is required for each collateral tuple",
+          path: ["asset"],
+          input: val
+        });
+        return z.NEVER;
       }
       const asset = parts[0]?.toLowerCase();
       const oracle = parts[1]?.toLowerCase();
       const lltv = parts[2] ? parseFloat(parts[2]) : void 0;
       if (lltv !== void 0 && (lltv < MIN_LLTV || lltv > MAX_LLTV)) {
-        throw new z.ZodError([
-          {
+        ctx.addIssue({
+          code: "custom",
+          message: `LLTV must be between ${MIN_LLTV} and ${MAX_LLTV} (0-100%)`,
+          path: ["lltv"],
+          input: val
+        });
+        return z.NEVER;
+      }
+      let lltvValue;
+      if (lltv !== void 0) {
+        try {
+          lltvValue = LLTV.from(parseUnits(lltv.toString(), 16));
+        } catch (e) {
+          ctx.issues.push({
             code: "custom",
-            message: `LLTV must be between ${MIN_LLTV} and ${MAX_LLTV} (0-100%)`,
-            path: ["collateral_tuple"],
-            input: val
-          }
-        ]);
+            message: e instanceof LLTV.InvalidLLTVError || e instanceof LLTV.InvalidOptionError ? e.message : "Invalid LLTV.",
+            input: lltv,
+            path: ["lltv"]
+          });
+          return z.NEVER;
+        }
       }
       return {
         asset,
         oracle,
-        lltv
+        lltv: lltvValue
       };
     });
   }).optional().meta({
     description: "Filter by collateral combinations in format: asset:oracle:lltv#asset2:oracle2:lltv2. Oracle and lltv are optional. Use # to separate multiple combinations.",
-    example: "0x1234567890123456789012345678901234567890:0xabcdefabcdefabcdefabcdefabcdefabcdefabcd:8000#0x9876543210987654321098765432109876543210::8000"
+    example: "0x1234567890123456789012345678901234567890:0xabcdefabcdefabcdefabcdefabcdefabcdefabcd:86#0x9876543210987654321098765432109876543210:94.5"
   }),
-  min_lltv: z.string().regex(/^\d+(\.\d+)?$/, {
-    message: "Min LLTV must be a valid number"
-  }).transform((val) => parseFloat(val)).pipe(z.number().min(0).max(100)).optional().meta({
+  min_lltv: z.coerce.number().min(0, { message: "LLTV must be above 0" }).max(100, { message: "LLTV must be below 100" }).transform((lltv, ctx) => {
+    try {
+      return LLTV.from(parseUnits(lltv.toString(), 16));
+    } catch (e) {
+      ctx.addIssue({
+        code: "custom",
+        message: e.message,
+        input: lltv
+      });
+      return z.NEVER;
+    }
+  }).optional().meta({
     description: "Minimum Loan-to-Value ratio (LLTV) for collateral (percentage as decimal, e.g., 80.5 = 80.5%)",
     example: "80.5"
   }),
-  max_lltv: z.string().regex(/^\d+(\.\d+)?$/, {
-    message: "Max LLTV must be a valid number"
-  }).transform((val) => parseFloat(val)).pipe(z.number().min(0).max(100)).optional().meta({
+  max_lltv: z.coerce.number().min(0, { message: "LLTV must be above 0" }).max(100, { message: "LLTV must be below 100" }).transform((lltv, ctx) => {
+    try {
+      return LLTV.from(parseUnits(lltv.toString(), 16));
+    } catch (e) {
+      ctx.addIssue({
+        code: "custom",
+        message: e.message,
+        input: lltv
+      });
+      return z.NEVER;
+    }
+  }).optional().meta({
     description: "Maximum Loan-to-Value ratio (LLTV) for collateral (percentage as decimal, e.g., 95.5 = 95.5%)",
     example: "95.5"
   }),
@@ -515,68 +558,89 @@ var MatchOffersQueryParams = z.object({
   }),
   // Collateral filtering
   collaterals: z.string().regex(
-    /^(0x[a-fA-F0-9]{40}:0x[a-fA-F0-9]{40}:\d+)(#0x[a-fA-F0-9]{40}:0x[a-fA-F0-9]{40}:\d+)*$/,
+    /^(0x[a-fA-F0-9]{40}:0x[a-fA-F0-9]{40}:[0-9]+(\.[0-9]+)?)(#0x[a-fA-F0-9]{40}:0x[a-fA-F0-9]{40}:[0-9]+(\.[0-9]+)?)*$/,
     {
       message: "Collaterals must be in format: asset:oracle:lltv#asset2:oracle2:lltv2. All fields are required for each collateral."
     }
-  ).transform((val) => {
+  ).transform((val, ctx) => {
     return val.split("#").map((collateral) => {
       const parts = collateral.split(":");
       if (parts.length !== 3) {
-        throw new z.ZodError([
-          {
-            code: "custom",
-            message: "Each collateral must have exactly 3 parts: asset:oracle:lltv",
-            path: ["collaterals"],
-            input: val
-          }
-        ]);
+        ctx.addIssue({
+          code: "custom",
+          message: "Each collateral must have exactly 3 parts: asset:oracle:lltv",
+          path: ["collaterals"],
+          input: val
+        });
+        return z.NEVER;
       }
       const [asset, oracle, lltvStr] = parts;
       if (!asset || !oracle || !lltvStr) {
-        throw new z.ZodError([
-          {
-            code: "custom",
-            message: "Asset, oracle, and lltv are all required for each collateral",
-            path: ["collaterals"],
-            input: val
-          }
-        ]);
+        ctx.addIssue({
+          code: "custom",
+          message: "Asset, oracle, and lltv are all required for each collateral",
+          path: ["collaterals"],
+          input: val
+        });
       }
-      const lltv = BigInt(lltvStr);
-      if (lltv <= 0n) {
-        throw new z.ZodError([
-          {
+      let lltvValue;
+      if (lltvStr !== void 0) {
+        try {
+          lltvValue = LLTV.from(parseUnits(lltvStr, 16));
+        } catch (e) {
+          ctx.issues.push({
             code: "custom",
-            message: "LLTV must be a positive number",
-            path: ["collaterals"],
-            input: val
-          }
-        ]);
+            message: e instanceof LLTV.InvalidLLTVError || e instanceof LLTV.InvalidOptionError ? e.message : "Invalid LLTV.",
+            input: lltvStr,
+            path: ["lltv"]
+          });
+          return z.NEVER;
+        }
       }
       return {
         asset: asset.toLowerCase(),
         oracle: oracle.toLowerCase(),
-        lltv
+        lltv: lltvValue
       };
     });
   }).optional().meta({
     description: "Collateral requirements in format: asset:oracle:lltv#asset2:oracle2:lltv2. Use # to separate multiple collaterals.",
-    example: "0x1234567890123456789012345678901234567890:0xabcdefabcdefabcdefabcdefabcdefabcdefabcd:800000000000000000#0x9876543210987654321098765432109876543210:0xfedcbafedcbafedcbafedcbafedcbafedcbafedc:900000000000000000"
+    example: "0x1234567890123456789012345678901234567890:0xabcdefabcdefabcdefabcdefabcdefabcdefabcd:86#0x9876543210987654321098765432109876543210:0xfedcbafedcbafedcbafedcbafedcbafedcbafedc:94.5"
   }),
   // Maturity filtering
-  maturity: z.bigint({ coerce: true }).min(0n).optional().transform((val) => val === void 0 ? void 0 : Number(val)).meta({
-    description: "Exact maturity timestamp (Unix timestamp in seconds)",
-    example: "1700000000"
-  }),
-  min_maturity: z.bigint({ coerce: true }).min(0n).optional().transform((val) => val === void 0 ? void 0 : Number(val)).meta({
-    description: "Minimum maturity timestamp (Unix timestamp in seconds, inclusive)",
-    example: "1700000000"
-  }),
-  max_maturity: z.bigint({ coerce: true }).min(0n).optional().transform((val) => val === void 0 ? void 0 : Number(val)).meta({
-    description: "Maximum maturity timestamp (Unix timestamp in seconds, inclusive)",
-    example: "1800000000"
-  }),
+  maturity: z.coerce.number().int().positive().transform((maturity, ctx) => {
+    try {
+      return Maturity.from(maturity);
+    } catch (e) {
+      ctx.addIssue({
+        code: "custom",
+        message: e.message
+      });
+      return z.NEVER;
+    }
+  }).optional(),
+  min_maturity: z.coerce.number().int().positive().transform((maturity, ctx) => {
+    try {
+      return Maturity.from(maturity);
+    } catch (e) {
+      ctx.addIssue({
+        code: "custom",
+        message: e.message
+      });
+      return z.NEVER;
+    }
+  }).optional(),
+  max_maturity: z.coerce.number().int().positive().transform((maturity, ctx) => {
+    try {
+      return Maturity.from(maturity);
+    } catch (e) {
+      ctx.addIssue({
+        code: "custom",
+        message: e.message
+      });
+      return z.NEVER;
+    }
+  }).optional(),
   // Asset and creator filtering
   loan_token: z.string().regex(/^0x[a-fA-F0-9]{40}$/, {
     message: "Loan asset must be a valid Ethereum address"
@@ -638,8 +702,10 @@ var schemas = {
   get_offers: GetOffersQueryParams,
   match_offers: MatchOffersQueryParams
 };
-function safeParse(action, query) {
-  return schemas[action].safeParse(query);
+function safeParse(action, query, error) {
+  return schemas[action].safeParse(query, {
+    error
+  });
 }
 
 // src/core/apiSchema/openapi.ts
@@ -691,7 +757,7 @@ var paths = {
       }
     }
   },
-  "/v1/match-offers": {
+  "/v1/offers/match": {
     get: {
       summary: "Match offers",
       description: "Find offers that match specific criteria",
@@ -842,16 +908,16 @@ async function get(config, parameters) {
       } else if (lltv !== void 0) {
         result += `:`;
       }
-      if (lltv !== void 0) result += `:${lltv}`;
+      if (lltv !== void 0) result += `:${formatUnits(lltv, 16)}`;
       return result;
     }).join("#");
     url.searchParams.set("collateral_tuple", tupleStr);
   }
   if (parameters.minLltv !== void 0) {
-    url.searchParams.set("min_lltv", parameters.minLltv.toString());
+    url.searchParams.set("min_lltv", formatUnits(parameters.minLltv, 16));
   }
   if (parameters.maxLltv !== void 0) {
-    url.searchParams.set("max_lltv", parameters.maxLltv.toString());
+    url.searchParams.set("max_lltv", formatUnits(parameters.maxLltv, 16));
   }
   if (parameters.sortBy) {
     url.searchParams.set("sort_by", parameters.sortBy);
@@ -873,14 +939,14 @@ async function get(config, parameters) {
   };
 }
 async function match(config, parameters) {
-  const url = new URL(`${config.url.toString()}v1/match-offers`);
+  const url = new URL(`${config.url.toString()}v1/offers/match`);
   url.searchParams.set("side", parameters.side);
   url.searchParams.set("chain_id", parameters.chainId.toString());
   if (parameters.rate !== void 0) {
     url.searchParams.set("rate", parameters.rate.toString());
   }
   if (parameters.collaterals?.length) {
-    const collateralsStr = parameters.collaterals.map(({ asset, oracle, lltv }) => `${asset}:${oracle}:${lltv}`).join("#");
+    const collateralsStr = parameters.collaterals.map(({ asset, oracle, lltv }) => `${asset}:${oracle}:${formatUnits(lltv, 16)}`).join("#");
     url.searchParams.set("collaterals", collateralsStr);
   }
   if (parameters.maturity !== void 0) {
@@ -918,12 +984,12 @@ async function getApi(config, url) {
   const pathname = url.pathname;
   let action;
   switch (true) {
+    case pathname.includes("/v1/offers/match"):
+      action = "match_offers";
+      break;
     case pathname.includes("/v1/offers"):
       action = "get_offers";
       break;
-    case pathname.includes("/v1/match-offers"):
-      action = "match_offers";
-      break;
     default:
       throw new HttpGetOffersFailedError("Unknown endpoint", {
         details: `Unsupported path: ${pathname}`
@@ -1134,6 +1200,7 @@ function memory(parameters) {
       }
       creators && (creators = creators.map((c) => c.toLowerCase()));
       loanTokens && (loanTokens = loanTokens.map((lt) => lt.toLowerCase()));
+      callbackAddresses && (callbackAddresses = callbackAddresses.map((ca) => ca.toLowerCase()));
       collateralAssets && (collateralAssets = collateralAssets.map((ca) => ca.toLowerCase()));
       collateralOracles && (collateralOracles = collateralOracles.map((co) => co.toLowerCase()));
       collateralTuple && (collateralTuple = collateralTuple.map((ct) => ({
@@ -1170,12 +1237,8 @@ function memory(parameters) {
           )
         )
       ));
-      minLltv && (offers = offers.filter(
-        (o) => o.collaterals.every((c) => c.lltv >= LLTV.from(parseUnits(minLltv.toString(), 16)))
-      ));
-      maxLltv && (offers = offers.filter(
-        (o) => o.collaterals.every((c) => c.lltv <= LLTV.from(parseUnits(maxLltv.toString(), 16)))
-      ));
+      minLltv && (offers = offers.filter((o) => o.collaterals.every((c) => c.lltv >= minLltv)));
+      maxLltv && (offers = offers.filter((o) => o.collaterals.every((c) => c.lltv <= maxLltv)));
       offers = offers.sort((a, b) => sort(sortBy, sortOrder, a, b));
       let nextCursor = null;
       if (offers.length > limit) {
@@ -1222,8 +1285,8 @@ function memory(parameters) {
         limit = 20
       } = params;
       const now = Time.now();
-      const buy = side !== "buy";
-      const sortOrder = buy ? "asc" : "desc";
+      const isBuying = side === "buy";
+      const sortOrder = isBuying ? "desc" : "asc";
       let offers = Array.from(map.values()).map((o) => ({
         ...o,
         consumed: filled.get(o.chainId)?.get(o.offering.toLowerCase())?.get(o.nonce) || 0n
@@ -1236,22 +1299,27 @@ function memory(parameters) {
         offers = offers.filter(
           (o) => sortOrder === "asc" ? o.rate >= BigInt(cursor.rate) : o.rate <= BigInt(cursor.rate)
         );
-        offers = offers.filter((o) => o.hash !== cursor.hash);
       }
-      offers = offers.filter((o) => o.buy === buy);
+      offers = offers.filter((o) => o.buy === !isBuying);
       offers = offers.filter((o) => o.chainId === BigInt(chainId));
       offers = offers.filter((o) => o.expiry >= now);
-      rate && (offers = offers.filter((o) => buy ? o.rate >= rate : o.rate <= rate));
+      rate && (offers = offers.filter((o) => isBuying ? o.rate >= rate : o.rate <= rate));
       collaterals.length > 0 && (offers = offers.filter(
-        (o) => buy ? collaterals.every((c) => {
-          return o.collaterals.some(
-            (oc) => oc.asset.toLowerCase() === c.asset.toLowerCase() && oc.oracle.toLowerCase() === c.oracle.toLowerCase() && oc.lltv === c.lltv
-          );
-        }) : o.collaterals.every((oc) => {
-          return collaterals.some(
-            (c) => oc.asset.toLowerCase() === c.asset.toLowerCase() && oc.oracle.toLowerCase() === c.oracle.toLowerCase() && oc.lltv === c.lltv
-          );
-        })
+        (o) => isBuying ? (
+          // when wanting to buy, sell offer collaterals ⊆ user buy collaterals
+          o.collaterals.every((oc) => {
+            return collaterals.some(
+              (c) => oc.asset.toLowerCase() === c.asset.toLowerCase() && oc.oracle.toLowerCase() === c.oracle.toLowerCase() && oc.lltv === c.lltv
+            );
+          })
+        ) : (
+          // when wanting to sell, user sell collaterals ⊆ buy offer collaterals
+          collaterals.every((c) => {
+            return o.collaterals.some(
+              (oc) => oc.asset.toLowerCase() === c.asset.toLowerCase() && oc.oracle.toLowerCase() === c.oracle.toLowerCase() && oc.lltv === c.lltv
+            );
+          })
+        )
       ));
       maturity && (offers = offers.filter((o) => o.maturity === maturity));
       minMaturity && (offers = offers.filter((o) => o.maturity >= minMaturity));
@@ -1289,6 +1357,7 @@ function memory(parameters) {
       }
       offers = Array.from(byGroup.values());
       offers = offers.sort((a, b) => sort("rate", sortOrder, a, b));
+      cursor && (offers = offers.filter((o) => o.hash !== cursor.hash));
       let nextCursor = null;
       if (offers.length > limit) {
         const last = offers[limit - 1];
@@ -1321,9 +1390,12 @@ function memory(parameters) {
       return deleted;
     },
     updateStatus: async (parameters2) => {
-      if (!map.has(parameters2.offerHash.toLowerCase())) return;
-      map.set(parameters2.offerHash.toLowerCase(), {
-        ...map.get(parameters2.offerHash.toLowerCase()),
+      const key = parameters2.offerHash.toLowerCase();
+      const existing = map.get(key);
+      if (!existing) return;
+      if (existing.status === parameters2.status) return;
+      map.set(key, {
+        ...existing,
         status: parameters2.status,
         metadata: parameters2.metadata
       });