@morpho-dev/router 0.1.0 → 0.1.2

package/dist/index.browser.mjs

@@ -1,6 +1,5 @@
-import { Errors, LLTV, Offer, Format, Time, Maturity } from '@morpho-dev/mempool';
+import { Errors, LLTV, Offer, Format, Time, Maturity, Chain } 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';
@@ -14,85 +13,6 @@ var __export = (target, all) => {
 };
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
 
-// src/Chain.ts
-var Chain_exports = {};
-__export(Chain_exports, {
-  ChainId: () => ChainId,
-  chainIds: () => chainIds,
-  chainNames: () => chainNames,
-  chains: () => chains,
-  getChain: () => getChain,
-  getWhitelistedChains: () => getWhitelistedChains
-});
-var chainNames = ["ethereum", "base", "ethereum-virtual-testnet"];
-var ChainId = {
-  ETHEREUM: BigInt(mainnet.id),
-  BASE: BigInt(base.id),
-  "ETHEREUM-VIRTUAL-TESTNET": 109111114n
-};
-var chainIds = new Set(Object.values(ChainId));
-var chainNameLookup = new Map(Object.entries(ChainId).map(([key, value]) => [value, key]));
-function getChain(chainId) {
-  const chainName = chainNameLookup.get(chainId)?.toLowerCase();
-  if (!chainName) {
-    return void 0;
-  }
-  return chains[chainName];
-}
-var getWhitelistedChains = () => {
-  return [chains.ethereum, chains.base, chains["ethereum-virtual-testnet"]];
-};
-var chains = {
-  ethereum: {
-    ...mainnet,
-    id: ChainId.ETHEREUM,
-    name: "ethereum",
-    whitelistedAssets: new Set(
-      [
-        "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-        // USDC
-        "0x6B175474E89094C44Da98b954EedeAC495271d0F"
-        // DAI
-      ].map((address) => address.toLowerCase())
-    ),
-    morpho: "0x0000000000000000000000000000000000000000"
-  },
-  base: {
-    ...base,
-    id: ChainId.BASE,
-    name: "base",
-    whitelistedAssets: new Set(
-      [
-        "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-        // USDC
-        "0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb"
-        // DAI
-      ].map((address) => address.toLowerCase())
-    ),
-    morpho: "0x0000000000000000000000000000000000000000"
-  },
-  "ethereum-virtual-testnet": {
-    ...mainnet,
-    id: 109111114n,
-    name: "ethereum-virtual-testnet",
-    whitelistedAssets: new Set(
-      [
-        "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-        // USDC
-        "0x6B175474E89094C44Da98b954EedeAC495271d0F"
-        // DAI
-      ].map((address) => address.toLowerCase())
-    ),
-    morpho: "0x11a002d45db720ed47a80d2f3489cba5b833eaf5",
-    // @TODO: This is mock Consumed contract, update with Terms once stable
-    mempool: {
-      address: "0x7be3164eeee8b35092f6128ec32c2e6ff8f6c890",
-      deploymentBlock: 23223727,
-      reindexBuffer: 10
-    }
-  }
-};
-
 // src/core/router/Client.ts
 var Client_exports = {};
 __export(Client_exports, {
@@ -419,12 +339,15 @@ var GetOffersQueryParams = z.object({
     description: "Filter by multiple rate oracles (comma-separated)",
     example: "0x1234567890123456789012345678901234567890,0xabcdefabcdefabcdefabcdefabcdefabcdefabcd"
   }),
-  collateral_tuple: z.string().regex(
-    /^(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: "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)."
+  collateral_tuple: z.string().transform((val, ctx) => {
+    const pattern = /^(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]+)?)?)*$/;
+    if (!pattern.test(val)) {
+      ctx.addIssue({
+        code: "custom",
+        message: "collateral_tuple has an invalid format",
+        input: val
+      });
     }
-  ).transform((val, ctx) => {
     return val.split("#").map((tuple) => {
       const parts = tuple.split(":");
       if (parts.length === 0 || !parts[0]) {
@@ -554,9 +477,23 @@ var MatchOffersQueryParams = z.object({
     description: "The desired side of the match: 'buy' if you want to buy, 'sell' if you want to sell. If your intent is to sell, buy offers will be returned, and vice versa.",
     example: "buy"
   }),
-  chain_id: z.string().regex(/^\d+$/, {
-    message: "Chain ID must be a positive integer"
-  }).transform((val) => Number.parseInt(val, 10)).pipe(z.number().positive()).meta({
+  chain_id: z.string().transform((val, ctx) => {
+    const numericLike = /^-?\d+$/.test(val);
+    if (!numericLike) {
+      ctx.addIssue({
+        code: "custom",
+        message: "chain_id has an invalid format",
+        input: val
+      });
+      ctx.addIssue({
+        code: "custom",
+        message: "Invalid input: expected number, received NaN",
+        input: val
+      });
+      return z.NEVER;
+    }
+    return Number.parseInt(val, 10);
+  }).pipe(z.number().positive()).meta({
     description: "The blockchain network chain ID",
     example: "1"
   }),
@@ -568,12 +505,15 @@ var MatchOffersQueryParams = z.object({
     example: "1000000000000000000"
   }),
   // Collateral filtering
-  collaterals: z.string().regex(
-    /^(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."
+  collaterals: z.string().transform((val, ctx) => {
+    const pattern = /^(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]+)?)*$/;
+    if (!pattern.test(val)) {
+      ctx.addIssue({
+        code: "custom",
+        message: "Collaterals must be in format: asset:oracle:lltv#asset2:oracle2:lltv2. All fields are required for each collateral.",
+        input: val
+      });
     }
-  ).transform((val, ctx) => {
     return val.split("#").map((collateral) => {
       const parts = collateral.split(":");
       if (parts.length !== 3) {
@@ -1060,7 +1000,6 @@ function memory(parameters) {
   const map = parameters.offers;
   const filled = parameters.filled;
   const consumedIds = /* @__PURE__ */ new Set();
-  const indexingProgress = /* @__PURE__ */ new Map();
   const create = async (parameters2) => {
     if (map.has(parameters2.offer.hash.toLowerCase())) return parameters2.offer.hash;
     map.set(parameters2.offer.hash.toLowerCase(), {
@@ -1131,7 +1070,7 @@ function memory(parameters) {
       let {
         creators,
         side,
-        chains: chains2,
+        chains,
         loanTokens,
         status = ["valid"],
         callbackAddresses,
@@ -1202,7 +1141,7 @@ function memory(parameters) {
       offers = offers.filter((o) => o.expiry >= now);
       creators && (offers = offers.filter((o) => creators.includes(o.offering.toLowerCase())));
       side && (offers = offers.filter((o) => o.buy === buy));
-      chains2 && (offers = offers.filter((o) => chains2.includes(Number(o.chainId))));
+      chains && (offers = offers.filter((o) => chains.includes(Number(o.chainId))));
       loanTokens && (offers = offers.filter((o) => loanTokens.includes(o.loanToken.toLowerCase())));
       status && (offers = offers.filter((o) => status.includes(o.status)));
       callbackAddresses && (offers = offers.filter(
@@ -1408,15 +1347,6 @@ function memory(parameters) {
       filledForOffering.set(nonce, current + parameters2.consumed);
       filledForChain.set(address, filledForOffering);
       filled.set(chainId, filledForChain);
-    },
-    saveLatestBlockNumberProcessed: async (parameters2) => {
-      const key = `${parameters2.chainId.toString()}:${parameters2.eventType}`;
-      indexingProgress.set(key, parameters2.latestBlockNumber);
-    },
-    getLatestBlockNumberProcessed: async (parameters2) => {
-      const key = `${parameters2.chainId.toString()}:${parameters2.eventType}`;
-      const value = indexingProgress.get(key);
-      return value === void 0 ? null : { latestBlockNumber: value };
     }
   };
 }
@@ -1555,7 +1485,7 @@ function morpho(parameters) {
       );
       const buyOffersPerLoanAsset = /* @__PURE__ */ new Map();
       for (const offer of buyOffers) {
-        const chainName = getChain(offer.chainId)?.name;
+        const chainName = Chain.getChain(offer.chainId)?.name;
         const loanTokens = buyOffersPerLoanAsset.get(chainName) ?? /* @__PURE__ */ new Map();
         const offers2 = loanTokens.get(offer.loanToken.toLowerCase()) ?? [];
         offers2.push(offer);
@@ -1566,7 +1496,7 @@ function morpho(parameters) {
         Array.from(buyOffersPerLoanAsset.entries()).map(async ([name, loanTokens]) => {
           const chainName = name;
           const publicClient = publicClients[chainName];
-          const morpho2 = morphoPerChain.get(chains[chainName].id);
+          const morpho2 = morphoPerChain.get(Chain.chains[chainName].id);
           if (!publicClient) {
             const offers2 = Array.from(loanTokens.values()).flat();
             for (const offer of offers2) {
@@ -1646,6 +1576,6 @@ function morpho(parameters) {
   ];
 }
 
-export { Chain_exports as Chain, OfferStore_exports as OfferStore, Client_exports as Router, RouterEvent_exports as RouterEvent, RouterOffer_exports as RouterOffer, utils_exports as Utils, Validation_exports as Validation, ValidationRule_exports as ValidationRule };
+export { OfferStore_exports as OfferStore, Client_exports as Router, RouterEvent_exports as RouterEvent, RouterOffer_exports as RouterOffer, utils_exports as Utils, Validation_exports as Validation, ValidationRule_exports as ValidationRule };
 //# sourceMappingURL=index.browser.mjs.map
 //# sourceMappingURL=index.browser.mjs.map