@morpho-dev/router 0.0.25 → 0.0.27

package/dist/index.browser.mjs

@@ -1,4 +1,4 @@
-import { Errors, LLTV, Maturity, Offer, Format, Time } from '@morpho-dev/mempool';
+import { Errors, LLTV, Offer, Format, Time, Maturity } from '@morpho-dev/mempool';
 export * from '@morpho-dev/mempool';
 import { base, mainnet } from 'viem/chains';
 import { parseUnits, maxUint256, formatUnits, parseAbi } from 'viem';
@@ -21,7 +21,8 @@ __export(Chain_exports, {
   chainIds: () => chainIds,
   chainNames: () => chainNames,
   chains: () => chains,
-  getChain: () => getChain
+  getChain: () => getChain,
+  getWhitelistedChains: () => getWhitelistedChains
 });
 var chainNames = ["ethereum", "base", "ethereum-virtual-testnet"];
 var ChainId = {
@@ -38,6 +39,9 @@ function getChain(chainId) {
   }
   return chains[chainName];
 }
+var getWhitelistedChains = () => {
+  return [chains.ethereum, chains["ethereum-virtual-testnet"]];
+};
 var chains = {
   ethereum: {
     ...mainnet,
@@ -79,7 +83,8 @@ var chains = {
         // DAI
       ].map((address) => address.toLowerCase())
     ),
-    morpho: "0x0000000000000000000000000000000000000000",
+    morpho: "0x11a002d45db720ed47a80d2f3489cba5b833eaf5",
+    // @TODO: This is mock Consumed contract, update with Terms once stable
     mempool: {
       address: "0x7be3164eeee8b35092f6128ec32c2e6ff8f6c890",
       deploymentBlock: 23223727,
@@ -107,7 +112,9 @@ __export(RouterOffer_exports, {
   InvalidRouterOfferError: () => InvalidRouterOfferError,
   OfferStatusValues: () => OfferStatusValues,
   RouterOfferSchema: () => RouterOfferSchema,
+  consumedEvent: () => consumedEvent,
   from: () => from,
+  fromConsumedLog: () => fromConsumedLog,
   fromSnakeCase: () => fromSnakeCase,
   random: () => random,
   toSnakeCase: () => toSnakeCase
@@ -125,6 +132,16 @@ var RouterOfferSchema = (parameters) => Offer.OfferSchema(parameters).extend({
     issue: z.string()
   }).optional()
 });
+var consumedEvent = {
+  type: "event",
+  name: "Consumed",
+  inputs: [
+    { name: "user", type: "address", indexed: true, internalType: "address" },
+    { name: "nonce", type: "uint256", indexed: true, internalType: "uint256" },
+    { name: "amount", type: "uint256", indexed: false, internalType: "uint256" }
+  ],
+  anonymous: false
+};
 function from(input) {
   try {
     const parsedOffer = RouterOfferSchema({ omitHash: true }).parse(input);
@@ -152,6 +169,16 @@ function random() {
     consumed: 0n
   });
 }
+function fromConsumedLog(parameters) {
+  const { blockNumber, logIndex, chainId, transactionHash, user, nonce, amount } = parameters;
+  return {
+    id: `${blockNumber.toString()}-${logIndex.toString()}-${chainId}-${transactionHash}`,
+    chainId: BigInt(chainId),
+    offering: user,
+    nonce,
+    amount
+  };
+}
 var InvalidRouterOfferError = class extends Errors.BaseError {
   constructor(error) {
     super("Invalid router offer.", { cause: error });
@@ -363,28 +390,14 @@ var GetOffersQueryParams = z.object({
     example: "1500000000000000000"
   }),
   // Time range
-  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_maturity: z.coerce.number().int().min(0).optional().meta({
+    description: "Minimum maturity timestamp (Unix timestamp in seconds)",
+    example: "1700000000"
+  }),
+  max_maturity: z.coerce.number().int().min(0).optional().meta({
+    description: "Maximum maturity timestamp (Unix timestamp in seconds)",
+    example: "1800000000"
+  }),
   min_expiry: z.coerce.number().int().optional().meta({
     description: "Minimum expiry timestamp (Unix timestamp in seconds)",
     example: "1700000000"
@@ -459,33 +472,11 @@ var GetOffersQueryParams = z.object({
     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:86#0x9876543210987654321098765432109876543210:94.5"
   }),
-  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({
+  min_lltv: z.coerce.number().min(0, { message: "LLTV must be above 0" }).max(100, { message: "LLTV must be below 100" }).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.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({
+  max_lltv: z.coerce.number().min(0, { message: "LLTV must be above 0" }).max(100, { message: "LLTV must be below 100" }).optional().meta({
     description: "Maximum Loan-to-Value ratio (LLTV) for collateral (percentage as decimal, e.g., 95.5 = 95.5%)",
     example: "95.5"
   }),
@@ -628,39 +619,18 @@ var MatchOffersQueryParams = z.object({
     example: "0x1234567890123456789012345678901234567890:0xabcdefabcdefabcdefabcdefabcdefabcdefabcd:86#0x9876543210987654321098765432109876543210:0xfedcbafedcbafedcbafedcbafedcbafedcbafedc:94.5"
   }),
   // Maturity filtering
-  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(),
+  maturity: z.coerce.number().int().min(0).optional().meta({
+    description: "Maturity timestamp (Unix timestamp in seconds)",
+    example: "1700000000"
+  }),
+  min_maturity: z.coerce.number().int().min(0).optional().meta({
+    description: "Minimum maturity timestamp (Unix timestamp in seconds)",
+    example: "1700000000"
+  }),
+  max_maturity: z.coerce.number().int().min(0).optional().meta({
+    description: "Maximum maturity timestamp (Unix timestamp in seconds)",
+    example: "1800000000"
+  }),
   // Asset and creator filtering
   loan_token: z.string().regex(/^0x[a-fA-F0-9]{40}$/, {
     message: "Loan asset must be a valid Ethereum address"
@@ -1089,6 +1059,7 @@ __export(OfferStore_exports, {
 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;
@@ -1258,8 +1229,12 @@ function memory(parameters) {
           )
         )
       ));
-      minLltv && (offers = offers.filter((o) => o.collaterals.every((c) => c.lltv >= minLltv)));
-      maxLltv && (offers = offers.filter((o) => o.collaterals.every((c) => c.lltv <= maxLltv)));
+      minLltv && (offers = offers.filter(
+        (o) => o.collaterals.every((c) => c.lltv >= parseUnits(minLltv.toString(), 16))
+      ));
+      maxLltv && (offers = offers.filter(
+        (o) => o.collaterals.every((c) => c.lltv <= parseUnits(maxLltv.toString(), 16))
+      ));
       offers = offers.sort((a, b) => sort(sortBy, sortOrder, a, b));
       let nextCursor = null;
       if (offers.length > limit) {
@@ -1422,12 +1397,15 @@ function memory(parameters) {
       });
     },
     updateConsumedAmount: async (parameters2) => {
+      if (consumedIds.has(parameters2.id)) return;
+      consumedIds.add(parameters2.id);
       const chainId = parameters2.chainId;
       const address = parameters2.offering.toLowerCase();
       const nonce = parameters2.nonce;
       const filledForChain = filled.get(chainId) || /* @__PURE__ */ new Map();
       const filledForOffering = filledForChain.get(address) || /* @__PURE__ */ new Map();
-      filledForOffering.set(nonce, parameters2.consumed);
+      const current = filledForOffering.get(nonce) || 0n;
+      filledForOffering.set(nonce, current + parameters2.consumed);
       filledForChain.set(address, filledForOffering);
       filled.set(chainId, filledForChain);
     },
@@ -1449,9 +1427,9 @@ __export(RouterEvent_exports, {
   from: () => from2,
   types: () => types
 });
-var types = ["offer_created", "offer_matched", "offer_validation"];
+var types = ["offer_created", "offer_consumed", "offer_validation"];
 function from2(base) {
-  const id = `${base.type}:${base.offer.hash.toLowerCase()}`;
+  const id = base.type === "offer_consumed" ? `${base.type}:${base.offerConsumed.id}` : `${base.type}:${base.offer.hash.toLowerCase()}`;
   return { id, ...base };
 }