@morpho-dev/router 0.0.13 → 0.0.14

package/dist/index.node.js

@@ -4,6 +4,7 @@ var mempool = require('@morpho-dev/mempool');
 var chains$1 = require('viem/chains');
 var v4 = require('zod/v4');
 var zodOpenapi = require('zod-openapi');
+var viem = require('viem');
 var nodeServer = require('@hono/node-server');
 var hono = require('hono');
 var drizzle_orm_star = require('drizzle-orm');
@@ -17,7 +18,6 @@ var pg = require('pg');
 var pgCore = require('drizzle-orm/pg-core');
 var blueSdkViem = require('@morpho-org/blue-sdk-viem');
 var fs = require('fs');
-var viem = require('viem');
 var nc = require('crypto');
 var accounts = require('viem/accounts');
 var utils = require('viem/utils');
@@ -68,11 +68,11 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to, from, except, desc3) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
+var __copyProps = (to, from2, except, desc3) => {
+  if (from2 && typeof from2 === "object" || typeof from2 === "function") {
+    for (let key of __getOwnPropNames(from2))
       if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc3 = __getOwnPropDesc(from, key)) || desc3.enumerable });
+        __defProp(to, key, { get: () => from2[key], enumerable: !(desc3 = __getOwnPropDesc(from2, key)) || desc3.enumerable });
   }
   return to;
 };
@@ -7012,7 +7012,7 @@ var require_from = __commonJS({
       return (hint === "string" ? String : Number)(input);
     }
     var ERR_INVALID_ARG_TYPE = require_errors().codes.ERR_INVALID_ARG_TYPE;
-    function from(Readable2, iterable, opts) {
+    function from2(Readable2, iterable, opts) {
       var iterator;
       if (iterable && typeof iterable.next === "function") {
         iterator = iterable;
@@ -7051,7 +7051,7 @@ var require_from = __commonJS({
       }
       return readable;
     }
-    module2.exports = from;
+    module2.exports = from2;
   }
 });
 
@@ -7094,7 +7094,7 @@ var require_stream_readable = __commonJS({
     var ERR_STREAM_UNSHIFT_AFTER_END_EVENT = _require$codes.ERR_STREAM_UNSHIFT_AFTER_END_EVENT;
     var StringDecoder;
     var createReadableStreamAsyncIterator;
-    var from;
+    var from2;
     require_inherits()(Readable2, Stream);
     var errorOrDestroy = destroyImpl.errorOrDestroy;
     var kProxyEvents = ["error", "close", "destroy", "pause", "resume"];
@@ -7772,10 +7772,10 @@ var require_stream_readable = __commonJS({
     }
     if (typeof Symbol === "function") {
       Readable2.from = function(iterable, opts) {
-        if (from === void 0) {
-          from = require_from();
+        if (from2 === void 0) {
+          from2 = require_from();
         }
-        return from(Readable2, iterable, opts);
+        return from2(Readable2, iterable, opts);
       };
     }
     function indexOf(xs, x) {
@@ -7952,8 +7952,8 @@ var require_pipeline = __commonJS({
     function call(fn) {
       fn();
     }
-    function pipe(from, to) {
-      return from.pipe(to);
+    function pipe(from2, to) {
+      return from2.pipe(to);
     }
     function popCallback(streams) {
       if (!streams.length) return noop;
@@ -8142,6 +8142,7 @@ __export(index_node_exports, {
   Validation: () => Validation_exports,
   ValidationRule: () => ValidationRule_exports,
   batch: () => batch,
+  consumed: () => consumed,
   decodeCursor: () => decodeCursor,
   encodeCursor: () => encodeCursor,
   offerCollaterals: () => offerCollaterals,
@@ -8217,7 +8218,13 @@ __export(apiSchema_exports, {
 // src/RouterOffer.ts
 var RouterOffer_exports = {};
 __export(RouterOffer_exports, {
-  OfferStatusValues: () => OfferStatusValues
+  InvalidRouterOfferError: () => InvalidRouterOfferError,
+  OfferStatusValues: () => OfferStatusValues,
+  RouterOfferSchema: () => RouterOfferSchema,
+  from: () => from,
+  fromSnakeCase: () => fromSnakeCase,
+  random: () => random,
+  toSnakeCase: () => toSnakeCase
 });
 var OfferStatusValues = [
   "valid",
@@ -8225,6 +8232,46 @@ var OfferStatusValues = [
   "callback_error",
   "unverified"
 ];
+var RouterOfferSchema = (parameters) => mempool.Offer.OfferSchema(parameters).extend({
+  consumed: v4.z.bigint({ coerce: true }).min(0n).max(viem.maxUint256),
+  status: v4.z.enum(OfferStatusValues),
+  metadata: v4.z.object({
+    issue: v4.z.string()
+  }).optional()
+});
+function from(input) {
+  try {
+    const parsedOffer = RouterOfferSchema({ omitHash: true }).parse(input);
+    const parsedHash = mempool.Offer.OfferHashSchema.parse(mempool.Offer.hash(parsedOffer));
+    return {
+      ...parsedOffer,
+      hash: parsedHash
+    };
+  } catch (error) {
+    throw new InvalidRouterOfferError(error);
+  }
+}
+function fromSnakeCase(input) {
+  return from(mempool.Format.fromSnakeCase(input));
+}
+function toSnakeCase(offer) {
+  return mempool.Format.toSnakeCase(offer);
+}
+function random() {
+  const baseOffer = mempool.Offer.random();
+  return from({
+    ...baseOffer,
+    status: "valid",
+    metadata: void 0,
+    consumed: 0n
+  });
+}
+var InvalidRouterOfferError = class extends mempool.Errors.BaseError {
+  name = "RouterOffer.InvalidRouterOfferError";
+  constructor(error) {
+    super("Invalid router offer.", { cause: error });
+  }
+};
 
 // src/utils/batch.ts
 function* batch(array, batchSize) {
@@ -8925,14 +8972,7 @@ async function get(config, parameters) {
   const { cursor: returnedCursor, data: offers2 } = await getApi(config, url);
   return {
     cursor: returnedCursor,
-    offers: offers2.map((offer) => {
-      const baseOffer = mempool.Offer.fromSnakeCase(offer);
-      return {
-        ...baseOffer,
-        status: offer.status,
-        metadata: offer.metadata
-      };
-    })
+    offers: offers2.map(fromSnakeCase)
   };
 }
 async function match(config, parameters) {
@@ -8973,14 +9013,7 @@ async function match(config, parameters) {
   const { cursor: returnedCursor, data: offers2 } = await getApi(config, url);
   return {
     cursor: returnedCursor,
-    offers: offers2.map((offer) => {
-      const baseOffer = mempool.Offer.fromSnakeCase(offer);
-      return {
-        ...baseOffer,
-        status: offer.status,
-        metadata: offer.metadata
-      };
-    })
+    offers: offers2.map(fromSnakeCase)
   };
 }
 async function getApi(config, url) {
@@ -9069,6 +9102,7 @@ var OfferDB_exports2 = {};
 __export(OfferDB_exports2, {
   OfferDB: () => OfferDB_exports,
   OfferRepository: () => OfferRepository_exports,
+  consumed: () => consumed,
   offerCollaterals: () => offerCollaterals,
   offerStatus: () => offerStatus,
   offers: () => offers
@@ -9087,6 +9121,7 @@ __export(OfferDB_exports, {
 // src/OfferDB/schema.ts
 var schema_exports = {};
 __export(schema_exports, {
+  consumed: () => consumed,
   offerCollaterals: () => offerCollaterals,
   offerStatus: () => offerStatus,
   offers: () => offers
@@ -9158,6 +9193,25 @@ var offerStatus = pgCore.pgTable(
     pgCore.index("offer_status_status_idx").on(table.status)
   ]
 );
+var consumed = pgCore.pgTable(
+  "consumed_per_user_and_nonce",
+  {
+    id: pgCore.serial("id").primaryKey(),
+    chainId: pgCore.bigint("chain_id", { mode: "bigint" }).notNull(),
+    offering: pgCore.varchar("offering", { length: 42 }).notNull(),
+    nonce: pgCore.bigint("nonce", { mode: "bigint" }).notNull(),
+    consumed: pgCore.bigint("consumed", { mode: "bigint" }).notNull(),
+    createdAt: pgCore.timestamp("created_at").defaultNow().notNull()
+  },
+  (table) => [
+    pgCore.index("consumed_per_user_and_nonce_chain_id_offering_nonce_created_at_idx").on(
+      table.chainId,
+      table.offering,
+      table.nonce,
+      drizzle_orm_star.desc(table.createdAt)
+    )
+  ]
+);
 
 // src/OfferDB/OfferDB.ts
 function create({
@@ -9241,6 +9295,22 @@ function create2(config) {
           status,
           metadata
         });
+        const consumedAmountExists = await tx.select().from(consumed).where(
+          drizzle_orm_star.and(
+            drizzle_orm_star.eq(consumed.offering, offer.offering.toLowerCase()),
+            drizzle_orm_star.eq(consumed.nonce, offer.nonce),
+            drizzle_orm_star.eq(consumed.chainId, offer.chainId)
+          )
+        );
+        if (consumedAmountExists.length > 0) {
+          return offer.hash;
+        }
+        await tx.insert(consumed).values({
+          chainId: offer.chainId,
+          offering: offer.offering.toLowerCase(),
+          nonce: offer.nonce,
+          consumed: 0n
+        });
         return offer.hash;
       });
     },
@@ -9279,6 +9349,23 @@ function create2(config) {
             status,
             metadata
           });
+          const consumedAmountExists = await tx.select().from(consumed).where(
+            drizzle_orm_star.and(
+              drizzle_orm_star.eq(consumed.offering, offer.offering.toLowerCase()),
+              drizzle_orm_star.eq(consumed.nonce, offer.nonce),
+              drizzle_orm_star.eq(consumed.chainId, offer.chainId)
+            )
+          );
+          if (consumedAmountExists.length > 0) {
+            hashes.push(offer.hash);
+            continue;
+          }
+          await tx.insert(consumed).values({
+            chainId: offer.chainId,
+            offering: offer.offering.toLowerCase(),
+            nonce: offer.nonce,
+            consumed: 0n
+          });
           hashes.push(offer.hash);
         }
         return hashes;
@@ -9414,10 +9501,22 @@ function create2(config) {
         status: offerStatus.status,
         metadata: offerStatus.metadata
       }).from(offerStatus).where(drizzle_orm_star.eq(offerStatus.offerHash, offers.hash)).orderBy(drizzle_orm_star.desc(offerStatus.createdAt)).limit(1).as("latest_status");
+      const latestConsumed = db.selectDistinctOn(
+        [
+          consumed.offering,
+          consumed.nonce,
+          consumed.chainId,
+          consumed.createdAt
+        ],
+        {
+          consumed: consumed.consumed
+        }
+      ).from(consumed).orderBy(drizzle_orm_star.desc(consumed.createdAt)).limit(1).as("latest_consumed");
       const results = await db.select({
         hash: offers.hash,
         offering: offers.offering,
         assets: offers.assets,
+        consumed: latestConsumed.consumed,
         rate: offers.rate,
         maturity: offers.maturity,
         expiry: offers.expiry,
@@ -9436,10 +9535,11 @@ function create2(config) {
         collateralLltv: offerCollaterals.lltv,
         status: latestStatus.status,
         metadata: latestStatus.metadata
-      }).from(offers).leftJoin(offerCollaterals, drizzle_orm_star.eq(offers.hash, offerCollaterals.offerHash)).leftJoinLateral(latestStatus, drizzle_orm_star.sql`true`).where(
+      }).from(offers).leftJoin(offerCollaterals, drizzle_orm_star.eq(offers.hash, offerCollaterals.offerHash)).leftJoinLateral(latestStatus, drizzle_orm_star.sql`true`).leftJoinLateral(latestConsumed, drizzle_orm_star.sql`true`).where(
         drizzle_orm_star.and(
           conditions.length > 0 ? drizzle_orm_star.and(...conditions) : drizzle_orm_star.sql`true`,
-          query?.status && query.status.length > 0 ? drizzle_orm_star.inArray(latestStatus.status, query.status) : drizzle_orm_star.eq(latestStatus.status, "valid")
+          query?.status && query.status.length > 0 ? drizzle_orm_star.inArray(latestStatus.status, query.status) : drizzle_orm_star.eq(latestStatus.status, "valid"),
+          drizzle_orm_star.sql`( ${offers.assets} - COALESCE(${latestConsumed.consumed}, 0) ) > 0`
         )
       ).orderBy(sortOrder === "asc" ? drizzle_orm_star.asc(sortColumn) : drizzle_orm_star.desc(sortColumn)).limit(limit);
       const offerMap = /* @__PURE__ */ new Map();
@@ -9448,6 +9548,7 @@ function create2(config) {
           hash: row.hash,
           offering: row.offering,
           assets: row.assets,
+          consumed: row.consumed || 0n,
           rate: row.rate,
           maturity: row.maturity,
           expiry: row.expiry,
@@ -9524,6 +9625,7 @@ function create2(config) {
         });
         transformedResults.push({
           ...offer,
+          consumed: offerData.consumed,
           status: offerData.status,
           ...offerData.metadata !== null ? { metadata: offerData.metadata } : {}
         });
@@ -9623,29 +9725,83 @@ function create2(config) {
         status: offerStatus.status,
         metadata: offerStatus.metadata
       }).from(offerStatus).where(drizzle_orm_star.eq(offerStatus.offerHash, offers.hash)).orderBy(drizzle_orm_star.desc(offerStatus.createdAt)).limit(1).as("latest_status");
+      const latestConsumed = db.selectDistinctOn(
+        [
+          consumed.offering,
+          consumed.nonce,
+          consumed.chainId,
+          consumed.createdAt
+        ],
+        {
+          consumed: consumed.consumed
+        }
+      ).from(consumed).orderBy(drizzle_orm_star.desc(consumed.createdAt)).limit(1).as("latest_consumed");
       const statusCondition = status && status.length > 0 ? drizzle_orm_star.inArray(latestStatus.status, status) : drizzle_orm_star.eq(latestStatus.status, "valid");
+      const bestOffers = db.selectDistinctOn(
+        // group key
+        [offers.offering, offers.nonce, offers.buy],
+        {
+          hash: offers.hash,
+          offering: offers.offering,
+          assets: offers.assets,
+          consumed: latestConsumed.consumed,
+          rate: offers.rate,
+          maturity: offers.maturity,
+          expiry: offers.expiry,
+          start: offers.start,
+          nonce: offers.nonce,
+          buy: offers.buy,
+          chainId: offers.chainId,
+          loanToken: offers.loanToken,
+          callbackAddress: offers.callbackAddress,
+          callbackData: offers.callbackData,
+          callbackGasLimit: offers.callbackGasLimit,
+          signature: offers.signature,
+          status: latestStatus.status,
+          metadata: latestStatus.metadata
+        }
+      ).from(offers).leftJoinLateral(latestStatus, drizzle_orm_star.sql`true`).leftJoinLateral(latestConsumed, drizzle_orm_star.sql`true`).where(
+        drizzle_orm_star.and(
+          drizzle_orm_star.and(...conditions),
+          statusCondition,
+          drizzle_orm_star.sql`( ${offers.assets} - COALESCE(${latestConsumed.consumed}, 0) ) > 0`
+        )
+      ).orderBy(
+        offers.offering,
+        offers.nonce,
+        offers.buy,
+        // 1 price (direction depends on side)
+        drizzle_orm_star.sql`CASE WHEN ${offers.buy} THEN ${offers.rate} ELSE -${offers.rate} END`,
+        // 2 size (remaining)
+        drizzle_orm_star.sql`( ${offers.assets} - COALESCE(${latestConsumed.consumed}, 0) ) DESC`,
+        // 3 term (longer maturity)
+        drizzle_orm_star.desc(offers.maturity)
+      ).as("best_offers");
       const rows = await db.select({
-        hash: offers.hash,
-        offering: offers.offering,
-        assets: offers.assets,
-        rate: offers.rate,
-        maturity: offers.maturity,
-        expiry: offers.expiry,
-        start: offers.start,
-        nonce: offers.nonce,
-        buy: offers.buy,
-        chainId: offers.chainId,
-        loanToken: offers.loanToken,
-        callbackAddress: offers.callbackAddress,
-        callbackData: offers.callbackData,
-        callbackGasLimit: offers.callbackGasLimit,
-        signature: offers.signature,
-        status: latestStatus.status,
-        metadata: latestStatus.metadata,
+        hash: bestOffers.hash,
+        offering: bestOffers.offering,
+        assets: bestOffers.assets,
+        consumed: bestOffers.consumed,
+        rate: bestOffers.rate,
+        maturity: bestOffers.maturity,
+        expiry: bestOffers.expiry,
+        start: bestOffers.start,
+        nonce: bestOffers.nonce,
+        buy: bestOffers.buy,
+        chainId: bestOffers.chainId,
+        loanToken: bestOffers.loanToken,
+        callbackAddress: bestOffers.callbackAddress,
+        callbackData: bestOffers.callbackData,
+        callbackGasLimit: bestOffers.callbackGasLimit,
+        signature: bestOffers.signature,
+        status: bestOffers.status,
+        metadata: bestOffers.metadata,
         collateralAsset: offerCollaterals.asset,
         collateralOracle: offerCollaterals.oracle,
         collateralLltv: offerCollaterals.lltv
-      }).from(offers).leftJoin(offerCollaterals, drizzle_orm_star.eq(offers.hash, offerCollaterals.offerHash)).leftJoinLateral(latestStatus, drizzle_orm_star.sql`true`).where(drizzle_orm_star.and(drizzle_orm_star.and(...conditions), statusCondition)).orderBy(sortOrder === "asc" ? drizzle_orm_star.asc(offers.rate) : drizzle_orm_star.desc(offers.rate)).limit(limit + 1);
+      }).from(bestOffers).leftJoin(offerCollaterals, drizzle_orm_star.eq(bestOffers.hash, offerCollaterals.offerHash)).orderBy(
+        sortOrder === "asc" ? drizzle_orm_star.sql`CASE WHEN ${bestOffers.buy} THEN ${bestOffers.rate} ELSE -${bestOffers.rate} END ASC` : drizzle_orm_star.sql`CASE WHEN ${bestOffers.buy} THEN -${bestOffers.rate} ELSE ${bestOffers.rate} END DESC`
+      ).limit(limit + 1);
       const offerMap = /* @__PURE__ */ new Map();
       for (const r of rows) {
         const entry = offerMap.get(r.hash) ?? { base: r, collaterals: [] };
@@ -9684,6 +9840,7 @@ function create2(config) {
           },
           signature: base2.signature === null ? void 0 : base2.signature
         }),
+        consumed: base2.consumed || 0n,
         status: base2.status,
         ...base2.metadata ? { metadata: base2.metadata } : {}
       }));
@@ -9717,6 +9874,9 @@ function create2(config) {
     },
     updateStatus: async (parameters) => {
       await db.insert(offerStatus).values(parameters);
+    },
+    updateConsumedAmount: async (parameters) => {
+      await db.insert(consumed).values(parameters);
     }
   };
 }
@@ -9729,6 +9889,8 @@ function createTest() {
     delete: async (_hash) => false,
     deleteMany: async (_hashes) => 0,
     updateStatus: async (_params) => {
+    },
+    updateConsumedAmount: async (_params) => {
     }
   };
 }
@@ -11414,15 +11576,15 @@ function weierstrassPoints(opts) {
       throw new Error("ProjectivePoint expected");
   }
   const toAffineMemo = memoized((p, iz) => {
-    const { px: x, py: y, pz: z5 } = p;
-    if (Fp5.eql(z5, Fp5.ONE))
+    const { px: x, py: y, pz: z6 } = p;
+    if (Fp5.eql(z6, Fp5.ONE))
       return { x, y };
     const is0 = p.is0();
     if (iz == null)
-      iz = is0 ? Fp5.ONE : Fp5.inv(z5);
+      iz = is0 ? Fp5.ONE : Fp5.inv(z6);
     const ax = Fp5.mul(x, iz);
     const ay = Fp5.mul(y, iz);
-    const zz = Fp5.mul(z5, iz);
+    const zz = Fp5.mul(z6, iz);
     if (is0)
       return { x: Fp5.ZERO, y: Fp5.ZERO };
     if (!Fp5.eql(zz, Fp5.ONE))
@@ -11837,7 +11999,7 @@ function weierstrass(curveDef) {
   function normalizeS(s) {
     return isBiggerThanHalfOrder(s) ? modN(-s) : s;
   }
-  const slcNum = (b, from, to) => bytesToNumberBE(b.slice(from, to));
+  const slcNum = (b, from2, to) => bytesToNumberBE(b.slice(from2, to));
   class Signature {
     constructor(r, s, recovery) {
       aInRange("r", r, _1n4, CURVE_ORDER);
@@ -13089,25 +13251,25 @@ var isValidAddress = function(hexAddress) {
   }
   return /^0x[0-9a-fA-F]{40}$/.test(hexAddress);
 };
-var generateAddress = function(from, nonce) {
-  assertIsBytes(from);
+var generateAddress = function(from2, nonce) {
+  assertIsBytes(from2);
   assertIsBytes(nonce);
   if (bytesToBigInt(nonce) === BIGINT_02) {
-    return keccak256(RLP.encode([from, Uint8Array.from([])])).subarray(-20);
+    return keccak256(RLP.encode([from2, Uint8Array.from([])])).subarray(-20);
   }
-  return keccak256(RLP.encode([from, nonce])).subarray(-20);
+  return keccak256(RLP.encode([from2, nonce])).subarray(-20);
 };
-var generateAddress2 = function(from, salt, initCode) {
-  assertIsBytes(from);
+var generateAddress2 = function(from2, salt, initCode) {
+  assertIsBytes(from2);
   assertIsBytes(salt);
   assertIsBytes(initCode);
-  if (from.length !== 20) {
+  if (from2.length !== 20) {
     throw EthereumJSErrorWithoutCode("Expected from to be of length 20");
   }
   if (salt.length !== 32) {
     throw EthereumJSErrorWithoutCode("Expected salt to be of length 32");
   }
-  const address = keccak256(concatBytes4(hexToBytes5("0xff"), from, salt, keccak256(initCode)));
+  const address = keccak256(concatBytes4(hexToBytes5("0xff"), from2, salt, keccak256(initCode)));
   return address.subarray(-20);
 };
 var pubToAddress = function(pubKey, sanitize = false) {
@@ -20978,7 +21140,7 @@ async function precompile0a(opts) {
   const version2 = Number(opts.common.param("blobCommitmentVersionKzg"));
   const fieldElementsPerBlob = opts.common.param("fieldElementsPerBlob");
   const versionedHash = bytesToHex4(opts.data.subarray(0, 32));
-  const z5 = bytesToHex4(opts.data.subarray(32, 64));
+  const z6 = bytesToHex4(opts.data.subarray(32, 64));
   const y = bytesToHex4(opts.data.subarray(64, 96));
   const commitment = bytesToHex4(opts.data.subarray(96, 144));
   const kzgProof = bytesToHex4(opts.data.subarray(144, 192));
@@ -20989,10 +21151,10 @@ async function precompile0a(opts) {
     return EVMErrorResult(new EVMError(EVMError.errorMessages.INVALID_COMMITMENT), opts.gasLimit);
   }
   if (opts._debug !== void 0) {
-    opts._debug(`${pName}: proof verification with commitment=${commitment} z=${z5} y=${y} kzgProof=${kzgProof}`);
+    opts._debug(`${pName}: proof verification with commitment=${commitment} z=${z6} y=${y} kzgProof=${kzgProof}`);
   }
   try {
-    const res = opts.common.customCrypto?.kzg?.verifyProof(commitment, z5, y, kzgProof);
+    const res = opts.common.customCrypto?.kzg?.verifyProof(commitment, z6, y, kzgProof);
     if (res === false) {
       return EVMErrorResult(new EVMError(EVMError.errorMessages.INVALID_PROOF), opts.gasLimit);
     }
@@ -22394,15 +22556,15 @@ function weierstrassN(CURVE, curveOpts = {}) {
       throw new Error("ProjectivePoint expected");
   }
   const toAffineMemo = memoized2((p, iz) => {
-    const { px: x, py: y, pz: z5 } = p;
-    if (Fp5.eql(z5, Fp5.ONE))
+    const { px: x, py: y, pz: z6 } = p;
+    if (Fp5.eql(z6, Fp5.ONE))
       return { x, y };
     const is0 = p.is0();
     if (iz == null)
-      iz = is0 ? Fp5.ONE : Fp5.inv(z5);
+      iz = is0 ? Fp5.ONE : Fp5.inv(z6);
     const ax = Fp5.mul(x, iz);
     const ay = Fp5.mul(y, iz);
-    const zz = Fp5.mul(z5, iz);
+    const zz = Fp5.mul(z6, iz);
     if (is0)
       return { x: Fp5.ZERO, y: Fp5.ZERO };
     if (!Fp5.eql(zz, Fp5.ONE))
@@ -24054,13 +24216,13 @@ var { Fp, Fp2, Fp6, Fp4Square, Fp12 } = tower12({
     };
   },
   Fp12cyclotomicExp(num, n) {
-    let z5 = Fp12.ONE;
+    let z6 = Fp12.ONE;
     for (let i = BLS_X_LEN - 1; i >= 0; i--) {
-      z5 = Fp12._cyclotomicSquare(z5);
+      z6 = Fp12._cyclotomicSquare(z6);
       if (bitGet(n, i))
-        z5 = Fp12.mul(z5, num);
+        z6 = Fp12.mul(z6, num);
     }
-    return z5;
+    return z6;
   },
   // https://eprint.iacr.org/2010/354.pdf
   // https://eprint.iacr.org/2009/565.pdf
@@ -24241,7 +24403,7 @@ function pointG2FromBytes(bytes2) {
   sort && infinity && compressed) {
     throw new Error("invalid encoding flag: " + (bytes2[0] & 224));
   }
-  const slc = (b, from, to) => bytesToNumberBE2(b.slice(from, to));
+  const slc = (b, from2, to) => bytesToNumberBE2(b.slice(from2, to));
   if (value.length === 96 && compressed) {
     if (infinity) {
       if (value.reduce((p, c) => p !== 0 ? c + 1 : c, 0) > 0) {
@@ -25147,16 +25309,16 @@ var Kr160 = /* @__PURE__ */ Uint32Array.from([
   2053994217,
   0
 ]);
-function ripemd_f(group, x, y, z5) {
+function ripemd_f(group, x, y, z6) {
   if (group === 0)
-    return x ^ y ^ z5;
+    return x ^ y ^ z6;
   if (group === 1)
-    return x & y | ~x & z5;
+    return x & y | ~x & z6;
   if (group === 2)
-    return (x | ~y) ^ z5;
+    return (x | ~y) ^ z6;
   if (group === 3)
-    return x & z5 | y & ~z5;
-  return x ^ (y | ~z5);
+    return x & z6 | y & ~z6;
+  return x ^ (y | ~z6);
 }
 var BUF_160 = /* @__PURE__ */ new Uint32Array(16);
 var RIPEMD160 = class extends HashMD {
@@ -25980,13 +26142,13 @@ var { Fp: Fp3, Fp2: Fp22, Fp6: Fp62, Fp4Square: Fp4Square2, Fp12: Fp122 } = towe
     };
   },
   Fp12cyclotomicExp(num, n) {
-    let z5 = Fp122.ONE;
+    let z6 = Fp122.ONE;
     for (let i = BN_X_LEN - 1; i >= 0; i--) {
-      z5 = Fp122._cyclotomicSquare(z5);
+      z6 = Fp122._cyclotomicSquare(z6);
       if (bitGet(n, i))
-        z5 = Fp122.mul(z5, num);
+        z6 = Fp122.mul(z6, num);
     }
-    return z5;
+    return z6;
   },
   // https://eprint.iacr.org/2010/354.pdf
   // https://eprint.iacr.org/2009/565.pdf
@@ -36020,14 +36182,14 @@ var createAddress = (address) => {
     });
   }
 };
-var createContractAddress = (from, nonce) => {
-  if (!(from.bytes instanceof Uint8Array)) {
+var createContractAddress = (from2, nonce) => {
+  if (!(from2.bytes instanceof Uint8Array)) {
     throw new InvalidAddressError("Expected from to be an Address or ethereumjs Address");
   }
   if (nonce === 0n) {
-    return createAddress(utils.keccak256(utils.toRlp([from.bytes, Uint8Array.from([])]), "bytes").subarray(-20));
+    return createAddress(utils.keccak256(utils.toRlp([from2.bytes, Uint8Array.from([])]), "bytes").subarray(-20));
   }
-  return createAddress(utils.keccak256(utils.toRlp([from.bytes, viem.numberToBytes(nonce)]), "bytes").subarray(-20));
+  return createAddress(utils.keccak256(utils.toRlp([from2.bytes, viem.numberToBytes(nonce)]), "bytes").subarray(-20));
 };
 
 // ../../node_modules/.pnpm/@ethereumjs+tx@10.0.0/node_modules/@ethereumjs/tx/dist/esm/types.js
@@ -40463,13 +40625,13 @@ function weierstrassPoints3(opts) {
     // Can accept precomputed Z^-1 - for example, from invertBatch.
     // (x, y, z) ∋ (x=x/z, y=y/z)
     toAffine(iz) {
-      const { px: x, py: y, pz: z5 } = this;
+      const { px: x, py: y, pz: z6 } = this;
       const is0 = this.is0();
       if (iz == null)
-        iz = is0 ? Fp5.ONE : Fp5.inv(z5);
+        iz = is0 ? Fp5.ONE : Fp5.inv(z6);
       const ax = Fp5.mul(x, iz);
       const ay = Fp5.mul(y, iz);
-      const zz = Fp5.mul(z5, iz);
+      const zz = Fp5.mul(z6, iz);
       if (is0)
         return { x: Fp5.ZERO, y: Fp5.ZERO };
       if (!Fp5.eql(zz, Fp5.ONE))
@@ -40589,7 +40751,7 @@ function weierstrass3(curveDef) {
   function normalizeS(s) {
     return isBiggerThanHalfOrder(s) ? modN(-s) : s;
   }
-  const slcNum = (b, from, to) => bytesToNumberBE3(b.slice(from, to));
+  const slcNum = (b, from2, to) => bytesToNumberBE3(b.slice(from2, to));
   class Signature {
     constructor(r, s, recovery) {
       this.r = r;
@@ -47440,10 +47602,10 @@ var ReceiptsManager = class _ReceiptsManager {
    * // Get logs with specific topics
    * const logs = await receiptManager.getLogs(block100, block200, undefined, [eventTopic])
    */
-  async getLogs(from, to, addresses, topics = []) {
+  async getLogs(from2, to, addresses, topics = []) {
     const returnedLogs = [];
     let returnedLogsSize = 0;
-    for (let i = from.header.number; i <= to.header.number; i++) {
+    for (let i = from2.header.number; i <= to.header.number; i++) {
       const block = await getBlock(this.chain)(i);
       const receipts = await this.getReceipts(block.hash());
       if (receipts.length === 0) continue;
@@ -54418,7 +54580,7 @@ var anvilStopImpersonatingAccountJsonRpcProcedure = (client) => {
 };
 var ethCreateAccessListProcedure = (client) => async (req) => {
   const [tx, blockTag] = req.params;
-  const { data, from, to, gas, gasPrice, value } = tx;
+  const { data, from: from2, to, gas, gasPrice, value } = tx;
   const response = await callProcedure(client)({
     ...req.id !== void 0 ? { id: req.id } : {},
     jsonrpc: req.jsonrpc,
@@ -54430,7 +54592,7 @@ var ethCreateAccessListProcedure = (client) => async (req) => {
         ...gas !== void 0 ? { gas } : {},
         ...value !== void 0 ? { value } : {},
         ...to !== void 0 ? { to } : {},
-        ...from !== void 0 ? { from } : {},
+        ...from2 !== void 0 ? { from: from2 } : {},
         ...blockTag !== void 0 ? { blockTag } : {},
         createAccessList: true
       }
@@ -54820,7 +54982,7 @@ var ethBlobBaseFeeJsonRpcProcedure = (client) => {
 };
 var ethCallProcedure = (client) => async (req) => {
   const [tx, blockTag, stateOverrideSet, blockOverrideSet] = req.params;
-  const { data, from, to, gas, gasPrice, value } = tx;
+  const { data, from: from2, to, gas, gasPrice, value } = tx;
   const response = await callProcedure(client)({
     ...req.id !== void 0 ? { id: req.id } : {},
     jsonrpc: req.jsonrpc,
@@ -54832,7 +54994,7 @@ var ethCallProcedure = (client) => async (req) => {
         ...gas !== void 0 ? { gas } : {},
         ...value !== void 0 ? { value } : {},
         ...to !== void 0 ? { to } : {},
-        ...from !== void 0 ? { from } : {},
+        ...from2 !== void 0 ? { from: from2 } : {},
         ...blockTag !== void 0 ? { blockTag } : {}
       },
       stateOverrideSet,
@@ -56591,14 +56753,14 @@ var debugTraceBlockJsonRpcProcedure = (client) => {
 };
 var debugTraceCallJsonRpcProcedure = (client) => {
   return async (request) => {
-    const { blockTag, tracer, to, gas, data, from, value, timeout, gasPrice, tracerConfig } = request.params[0];
+    const { blockTag, tracer, to, gas, data, from: from2, value, timeout, gasPrice, tracerConfig } = request.params[0];
     if (timeout !== void 0) {
       client.logger.warn("Warning: timeout is currently respected param of debug_traceCall");
     }
     const traceResult = await traceCallHandler(client)({
       tracer,
       ...to !== void 0 ? { to } : {},
-      ...from !== void 0 ? { from } : {},
+      ...from2 !== void 0 ? { from: from2 } : {},
       ...gas !== void 0 ? { gas: typeof gas === "bigint" ? gas : utils.hexToBigInt(gas) } : {},
       ...gasPrice !== void 0 ? { gasPrice: typeof gasPrice === "bigint" ? gasPrice : utils.hexToBigInt(gasPrice) } : {},
       ...value !== void 0 ? { value: typeof value === "bigint" ? value : utils.hexToBigInt(value) } : {},
@@ -57637,6 +57799,7 @@ exports.RouterOffer = RouterOffer_exports;
 exports.Validation = Validation_exports;
 exports.ValidationRule = ValidationRule_exports;
 exports.batch = batch;
+exports.consumed = consumed;
 exports.decodeCursor = decodeCursor;
 exports.encodeCursor = encodeCursor;
 exports.offerCollaterals = offerCollaterals;