envio 3.3.0-alpha.2 → 3.3.0-alpha.4

package/src/TestIndexer.res.mjs

@@ -12,6 +12,7 @@ import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
 import * as Persistence from "./Persistence.res.mjs";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as EntityFilter from "./db/EntityFilter.res.mjs";
+import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as InternalTable from "./db/InternalTable.res.mjs";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
 import * as SimulateItems from "./SimulateItems.res.mjs";
@@ -32,6 +33,27 @@ function toIndexingAddress(dc) {
   };
 }
 
+function getIndexingAddressesByChain(state) {
+  let byChain = {};
+  let dcDict = state.entities[Config.EnvioAddresses.name];
+  if (dcDict !== undefined) {
+    Object.values(dcDict).forEach(entity => {
+      let chainIdStr = entity.chain_id.toString();
+      let arr = byChain[chainIdStr];
+      let contracts;
+      if (arr !== undefined) {
+        contracts = arr;
+      } else {
+        let arr$1 = [];
+        byChain[chainIdStr] = arr$1;
+        contracts = arr$1;
+      }
+      contracts.push(toIndexingAddress(entity));
+    });
+  }
+  return byChain;
+}
+
 function handleLoad(state, tableName, filter) {
   let entityConfig = state.entityConfigs[tableName];
   if (entityConfig === undefined) {
@@ -403,17 +425,11 @@ function makeCreateTestIndexer(config, workerPath) {
             if (state.processInProgress) {
               Stdlib_JsError.throwWithMessage(`Cannot access ` + contract.name + `.addresses while indexer.process() is running. ` + "Wait for process() to complete before reading contract addresses.");
             }
-            let addresses = [];
-            let dcDict = state.entities[Config.EnvioAddresses.name];
-            if (dcDict !== undefined) {
-              Object.values(dcDict).forEach(entity => {
-                if (entity.contract_name === contract.name && entity.chain_id === chainConfig.id) {
-                  addresses.push(Config.EnvioAddresses.getAddress(entity));
-                  return;
-                }
-              });
-            }
-            return addresses;
+            return Stdlib_Array.filterMap(Stdlib_Option.getOr(getIndexingAddressesByChain(state)[chainConfig.id.toString()], []), ia => {
+              if (ia.contractName === contract.name) {
+                return Primitive_option.some(ia.address);
+              }
+            });
           }
         });
         Object.defineProperty(chainObj, contract.name, {
@@ -484,23 +500,7 @@ function makeCreateTestIndexer(config, workerPath) {
         let chainId = param[1];
         let chains = {};
         chains[param[0]] = processChainConfig;
-        let indexingAddressesByChain = {};
-        let dcDict = state.entities[Config.EnvioAddresses.name];
-        if (dcDict !== undefined) {
-          Object.values(dcDict).forEach(entity => {
-            let dcChainIdStr = entity.chain_id.toString();
-            let arr = indexingAddressesByChain[dcChainIdStr];
-            let contracts;
-            if (arr !== undefined) {
-              contracts = arr;
-            } else {
-              let arr$1 = [];
-              indexingAddressesByChain[dcChainIdStr] = arr$1;
-              contracts = arr$1;
-            }
-            contracts.push(toIndexingAddress(entity));
-          });
-        }
+        let indexingAddressesByChain = getIndexingAddressesByChain(state);
         let initialState = makeInitialState(config, chains, indexingAddressesByChain);
         return new Promise((resolve, reject) => {
           let workerData_startBlock = processChainConfig.startBlock;
@@ -586,9 +586,11 @@ function initTestWorker() {
     Process.exit(1);
     return;
   }
+  let initialState = workerData.initialState;
   let simulate = workerData.simulate;
   let endBlock = workerData.endBlock;
-  let chainIdStr = workerData.chainId.toString();
+  let chainId = workerData.chainId;
+  let chainIdStr = chainId.toString();
   let exitAfterFirstEventBlock = Stdlib_Option.isNone(endBlock);
   let resolvedChainDict = {};
   resolvedChainDict["startBlock"] = workerData.startBlock;
@@ -603,7 +605,7 @@ function initTestWorker() {
   let processConfig = {
     chains: resolvedChainsDict
   };
-  let proxy = TestIndexerProxyStorage.make(parentPort, workerData.initialState);
+  let proxy = TestIndexerProxyStorage.make(parentPort, initialState);
   let storage = TestIndexerProxyStorage.makeStorage(proxy);
   let config = Config.loadWithoutRegistrations();
   let persistence = Persistence.make(config.userEntities, config.allEnums, storage);
@@ -613,6 +615,11 @@ function initTestWorker() {
     Logging.setLogLevel("silent");
   }
   let patchConfig = (config, _registrations) => {
+    if (simulate !== undefined) {
+      let chainConfig = ChainMap.get(config.chainMap, ChainMap.Chain.makeUnsafe(chainId));
+      let indexingAddresses = Stdlib_Option.mapOr(initialState.chains.find(c => c.id === chainId), [], c => c.indexingAddresses);
+      SimulateItems.validateSrcAddresses(simulate, config, chainConfig, indexingAddresses);
+    }
     let config$1 = SimulateItems.patchConfig(config, processConfig);
     if (exitAfterFirstEventBlock) {
       return {
@@ -640,11 +647,18 @@ function initTestWorker() {
       return config$1;
     }
   };
-  Main.start(persistence, undefined, true, exitAfterFirstEventBlock, patchConfig);
+  Stdlib_Promise.$$catch(Main.start(persistence, undefined, true, exitAfterFirstEventBlock, patchConfig), exn => {
+    let toThrow = exn.RE_EXN_ID === Main.FatalError ? exn._1 : Utils.prettifyExn(exn);
+    setImmediate(() => {
+      throw toThrow;
+    });
+    return Promise.resolve();
+  });
 }
 
 export {
   toIndexingAddress,
+  getIndexingAddressesByChain,
   handleLoad,
   handleWriteBatch,
   makeInitialState,

package/src/bindings/Performance.res

@@ -0,0 +1,7 @@
+type timeRef = float
+
+@val @scope("performance") external now: unit => timeRef = "now"
+
+let secondsSince = (from: timeRef): float => (now() -. from) /. 1000.
+
+let secondsBetween = (~from: timeRef, ~to: timeRef): float => (to -. from) /. 1000.

package/src/bindings/Performance.res.mjs

@@ -0,0 +1,21 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+
+function secondsSince(from) {
+  return (performance.now() - from) / 1000;
+}
+
+function secondsBetween(from, to) {
+  return (to - from) / 1000;
+}
+
+function now(prim) {
+  return performance.now();
+}
+
+export {
+  now,
+  secondsSince,
+  secondsBetween,
+}
+/* No side effect */

package/src/bindings/Performance.resi

@@ -0,0 +1,7 @@
+type timeRef = float
+
+let now: unit => timeRef
+
+let secondsSince: timeRef => float
+
+let secondsBetween: (~from: timeRef, ~to: timeRef) => float

package/src/sources/EventRouter.res

@@ -28,29 +28,25 @@ module Group = {
     }
   }
 
-  let get = (
-    group: t<'a>,
-    ~contractAddress,
-    ~blockNumber,
-    ~indexingAddresses: dict<FetchState.indexingAddress>,
-  ) =>
+  // Ownership only: resolve the owning contract from the partition's reverse
+  // index (the partition that fetched the log), not a chain-wide snapshot. The
+  // `effectiveStartBlock` temporal gate now lives in `clientAddressFilter`. The
+  // wildcard partition has an empty index → every log falls back to `wildcard`,
+  // so it can never claim an address-bound contract's logs.
+  let get = (group: t<'a>, ~contractAddress, ~contractNameByAddress: dict<string>) =>
     switch group {
     | {wildcard, byContractName} =>
-      switch indexingAddresses->Utils.Dict.dangerouslyGetNonOption(
+      switch contractNameByAddress->Utils.Dict.dangerouslyGetNonOption(
         contractAddress->Address.toString,
       ) {
-      | Some(indexingContract) =>
-        if indexingContract.effectiveStartBlock <= blockNumber {
-          switch byContractName->Utils.Dict.dangerouslyGetNonOption(indexingContract.contractName) {
-          // Fall back to the wildcard handler when the indexed contract has no
-          // matching event for this tag. This covers addresses registered for
-          // contracts without events (persisted for future config changes) as
-          // well as addresses whose contract has other events but not this one.
-          | None => wildcard
-          | Some(_) as event => event
-          }
-        } else {
-          None
+      | Some(contractName) =>
+        switch byContractName->Utils.Dict.dangerouslyGetNonOption(contractName) {
+        // Fall back to the wildcard handler when the owning contract has no
+        // matching event for this tag. This covers addresses registered for
+        // contracts without events (persisted for future config changes) as
+        // well as addresses whose contract has other events but not this one.
+        | None => wildcard
+        | Some(_) as event => event
         }
       | None => wildcard
       }
@@ -89,10 +85,10 @@ let addOrThrow = (
   }
 }
 
-let get = (router: t<'a>, ~tag, ~contractAddress, ~blockNumber, ~indexingAddresses) => {
+let get = (router: t<'a>, ~tag, ~contractAddress, ~contractNameByAddress) => {
   switch router->Utils.Dict.dangerouslyGetNonOption(tag) {
   | None => None
-  | Some(group) => group->Group.get(~contractAddress, ~blockNumber, ~indexingAddresses)
+  | Some(group) => group->Group.get(~contractAddress, ~contractNameByAddress)
   }
 }
 

package/src/sources/EventRouter.res.mjs

@@ -39,16 +39,13 @@ function addOrThrow(group, event, contractName, isWildcard) {
   byContractName[contractName] = event;
 }
 
-function get(group, contractAddress, blockNumber, indexingAddresses) {
+function get(group, contractAddress, contractNameByAddress) {
   let wildcard = group.wildcard;
-  let indexingContract = indexingAddresses[contractAddress];
-  if (indexingContract === undefined) {
+  let contractName = contractNameByAddress[contractAddress];
+  if (contractName === undefined) {
     return wildcard;
   }
-  if (indexingContract.effectiveStartBlock > blockNumber) {
-    return;
-  }
-  let event = group.byContractName[indexingContract.contractName];
+  let event = group.byContractName[contractName];
   if (event !== undefined) {
     return event;
   } else {
@@ -93,10 +90,10 @@ function addOrThrow$1(router, eventId, event, contractName, isWildcard, eventNam
   }
 }
 
-function get$1(router, tag, contractAddress, blockNumber, indexingAddresses) {
+function get$1(router, tag, contractAddress, contractNameByAddress) {
   let group = router[tag];
   if (group !== undefined) {
-    return get(group, contractAddress, blockNumber, indexingAddresses);
+    return get(group, contractAddress, contractNameByAddress);
   }
 }
 

package/src/sources/Evm.res

@@ -52,11 +52,9 @@ let transactionFields = [
   "authorizationList",
 ]
 
-// Field name → bit index (the code shared with the Rust store), built once.
-let transactionFieldCodes = TransactionStore.fieldCodes(transactionFields)
-
-let transactionFieldMask = (eventConfigs: array<Internal.eventConfig>): float =>
-  eventConfigs->TransactionStore.mask(~codes=transactionFieldCodes)
+// One event's selected transaction fields → store selection bitmask. Computed
+// per event at config build and cached on the event config.
+let eventTransactionFieldMask = TransactionStore.makeMaskFn(transactionFields)
 
 let cleanUpRawEventFieldsInPlace: JSON.t => unit = %raw(`fields => {
     delete fields.hash
@@ -66,36 +64,6 @@ let cleanUpRawEventFieldsInPlace: JSON.t => unit = %raw(`fields => {
 
 let make = (~logger: Pino.t): Ecosystem.t => {
   name: Evm,
-  blockFields: [
-    "number",
-    "timestamp",
-    "hash",
-    "parentHash",
-    "nonce",
-    "sha3Uncles",
-    "logsBloom",
-    "transactionsRoot",
-    "stateRoot",
-    "receiptsRoot",
-    "miner",
-    "difficulty",
-    "totalDifficulty",
-    "extraData",
-    "size",
-    "gasLimit",
-    "gasUsed",
-    "uncles",
-    "baseFeePerGas",
-    "blobGasUsed",
-    "excessBlobGas",
-    "parentBeaconBlockRoot",
-    "withdrawalsRoot",
-    "l1BlockNumber",
-    "sendCount",
-    "sendRoot",
-    "mixHash",
-  ],
-  transactionFields,
   blockNumberName: "number",
   blockTimestampName: "timestamp",
   blockHashName: "hash",
@@ -117,7 +85,6 @@ let make = (~logger: Pino.t): Ecosystem.t => {
     s.field("block", S.option(S.object(s2 => s2.field("number", S.unknown))))
   ),
   logger,
-  transactionFieldMask,
   // The payload carries `transaction` by batch prep (HyperSync) or inline
   // (RPC/simulate), so the event is the payload as-is.
   toEvent: eventItem => eventItem.payload->(Utils.magic: Internal.eventPayload => Internal.event),
@@ -135,10 +102,16 @@ let make = (~logger: Pino.t): Ecosystem.t => {
     ),
   toRawEvent: eventItem => {
     let payload = eventItem.payload->toPayload
+    let eventConfig =
+      eventItem.eventConfig->(Utils.magic: Internal.eventConfig => Internal.evmEventConfig)
     eventItem->RawEvent.make(
       ~block=payload.block,
       ~transaction=payload.transaction,
-      ~params=payload.params,
+      // The decoder emits `{}` for zero-parameter events, which the params
+      // schema rejects; pass unit so it serializes to the "null" sentinel.
+      ~params=eventConfig.paramsMetadata->Array.length == 0
+        ? ()->(Utils.magic: unit => Internal.eventParams)
+        : payload.params,
       ~srcAddress=payload.srcAddress,
       ~cleanUpRawEventFieldsInPlace,
     )

package/src/sources/Evm.res.mjs

@@ -40,11 +40,7 @@ let transactionFields = [
   "authorizationList"
 ];
 
-let transactionFieldCodes = TransactionStore.fieldCodes(transactionFields);
-
-function transactionFieldMask(eventConfigs) {
-  return TransactionStore.mask(eventConfigs, transactionFieldCodes);
-}
+let eventTransactionFieldMask = TransactionStore.makeMaskFn(transactionFields);
 
 let cleanUpRawEventFieldsInPlace = (fields => {
     delete fields.hash
@@ -55,36 +51,6 @@ let cleanUpRawEventFieldsInPlace = (fields => {
 function make(logger) {
   return {
     name: "evm",
-    blockFields: [
-      "number",
-      "timestamp",
-      "hash",
-      "parentHash",
-      "nonce",
-      "sha3Uncles",
-      "logsBloom",
-      "transactionsRoot",
-      "stateRoot",
-      "receiptsRoot",
-      "miner",
-      "difficulty",
-      "totalDifficulty",
-      "extraData",
-      "size",
-      "gasLimit",
-      "gasUsed",
-      "uncles",
-      "baseFeePerGas",
-      "blobGasUsed",
-      "excessBlobGas",
-      "parentBeaconBlockRoot",
-      "withdrawalsRoot",
-      "l1BlockNumber",
-      "sendCount",
-      "sendRoot",
-      "mixHash"
-    ],
-    transactionFields: transactionFields,
     blockNumberName: "number",
     blockTimestampName: "timestamp",
     blockHashName: "hash",
@@ -94,7 +60,6 @@ function make(logger) {
     onEventBlockFilterSchema: S$RescriptSchema.object(s => s.f("block", S$RescriptSchema.option(S$RescriptSchema.object(s2 => s2.f("number", S$RescriptSchema.unknown))))),
     logger: logger,
     toEvent: eventItem => eventItem.payload,
-    transactionFieldMask: transactionFieldMask,
     toEventLogger: eventItem => Logging.createChildFrom(logger, {
       contract: eventItem.eventConfig.contractName,
       event: eventItem.eventConfig.name,
@@ -105,16 +70,16 @@ function make(logger) {
     }),
     toRawEvent: eventItem => {
       let payload = eventItem.payload;
-      return RawEvent.make(eventItem, payload.block, payload.transaction, payload.params, payload.srcAddress, cleanUpRawEventFieldsInPlace);
+      let eventConfig = eventItem.eventConfig;
+      return RawEvent.make(eventItem, payload.block, payload.transaction, eventConfig.paramsMetadata.length === 0 ? undefined : payload.params, payload.srcAddress, cleanUpRawEventFieldsInPlace);
     }
   };
 }
 
 export {
   transactionFields,
-  transactionFieldCodes,
-  transactionFieldMask,
+  eventTransactionFieldMask,
   cleanUpRawEventFieldsInPlace,
   make,
 }
-/* transactionFieldCodes Not a pure module */
+/* eventTransactionFieldMask Not a pure module */

package/src/sources/Fuel.res

@@ -21,8 +21,6 @@ let cleanUpRawEventFieldsInPlace: JSON.t => unit = %raw(`fields => {
 
 let make = (~logger: Pino.t): Ecosystem.t => {
   name: Fuel,
-  blockFields: ["id", "height", "time"],
-  transactionFields: ["id"],
   blockNumberName: "height",
   blockTimestampName: "time",
   blockHashName: "id",
@@ -41,8 +39,6 @@ let make = (~logger: Pino.t): Ecosystem.t => {
     s.field("block", S.option(S.object(s2 => s2.field("height", S.unknown))))
   ),
   logger,
-  // Fuel carries the transaction inline on the payload.
-  transactionFieldMask: _ => 0.,
   toEvent: eventItem => eventItem.payload->(Utils.magic: Internal.eventPayload => Internal.event),
   toEventLogger: eventItem =>
     Logging.createChildFrom(

package/src/sources/Fuel.res.mjs

@@ -13,12 +13,6 @@ let cleanUpRawEventFieldsInPlace = (fields => {
 function make(logger) {
   return {
     name: "fuel",
-    blockFields: [
-      "id",
-      "height",
-      "time"
-    ],
-    transactionFields: ["id"],
     blockNumberName: "height",
     blockTimestampName: "time",
     blockHashName: "id",
@@ -28,7 +22,6 @@ function make(logger) {
     onEventBlockFilterSchema: S$RescriptSchema.object(s => s.f("block", S$RescriptSchema.option(S$RescriptSchema.object(s2 => s2.f("height", S$RescriptSchema.unknown))))),
     logger: logger,
     toEvent: eventItem => eventItem.payload,
-    transactionFieldMask: param => 0,
     toEventLogger: eventItem => Logging.createChildFrom(logger, {
       contract: eventItem.eventConfig.contractName,
       event: eventItem.eventConfig.name,

package/src/sources/HyperFuelSource.res

@@ -235,19 +235,19 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     ~fromBlock,
     ~toBlock,
     ~addressesByContractName,
-    ~indexingAddresses,
+    ~contractNameByAddress,
     ~knownHeight,
     ~partitionId as _,
     ~selection: FetchState.selection,
     ~retry,
     ~logger,
   ) => {
-    let totalTimeRef = Hrtime.makeTimer()
+    let totalTimeRef = Performance.now()
 
     let selectionConfig = getSelectionConfig(selection)
     let recieptsSelection = selectionConfig.getRecieptsSelection(~addressesByContractName)
 
-    let startFetchingBatchTimeRef = Hrtime.makeTimer()
+    let startFetchingBatchTimeRef = Performance.now()
 
     //fetch batch
     Prometheus.SourceRequestCount.increment(
@@ -305,7 +305,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       )
     }
 
-    let pageFetchTime = startFetchingBatchTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let pageFetchTime = startFetchingBatchTimeRef->Performance.secondsSince
 
     //set height and next from block
     let knownHeight = pageUnsafe.archiveHeight
@@ -315,7 +315,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     //In the query
     let heighestBlockQueried = pageUnsafe.nextBlock - 1
 
-    let parsingTimeRef = Hrtime.makeTimer()
+    let parsingTimeRef = Performance.now()
 
     let parsedQueueItems = pageUnsafe.items->Array.map(item => {
       let {contractId: contractAddress, receipt, block, receiptIndex} = item
@@ -332,9 +332,8 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
 
       let eventConfig = switch selectionConfig.eventRouter->EventRouter.get(
         ~tag=eventId,
-        ~indexingAddresses,
+        ~contractNameByAddress,
         ~contractAddress,
-        ~blockNumber=block.height,
       ) {
       | None => {
           let logger = Logging.createChildFrom(
@@ -432,7 +431,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       })
     })
 
-    let parsingTimeElapsed = parsingTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let parsingTimeElapsed = parsingTimeRef->Performance.secondsSince
 
     // Fuel never rolls back on reorg, so block hashes here are purely informational
     // for detect-only logging via ReorgDetection.
@@ -448,7 +447,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     | _ => 0
     }
 
-    let totalTimeElapsed = totalTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let totalTimeElapsed = totalTimeRef->Performance.secondsSince
 
     let stats = {
       totalTimeElapsed,
@@ -480,7 +479,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     pollingInterval: 100,
     poweredByHyperSync: true,
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer()
+      let timerRef = Performance.now()
       let height = try await client->HyperFuelClient.getHeight catch {
       | JsExn(e) =>
         switch e->JsExn.message {
@@ -492,7 +491,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
         | _ => throw(JsExn(e))
         }
       }
-      let seconds = timerRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+      let seconds = timerRef->Performance.secondsSince
       Prometheus.SourceRequestCount.increment(
         ~sourceName=name,
         ~chainId=chain->ChainMap.Chain.toChainId,

package/src/sources/HyperFuelSource.res.mjs

@@ -1,11 +1,11 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Hrtime from "../bindings/Hrtime.res.mjs";
 import * as Source from "./Source.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as HyperFuel from "./HyperFuel.res.mjs";
 import * as Prometheus from "../Prometheus.res.mjs";
 import * as EventRouter from "./EventRouter.res.mjs";
+import * as Performance from "../bindings/Performance.res.mjs";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -196,11 +196,11 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     client = ErrorHandling.mkLogAndRaise(undefined, "Failed to instantiate the HyperFuel client", exn);
   }
   let getSelectionConfig = memoGetSelectionConfig(chain);
-  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, indexingAddresses, knownHeight, param, selection, retry, logger) => {
-    let totalTimeRef = Hrtime.makeTimer();
+  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, contractNameByAddress, knownHeight, param, selection, retry, logger) => {
+    let totalTimeRef = Performance.now();
     let selectionConfig = getSelectionConfig(selection);
     let recieptsSelection = selectionConfig.getRecieptsSelection(addressesByContractName);
-    let startFetchingBatchTimeRef = Hrtime.makeTimer();
+    let startFetchingBatchTimeRef = Performance.now();
     Prometheus.SourceRequestCount.increment(name, chain, "getLogs");
     let pageUnsafe;
     try {
@@ -249,10 +249,10 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         Error: new Error()
       };
     }
-    let pageFetchTime = Hrtime.toSecondsFloat(Hrtime.timeSince(startFetchingBatchTimeRef));
+    let pageFetchTime = Performance.secondsSince(startFetchingBatchTimeRef);
     let knownHeight$1 = pageUnsafe.archiveHeight;
     let heighestBlockQueried = pageUnsafe.nextBlock - 1 | 0;
-    let parsingTimeRef = Hrtime.makeTimer();
+    let parsingTimeRef = Performance.now();
     let parsedQueueItems = pageUnsafe.items.map(item => {
       let block = item.block;
       let receiptIndex = item.receiptIndex;
@@ -277,7 +277,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
           eventId = burnEventTag;
           break;
       }
-      let eventConfig = EventRouter.get(selectionConfig.eventRouter, eventId, contractAddress, block.height, indexingAddresses);
+      let eventConfig = EventRouter.get(selectionConfig.eventRouter, eventId, contractAddress, contractNameByAddress);
       let eventConfig$1;
       if (eventConfig !== undefined) {
         eventConfig$1 = eventConfig;
@@ -370,7 +370,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         }
       };
     });
-    let parsingTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(parsingTimeRef));
+    let parsingTimeElapsed = Performance.secondsSince(parsingTimeRef);
     let blockHashes = pageUnsafe.items.map(param => {
       let block = param.block;
       return {
@@ -386,7 +386,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     } else {
       latestFetchedBlockTimestamp = 0;
     }
-    let totalTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(totalTimeRef));
+    let totalTimeElapsed = Performance.secondsSince(totalTimeRef);
     let stats_parsing$unknowntime$unknown$lpars$rpar = parsingTimeElapsed;
     let stats_page$unknownfetch$unknowntime$unknown$lpars$rpar = pageFetchTime;
     let stats = {
@@ -414,7 +414,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     pollingInterval: 100,
     getBlockHashes: getBlockHashes,
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer();
+      let timerRef = Performance.now();
       let height;
       try {
         height = await client.getHeight();
@@ -446,7 +446,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
           throw e;
         }
       }
-      let seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
+      let seconds = Performance.secondsSince(timerRef);
       Prometheus.SourceRequestCount.increment(name, chain, "getHeight");
       Prometheus.SourceRequestCount.addSeconds(name, chain, "getHeight", seconds);
       return height;

package/src/sources/HyperSync.res

@@ -16,6 +16,8 @@ let reraisIfRateLimited = exn =>
 
 type logsQueryPage = {
   items: array<HyperSyncClient.EventItems.item>,
+  // Blocks referenced by `items`, deduplicated by block number.
+  blocks: array<HyperSyncClient.ResponseTypes.block>,
   nextBlock: int,
   archiveHeight: int,
   rollbackGuard: option<HyperSyncClient.ResponseTypes.rollbackGuard>,
@@ -139,6 +141,7 @@ module GetLogs = {
 
     {
       items: res.items,
+      blocks: res.blocks,
       nextBlock: res.nextBlock,
       archiveHeight: res.archiveHeight->Option.getOr(0), //Archive Height is only None if height is 0
       rollbackGuard: res.rollbackGuard,

package/src/sources/HyperSync.res.mjs

@@ -130,6 +130,7 @@ async function query(client, fromBlock, toBlock, logSelections, fieldSelection)
   }
   return {
     items: res.items,
+    blocks: res.blocks,
     nextBlock: res.nextBlock,
     archiveHeight: Stdlib_Option.getOr(res.archiveHeight, 0),
     rollbackGuard: res.rollbackGuard,