@morpho-dev/router 0.0.24 → 0.0.26

package/dist/index.node.d.cts

@@ -27,6 +27,7 @@ type Chain = Compute<Omit<Chain$2, "id" | "name"> & {
     name: ChainName;
     whitelistedAssets: Set<Address>;
     morpho: Address;
+    termsContract: Address;
     mempool?: {
         address: Address;
         deploymentBlock: number;
@@ -78,10 +79,10 @@ declare const schemas: {
         min_lltv: z.ZodOptional<z.ZodPipe<z.ZodCoercedNumber<unknown>, z.ZodTransform<bigint & _morpho_dev_mempool.Brand<"LLTV">, number>>>;
         max_lltv: z.ZodOptional<z.ZodPipe<z.ZodCoercedNumber<unknown>, z.ZodTransform<bigint & _morpho_dev_mempool.Brand<"LLTV">, number>>>;
         sort_by: z.ZodOptional<z.ZodEnum<{
+            amount: "amount";
             rate: "rate";
             maturity: "maturity";
             expiry: "expiry";
-            amount: "amount";
         }>>;
         sort_order: z.ZodDefault<z.ZodOptional<z.ZodEnum<{
             asc: "asc";
@@ -126,6 +127,13 @@ type RouterOffer = Offer.Offer & {
     status: OfferStatus;
     metadata?: OfferMetadata;
 };
+type OfferConsumed = {
+    id: string;
+    chainId: bigint;
+    offering: Address;
+    nonce: bigint;
+    amount: bigint;
+};
 declare const RouterOfferSchema: (parameters?: {
     omitHash?: boolean;
 }) => zod_v4.ZodObject<{
@@ -162,6 +170,30 @@ declare const RouterOfferSchema: (parameters?: {
         issue: z.ZodString;
     }, z.core.$strip>>;
 }, zod_v4_core.$strip>;
+/**
+ * ABI for the Consumed event emitted by the terms contract.
+ */
+declare const consumedEvent: {
+    readonly type: "event";
+    readonly name: "Consumed";
+    readonly inputs: readonly [{
+        readonly name: "user";
+        readonly type: "address";
+        readonly indexed: true;
+        readonly internalType: "address";
+    }, {
+        readonly name: "nonce";
+        readonly type: "uint256";
+        readonly indexed: true;
+        readonly internalType: "uint256";
+    }, {
+        readonly name: "amount";
+        readonly type: "uint256";
+        readonly indexed: false;
+        readonly internalType: "uint256";
+    }];
+    readonly anonymous: false;
+};
 /**
  * Creates a router offer from a plain object.
  * @throws {InvalidRouterOfferError} If the router offer is invalid.
@@ -189,6 +221,15 @@ declare namespace fromSnakeCase {
  */
 declare function toSnakeCase(offer: RouterOffer): Format.Snake<RouterOffer>;
 declare function random(): RouterOffer;
+declare function fromConsumedLog(parameters: {
+    blockNumber: bigint;
+    logIndex: number;
+    chainId: number;
+    transactionHash: Hex;
+    user: Address;
+    nonce: bigint;
+    amount: bigint;
+}): OfferConsumed;
 declare class InvalidRouterOfferError extends Errors.BaseError<ZodError | Error> {
     readonly name = "RouterOffer.InvalidRouterOfferError";
     constructor(error: ZodError | Error);
@@ -196,16 +237,19 @@ declare class InvalidRouterOfferError extends Errors.BaseError<ZodError | Error>
 
 type RouterOffer$1_InvalidRouterOfferError = InvalidRouterOfferError;
 declare const RouterOffer$1_InvalidRouterOfferError: typeof InvalidRouterOfferError;
+type RouterOffer$1_OfferConsumed = OfferConsumed;
 type RouterOffer$1_OfferMetadata = OfferMetadata;
 type RouterOffer$1_OfferStatus = OfferStatus;
 declare const RouterOffer$1_OfferStatusValues: typeof OfferStatusValues;
 type RouterOffer$1_RouterOffer = RouterOffer;
 declare const RouterOffer$1_RouterOfferSchema: typeof RouterOfferSchema;
+declare const RouterOffer$1_consumedEvent: typeof consumedEvent;
+declare const RouterOffer$1_fromConsumedLog: typeof fromConsumedLog;
 declare const RouterOffer$1_fromSnakeCase: typeof fromSnakeCase;
 declare const RouterOffer$1_random: typeof random;
 declare const RouterOffer$1_toSnakeCase: typeof toSnakeCase;
 declare namespace RouterOffer$1 {
-  export { RouterOffer$1_InvalidRouterOfferError as InvalidRouterOfferError, type RouterOffer$1_OfferMetadata as OfferMetadata, type RouterOffer$1_OfferStatus as OfferStatus, RouterOffer$1_OfferStatusValues as OfferStatusValues, type RouterOffer$1_RouterOffer as RouterOffer, RouterOffer$1_RouterOfferSchema as RouterOfferSchema, from$1 as from, RouterOffer$1_fromSnakeCase as fromSnakeCase, RouterOffer$1_random as random, RouterOffer$1_toSnakeCase as toSnakeCase };
+  export { RouterOffer$1_InvalidRouterOfferError as InvalidRouterOfferError, type RouterOffer$1_OfferConsumed as OfferConsumed, type RouterOffer$1_OfferMetadata as OfferMetadata, type RouterOffer$1_OfferStatus as OfferStatus, RouterOffer$1_OfferStatusValues as OfferStatusValues, type RouterOffer$1_RouterOffer as RouterOffer, RouterOffer$1_RouterOfferSchema as RouterOfferSchema, RouterOffer$1_consumedEvent as consumedEvent, from$1 as from, RouterOffer$1_fromConsumedLog as fromConsumedLog, RouterOffer$1_fromSnakeCase as fromSnakeCase, RouterOffer$1_random as random, RouterOffer$1_toSnakeCase as toSnakeCase };
 }
 
 type OfferResponse = {
@@ -423,6 +467,7 @@ type OfferStore = {
         metadata?: OfferMetadata;
     }) => Promise<void>;
     updateConsumedAmount: (parameters: {
+        id: string;
         chainId: Offer.Offer["chainId"];
         offering: Offer.Offer["offering"];
         nonce: Offer.Offer["nonce"];
@@ -431,13 +476,13 @@ type OfferStore = {
     /** Persist latest indexing progress for a chain and event type. */
     saveLatestBlockNumberProcessed: (parameters: {
         chainId: Offer.Offer["chainId"];
-        eventType: "offer_created" | "offer_matched";
+        eventType: "offer_created" | "offer_consumed";
         latestBlockNumber: number;
     }) => Promise<void>;
     /** Retrieve latest indexing progress for a chain and event type. */
     getLatestBlockNumberProcessed: (parameters: {
         chainId: Offer.Offer["chainId"];
-        eventType: "offer_created" | "offer_matched";
+        eventType: "offer_created" | "offer_consumed";
     }) => Promise<{
         latestBlockNumber: number;
     } | null>;
@@ -674,13 +719,15 @@ declare namespace Logger$1 {
   export { type Logger$1_LogFn as LogFn, type Logger$1_LogLevel as LogLevel, Logger$1_LogLevelValues as LogLevelValues, type Logger$1_Logger as Logger, Logger$1_defaultLogger as defaultLogger, Logger$1_getLogger as getLogger, Logger$1_runWithLogger as runWithLogger };
 }
 
-declare const types: readonly ["offer_created", "offer_matched", "offer_validation"];
+declare const types: readonly ["offer_created", "offer_consumed", "offer_validation"];
 type Type = (typeof types)[number];
 type BaseEvent<type extends Type = Type> = {
     readonly id: string;
     readonly type: type;
 };
-type RouterEvent<type extends Type = Type> = type extends "offer_created" | "offer_matched" | "offer_validation" ? Compute<BaseEvent<type> & {
+type RouterEvent<type extends Type = Type> = type extends "offer_consumed" ? Compute<BaseEvent<type> & {
+    readonly offerConsumed: OfferConsumed;
+}> : type extends "offer_created" | "offer_validation" ? Compute<BaseEvent<type> & {
     readonly offer: Offer.Offer;
 }> : never;
 /**

package/dist/index.node.d.ts

@@ -27,6 +27,7 @@ type Chain = Compute<Omit<Chain$2, "id" | "name"> & {
     name: ChainName;
     whitelistedAssets: Set<Address>;
     morpho: Address;
+    termsContract: Address;
     mempool?: {
         address: Address;
         deploymentBlock: number;
@@ -78,10 +79,10 @@ declare const schemas: {
         min_lltv: z.ZodOptional<z.ZodPipe<z.ZodCoercedNumber<unknown>, z.ZodTransform<bigint & _morpho_dev_mempool.Brand<"LLTV">, number>>>;
         max_lltv: z.ZodOptional<z.ZodPipe<z.ZodCoercedNumber<unknown>, z.ZodTransform<bigint & _morpho_dev_mempool.Brand<"LLTV">, number>>>;
         sort_by: z.ZodOptional<z.ZodEnum<{
+            amount: "amount";
             rate: "rate";
             maturity: "maturity";
             expiry: "expiry";
-            amount: "amount";
         }>>;
         sort_order: z.ZodDefault<z.ZodOptional<z.ZodEnum<{
             asc: "asc";
@@ -126,6 +127,13 @@ type RouterOffer = Offer.Offer & {
     status: OfferStatus;
     metadata?: OfferMetadata;
 };
+type OfferConsumed = {
+    id: string;
+    chainId: bigint;
+    offering: Address;
+    nonce: bigint;
+    amount: bigint;
+};
 declare const RouterOfferSchema: (parameters?: {
     omitHash?: boolean;
 }) => zod_v4.ZodObject<{
@@ -162,6 +170,30 @@ declare const RouterOfferSchema: (parameters?: {
         issue: z.ZodString;
     }, z.core.$strip>>;
 }, zod_v4_core.$strip>;
+/**
+ * ABI for the Consumed event emitted by the terms contract.
+ */
+declare const consumedEvent: {
+    readonly type: "event";
+    readonly name: "Consumed";
+    readonly inputs: readonly [{
+        readonly name: "user";
+        readonly type: "address";
+        readonly indexed: true;
+        readonly internalType: "address";
+    }, {
+        readonly name: "nonce";
+        readonly type: "uint256";
+        readonly indexed: true;
+        readonly internalType: "uint256";
+    }, {
+        readonly name: "amount";
+        readonly type: "uint256";
+        readonly indexed: false;
+        readonly internalType: "uint256";
+    }];
+    readonly anonymous: false;
+};
 /**
  * Creates a router offer from a plain object.
  * @throws {InvalidRouterOfferError} If the router offer is invalid.
@@ -189,6 +221,15 @@ declare namespace fromSnakeCase {
  */
 declare function toSnakeCase(offer: RouterOffer): Format.Snake<RouterOffer>;
 declare function random(): RouterOffer;
+declare function fromConsumedLog(parameters: {
+    blockNumber: bigint;
+    logIndex: number;
+    chainId: number;
+    transactionHash: Hex;
+    user: Address;
+    nonce: bigint;
+    amount: bigint;
+}): OfferConsumed;
 declare class InvalidRouterOfferError extends Errors.BaseError<ZodError | Error> {
     readonly name = "RouterOffer.InvalidRouterOfferError";
     constructor(error: ZodError | Error);
@@ -196,16 +237,19 @@ declare class InvalidRouterOfferError extends Errors.BaseError<ZodError | Error>
 
 type RouterOffer$1_InvalidRouterOfferError = InvalidRouterOfferError;
 declare const RouterOffer$1_InvalidRouterOfferError: typeof InvalidRouterOfferError;
+type RouterOffer$1_OfferConsumed = OfferConsumed;
 type RouterOffer$1_OfferMetadata = OfferMetadata;
 type RouterOffer$1_OfferStatus = OfferStatus;
 declare const RouterOffer$1_OfferStatusValues: typeof OfferStatusValues;
 type RouterOffer$1_RouterOffer = RouterOffer;
 declare const RouterOffer$1_RouterOfferSchema: typeof RouterOfferSchema;
+declare const RouterOffer$1_consumedEvent: typeof consumedEvent;
+declare const RouterOffer$1_fromConsumedLog: typeof fromConsumedLog;
 declare const RouterOffer$1_fromSnakeCase: typeof fromSnakeCase;
 declare const RouterOffer$1_random: typeof random;
 declare const RouterOffer$1_toSnakeCase: typeof toSnakeCase;
 declare namespace RouterOffer$1 {
-  export { RouterOffer$1_InvalidRouterOfferError as InvalidRouterOfferError, type RouterOffer$1_OfferMetadata as OfferMetadata, type RouterOffer$1_OfferStatus as OfferStatus, RouterOffer$1_OfferStatusValues as OfferStatusValues, type RouterOffer$1_RouterOffer as RouterOffer, RouterOffer$1_RouterOfferSchema as RouterOfferSchema, from$1 as from, RouterOffer$1_fromSnakeCase as fromSnakeCase, RouterOffer$1_random as random, RouterOffer$1_toSnakeCase as toSnakeCase };
+  export { RouterOffer$1_InvalidRouterOfferError as InvalidRouterOfferError, type RouterOffer$1_OfferConsumed as OfferConsumed, type RouterOffer$1_OfferMetadata as OfferMetadata, type RouterOffer$1_OfferStatus as OfferStatus, RouterOffer$1_OfferStatusValues as OfferStatusValues, type RouterOffer$1_RouterOffer as RouterOffer, RouterOffer$1_RouterOfferSchema as RouterOfferSchema, RouterOffer$1_consumedEvent as consumedEvent, from$1 as from, RouterOffer$1_fromConsumedLog as fromConsumedLog, RouterOffer$1_fromSnakeCase as fromSnakeCase, RouterOffer$1_random as random, RouterOffer$1_toSnakeCase as toSnakeCase };
 }
 
 type OfferResponse = {
@@ -423,6 +467,7 @@ type OfferStore = {
         metadata?: OfferMetadata;
     }) => Promise<void>;
     updateConsumedAmount: (parameters: {
+        id: string;
         chainId: Offer.Offer["chainId"];
         offering: Offer.Offer["offering"];
         nonce: Offer.Offer["nonce"];
@@ -431,13 +476,13 @@ type OfferStore = {
     /** Persist latest indexing progress for a chain and event type. */
     saveLatestBlockNumberProcessed: (parameters: {
         chainId: Offer.Offer["chainId"];
-        eventType: "offer_created" | "offer_matched";
+        eventType: "offer_created" | "offer_consumed";
         latestBlockNumber: number;
     }) => Promise<void>;
     /** Retrieve latest indexing progress for a chain and event type. */
     getLatestBlockNumberProcessed: (parameters: {
         chainId: Offer.Offer["chainId"];
-        eventType: "offer_created" | "offer_matched";
+        eventType: "offer_created" | "offer_consumed";
     }) => Promise<{
         latestBlockNumber: number;
     } | null>;
@@ -674,13 +719,15 @@ declare namespace Logger$1 {
   export { type Logger$1_LogFn as LogFn, type Logger$1_LogLevel as LogLevel, Logger$1_LogLevelValues as LogLevelValues, type Logger$1_Logger as Logger, Logger$1_defaultLogger as defaultLogger, Logger$1_getLogger as getLogger, Logger$1_runWithLogger as runWithLogger };
 }
 
-declare const types: readonly ["offer_created", "offer_matched", "offer_validation"];
+declare const types: readonly ["offer_created", "offer_consumed", "offer_validation"];
 type Type = (typeof types)[number];
 type BaseEvent<type extends Type = Type> = {
     readonly id: string;
     readonly type: type;
 };
-type RouterEvent<type extends Type = Type> = type extends "offer_created" | "offer_matched" | "offer_validation" ? Compute<BaseEvent<type> & {
+type RouterEvent<type extends Type = Type> = type extends "offer_consumed" ? Compute<BaseEvent<type> & {
+    readonly offerConsumed: OfferConsumed;
+}> : type extends "offer_created" | "offer_validation" ? Compute<BaseEvent<type> & {
     readonly offer: Offer.Offer;
 }> : never;
 /**

package/dist/index.node.js

@@ -29,7 +29,7 @@ var chainNames = ["ethereum", "base", "ethereum-virtual-testnet"];
 var ChainId = {
   ETHEREUM: BigInt(chains$1.mainnet.id),
   BASE: BigInt(chains$1.base.id),
-  "ETHEREUM-VIRTUAL-TESTNET": 121212n
+  "ETHEREUM-VIRTUAL-TESTNET": 109111114n
 };
 var chainIds = new Set(Object.values(ChainId));
 var chainNameLookup = new Map(Object.entries(ChainId).map(([key, value]) => [value, key]));
@@ -53,7 +53,8 @@ var chains = {
         // DAI
       ].map((address) => address.toLowerCase())
     ),
-    morpho: "0x0000000000000000000000000000000000000000"
+    morpho: "0x0000000000000000000000000000000000000000",
+    termsContract: "0x0000000000000000000000000000000000000000"
   },
   base: {
     ...chains$1.base,
@@ -67,11 +68,12 @@ var chains = {
         // DAI
       ].map((address) => address.toLowerCase())
     ),
-    morpho: "0x0000000000000000000000000000000000000000"
+    morpho: "0x0000000000000000000000000000000000000000",
+    termsContract: "0x0000000000000000000000000000000000000000"
   },
   "ethereum-virtual-testnet": {
     ...chains$1.mainnet,
-    id: 121212n,
+    id: 109111114n,
     name: "ethereum-virtual-testnet",
     whitelistedAssets: new Set(
       [
@@ -82,9 +84,10 @@ var chains = {
       ].map((address) => address.toLowerCase())
     ),
     morpho: "0x0000000000000000000000000000000000000000",
+    termsContract: "0xa85d462ceb11d6f91f003072fdc701b0a1bbd8bd",
     mempool: {
       address: "0x7be3164eeee8b35092f6128ec32c2e6ff8f6c890",
-      deploymentBlock: 23225668,
+      deploymentBlock: 23223727,
       reindexBuffer: 10
     }
   }
@@ -106,7 +109,9 @@ __export(RouterOffer_exports, {
   InvalidRouterOfferError: () => InvalidRouterOfferError,
   OfferStatusValues: () => OfferStatusValues,
   RouterOfferSchema: () => RouterOfferSchema,
+  consumedEvent: () => consumedEvent,
   from: () => from,
+  fromConsumedLog: () => fromConsumedLog,
   fromSnakeCase: () => fromSnakeCase,
   random: () => random,
   toSnakeCase: () => toSnakeCase
@@ -124,6 +129,16 @@ var RouterOfferSchema = (parameters) => mempool.Offer.OfferSchema(parameters).ex
     issue: v4.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);
@@ -151,6 +166,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 mempool.Errors.BaseError {
   name = "RouterOffer.InvalidRouterOfferError";
   constructor(error2) {
@@ -1111,6 +1136,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;
@@ -1444,12 +1470,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);
     },
@@ -1689,9 +1718,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 };
 }