envio 3.3.0-alpha.1 → 3.3.0-alpha.11

package/src/EventConfigBuilder.res.mjs

@@ -1,10 +1,12 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Evm from "./sources/Evm.res.mjs";
+import * as Svm from "./sources/Svm.res.mjs";
+import * as Core from "./Core.res.mjs";
 import * as Utils from "./Utils.res.mjs";
 import * as Address from "./Address.res.mjs";
 import * as FuelSDK from "./sources/FuelSDK.res.mjs";
 import * as Internal from "./Internal.res.mjs";
-import * as TopicFilter from "./TopicFilter.res.mjs";
 import * as LogSelection from "./LogSelection.res.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -206,34 +208,24 @@ function buildSimulateParamsSchema(params) {
 }
 
 function getTopicEncoder(abiType) {
-  if (abiType.endsWith("]") || abiType.startsWith("(")) {
-    return TopicFilter.castToHexUnsafe;
-  }
-  switch (abiType) {
-    case "address" :
-      return TopicFilter.fromAddress;
-    case "bool" :
-      return TopicFilter.fromBool;
-    case "bytes" :
-      return TopicFilter.fromDynamicBytes;
-    case "string" :
-      return TopicFilter.fromDynamicString;
-    default:
-      if (abiType.startsWith("uint")) {
-        return TopicFilter.fromBigInt;
-      } else if (abiType.startsWith("int")) {
-        return TopicFilter.fromSignedBigInt;
-      } else if (abiType.startsWith("bytes")) {
-        return TopicFilter.castToHexUnsafe;
-      } else {
-        return Stdlib_JsError.throwWithMessage(`Unsupported topic filter ABI type: ` + abiType);
-      }
-  }
+  return value => Core.getAddon().encodeIndexedTopic(abiType, value);
 }
 
 function buildTopicGetter(p) {
   let encoder = getTopicEncoder(p.abiType);
-  return eventFilter => Stdlib_Option.mapOr(eventFilter[p.name], [], topicFilters => normalizeOrThrow(topicFilters).map(encoder));
+  let isTuple = p.abiType.startsWith("(");
+  return eventFilter => Stdlib_Option.mapOr(eventFilter[p.name], [], topicFilters => {
+    if (!isTuple) {
+      return normalizeOrThrow(topicFilters).map(encoder);
+    }
+    let encoded;
+    try {
+      encoded = encoder(topicFilters);
+    } catch (exn) {
+      return normalizeOrThrow(topicFilters).map(encoder);
+    }
+    return [encoded];
+  });
 }
 
 let alwaysIncludedBlockFields = [
@@ -255,20 +247,30 @@ let compileAddressFilter = (function (body) {
   return new Function("event", "blockNumber", "indexingAddresses", body);
 });
 
-function buildAddressFilterBody(groups) {
-  if (groups.length === 0) {
-    return;
+function buildAddressFilterBody(groups, isWildcard, srcAddressExprOpt) {
+  let srcAddressExpr = srcAddressExprOpt !== undefined ? srcAddressExprOpt : "event.srcAddress";
+  let paramLeaf = name => `(ic = indexingAddresses[p[` + JSON.stringify(name) + `]]) !== undefined && ic.effectiveStartBlock <= blockNumber`;
+  let paramDnf = groups.length !== 0 ? groups.map(group => "(" + group.map(paramLeaf).join(" && ") + ")").join(" || ") : undefined;
+  let srcLeaf = `(ic = indexingAddresses[` + srcAddressExpr + `]) !== undefined && ic.effectiveStartBlock <= blockNumber`;
+  if (isWildcard) {
+    if (paramDnf !== undefined) {
+      return "var p = event.params, ic; return " + paramDnf + ";";
+    } else {
+      return;
+    }
+  } else if (paramDnf !== undefined) {
+    return "var p = event.params, ic; return " + srcLeaf + " && (" + paramDnf + ");";
+  } else {
+    return "var ic; return " + srcLeaf + ";";
   }
-  let leaf = name => `(ic = indexingAddresses[p[` + JSON.stringify(name) + `]]) !== undefined && ic.effectiveStartBlock <= blockNumber`;
-  let groupExprs = groups.map(group => "(" + group.map(leaf).join(" && ") + ")");
-  return "var p = event.params, ic; return " + groupExprs.join(" || ") + ";";
 }
 
-function buildAddressFilter(groups) {
-  return Stdlib_Option.map(buildAddressFilterBody(groups), compileAddressFilter);
+function buildAddressFilter(groups, isWildcard, srcAddressExprOpt) {
+  let srcAddressExpr = srcAddressExprOpt !== undefined ? srcAddressExprOpt : "event.srcAddress";
+  return Stdlib_Option.map(buildAddressFilterBody(groups, isWildcard, srcAddressExpr), compileAddressFilter);
 }
 
-function buildEvmEventConfig(contractName, eventName, sighash, params, isWildcard, handler, contractRegister, eventFilters, probeChainId, onEventBlockFilterSchema, blockFields, transactionFields, startBlock, globalBlockFieldsSetOpt, globalTransactionFieldsSetOpt) {
+function buildEvmEventConfig(contractName, eventName, sighash, params, blockFields, transactionFields, globalBlockFieldsSetOpt, globalTransactionFieldsSetOpt) {
   let globalBlockFieldsSet = globalBlockFieldsSetOpt !== undefined ? Primitive_option.valFromOption(globalBlockFieldsSetOpt) : new Set();
   let globalTransactionFieldsSet = globalTransactionFieldsSetOpt !== undefined ? Primitive_option.valFromOption(globalTransactionFieldsSetOpt) : new Set();
   let topicCount = Stdlib_Array.reduce(params, 1, (acc, p) => {
@@ -278,57 +280,76 @@ function buildEvmEventConfig(contractName, eventName, sighash, params, isWildcar
       return acc;
     }
   });
-  let indexedParams = params.filter(p => p.indexed);
-  let match = LogSelection.parseEventFiltersOrThrow(eventFilters, sighash, indexedParams.map(p => p.name), contractName, probeChainId, onEventBlockFilterSchema, Stdlib_Option.map(indexedParams[0], buildTopicGetter), Stdlib_Option.map(indexedParams[1], buildTopicGetter), Stdlib_Option.map(indexedParams[2], buildTopicGetter));
-  let whereStartBlock = match.startBlock;
-  let filterByAddresses = match.filterByAddresses;
-  let resolvedStartBlock = whereStartBlock !== undefined ? whereStartBlock : startBlock;
-  let match$1 = resolveFieldSelection(blockFields, transactionFields, globalBlockFieldsSet, globalTransactionFieldsSet);
+  let match = resolveFieldSelection(blockFields, transactionFields, globalBlockFieldsSet, globalTransactionFieldsSet);
+  let selectedTransactionFields = match[1];
+  let selectedBlockFields = match[0];
   return {
     id: sighash + "_" + topicCount.toString(),
     name: eventName,
     contractName: contractName,
-    isWildcard: isWildcard,
-    filterByAddresses: filterByAddresses,
-    dependsOnAddresses: !isWildcard || filterByAddresses,
-    clientAddressFilter: Stdlib_Option.map(buildAddressFilterBody(match.addressFilterParamGroups), compileAddressFilter),
-    handler: handler,
-    contractRegister: contractRegister,
     paramsRawEventSchema: buildParamsSchema(params),
     simulateParamsSchema: buildSimulateParamsSchema(params),
-    startBlock: resolvedStartBlock,
-    getEventFiltersOrThrow: match.getEventFiltersOrThrow,
-    selectedBlockFields: match$1[0],
-    selectedTransactionFields: match$1[1],
+    selectedTransactionFields: selectedTransactionFields,
+    transactionFieldMask: Evm.eventTransactionFieldMask(selectedTransactionFields),
+    blockFieldMask: Evm.eventBlockFieldMask(selectedBlockFields),
+    selectedBlockFields: selectedBlockFields,
     sighash: sighash,
     topicCount: topicCount,
     paramsMetadata: params
   };
 }
 
-function buildSvmInstructionEventConfig(contractName, instructionName, programId, discriminator, discriminatorByteLen, includeTransaction, includeLogs, includeTokenBalances, accountFilters, isInner, isWildcard, handler, contractRegister, accountsOpt, argsOpt, definedTypesOpt, startBlock) {
+function buildEvmOnEventRegistration(eventConfig, isWildcard, handler, contractRegister, where, chainId, onEventBlockFilterSchema, startBlock) {
+  let indexedParams = eventConfig.paramsMetadata.filter(p => p.indexed);
+  let match = LogSelection.parseWhereOrThrow(where, eventConfig.sighash, indexedParams.map(p => p.name), eventConfig.contractName, chainId, onEventBlockFilterSchema, Stdlib_Option.map(indexedParams[0], buildTopicGetter), Stdlib_Option.map(indexedParams[1], buildTopicGetter), Stdlib_Option.map(indexedParams[2], buildTopicGetter));
+  let filterByAddresses = match.filterByAddresses;
+  let resolvedWhere = match.resolvedWhere;
+  let sb = resolvedWhere.startBlock;
+  let resolvedStartBlock = sb !== undefined ? sb : startBlock;
+  return {
+    index: -1,
+    eventConfig: eventConfig,
+    handler: handler,
+    contractRegister: contractRegister,
+    isWildcard: isWildcard,
+    filterByAddresses: filterByAddresses,
+    dependsOnAddresses: Internal.dependsOnAddresses(isWildcard, filterByAddresses),
+    clientAddressFilter: buildAddressFilter(match.addressFilterParamGroups, isWildcard, undefined),
+    startBlock: resolvedStartBlock,
+    resolvedWhere: resolvedWhere
+  };
+}
+
+let alwaysIncludedSvmBlockFields = [
+  "slot",
+  "time",
+  "hash"
+];
+
+function buildSvmInstructionEventConfig(contractName, instructionName, programId, discriminator, discriminatorByteLen, includeLogs, transactionFieldsOpt, blockFieldsOpt, accountFilters, isInner, accountsOpt, argsOpt, definedTypesOpt) {
+  let transactionFields = transactionFieldsOpt !== undefined ? transactionFieldsOpt : [];
+  let blockFields = blockFieldsOpt !== undefined ? blockFieldsOpt : [];
   let accounts = accountsOpt !== undefined ? accountsOpt : [];
   let args = argsOpt !== undefined ? argsOpt : null;
   let definedTypes = definedTypesOpt !== undefined ? definedTypesOpt : null;
   let paramsSchema = Utils.Schema.coerceToJsonPgType(S$RescriptSchema.json(false));
+  let selectedTransactionFields = new Set(transactionFields);
+  let selectedBlockFields = new Set(alwaysIncludedSvmBlockFields.concat(blockFields));
+  let blockFieldMask = Svm.eventBlockFieldMask(selectedBlockFields);
   return {
     id: discriminator !== undefined ? discriminator : "none",
     name: instructionName,
     contractName: contractName,
-    isWildcard: isWildcard,
-    filterByAddresses: false,
-    dependsOnAddresses: !isWildcard,
-    handler: handler,
-    contractRegister: contractRegister,
     paramsRawEventSchema: paramsSchema,
     simulateParamsSchema: paramsSchema,
-    startBlock: startBlock,
+    selectedTransactionFields: selectedTransactionFields,
+    transactionFieldMask: Svm.eventTransactionFieldMask(selectedTransactionFields),
+    blockFieldMask: blockFieldMask,
+    selectedBlockFields: selectedBlockFields,
     programId: programId,
     discriminator: discriminator,
     discriminatorByteLen: discriminatorByteLen,
-    includeTransaction: includeTransaction,
     includeLogs: includeLogs,
-    includeTokenBalances: includeTokenBalances,
     accountFilters: accountFilters,
     isInner: isInner,
     accounts: accounts,
@@ -337,7 +358,21 @@ function buildSvmInstructionEventConfig(contractName, instructionName, programId
   };
 }
 
-function buildFuelEventConfig(contractName, eventName, kind, sighash, rawAbi, isWildcard, handler, contractRegister, startBlock) {
+function buildSvmOnEventRegistration(eventConfig, isWildcard, handler, contractRegister, startBlock) {
+  return {
+    index: -1,
+    eventConfig: eventConfig,
+    handler: handler,
+    contractRegister: contractRegister,
+    isWildcard: isWildcard,
+    filterByAddresses: false,
+    dependsOnAddresses: Internal.dependsOnAddresses(isWildcard, false),
+    clientAddressFilter: buildAddressFilter([], isWildcard, "event.programId"),
+    startBlock: startBlock
+  };
+}
+
+function buildFuelEventConfig(contractName, eventName, kind, sighash, rawAbi) {
   let fuelKind;
   switch (kind) {
     case "burn" :
@@ -384,18 +419,29 @@ function buildFuelEventConfig(contractName, eventName, kind, sighash, rawAbi, is
     id: tmp,
     name: eventName,
     contractName: contractName,
-    isWildcard: isWildcard,
-    filterByAddresses: false,
-    dependsOnAddresses: !isWildcard,
-    handler: handler,
-    contractRegister: contractRegister,
     paramsRawEventSchema: paramsSchema,
     simulateParamsSchema: paramsSchema,
-    startBlock: startBlock,
+    selectedTransactionFields: new Set(),
+    transactionFieldMask: 0,
+    blockFieldMask: 0,
     kind: fuelKind
   };
 }
 
+function buildFuelOnEventRegistration(eventConfig, isWildcard, handler, contractRegister, startBlock) {
+  return {
+    index: -1,
+    eventConfig: eventConfig,
+    handler: handler,
+    contractRegister: contractRegister,
+    isWildcard: isWildcard,
+    filterByAddresses: false,
+    dependsOnAddresses: Internal.dependsOnAddresses(isWildcard, false),
+    clientAddressFilter: buildAddressFilter([], isWildcard, undefined),
+    startBlock: startBlock
+  };
+}
+
 export {
   paramMetaSchema,
   normalizeOrThrow,
@@ -415,7 +461,11 @@ export {
   buildAddressFilterBody,
   buildAddressFilter,
   buildEvmEventConfig,
+  buildEvmOnEventRegistration,
+  alwaysIncludedSvmBlockFields,
   buildSvmInstructionEventConfig,
+  buildSvmOnEventRegistration,
   buildFuelEventConfig,
+  buildFuelOnEventRegistration,
 }
 /* paramMetaSchema Not a pure module */

package/src/EventProcessing.res

@@ -39,7 +39,7 @@ let runEventHandlerOrThrow = async (
   let eventItem = item->Internal.castUnsafeEventItem
 
   //Include the load in time before handler
-  let timeBeforeHandler = Hrtime.makeTimer()
+  let timeBeforeHandler = Performance.now()
 
   try {
     let contextParams: UserContext.contextParams = {
@@ -72,10 +72,11 @@ let runEventHandlerOrThrow = async (
       }),
     )
   }
-  let handlerDuration = timeBeforeHandler->Hrtime.timeSince->Hrtime.toSecondsFloat
+  let handlerDuration = timeBeforeHandler->Performance.secondsSince
+  let eventConfig = eventItem.onEventRegistration.eventConfig
   Prometheus.ProcessingHandler.increment(
-    ~contract=eventItem.eventConfig.contractName,
-    ~event=eventItem.eventConfig.name,
+    ~contract=eventConfig.contractName,
+    ~event=eventConfig.name,
     ~duration=handlerDuration,
   )
 }
@@ -90,7 +91,7 @@ let runHandlerOrThrow = async (
   ~chains: Internal.chains,
 ) => {
   switch item {
-  | Block({onBlockConfig: {handler}, blockNumber}) =>
+  | Block({onBlockRegistration: {handler}, blockNumber}) =>
     try {
       let contextParams: UserContext.contextParams = {
         item,
@@ -121,8 +122,8 @@ let runHandlerOrThrow = async (
         }),
       )
     }
-  | Event({eventConfig}) =>
-    switch eventConfig.handler {
+  | Event(_) =>
+    switch (item->Internal.castUnsafeEventItem).onEventRegistration.handler {
     | Some(handler) =>
       await item->runEventHandlerOrThrow(
         ~handler,
@@ -161,7 +162,9 @@ let preloadBatchOrThrow = async (
     for idx in 0 to checkpointEventsProcessed - 1 {
       let item = batch.items->Array.getUnsafe(itemIdx.contents + idx)
       switch item {
-      | Event({eventConfig: {handler, contractName, name: eventName}}) =>
+      | Event(_) =>
+        let {handler, eventConfig: {contractName, name: eventName}} =
+          (item->Internal.castUnsafeEventItem).onEventRegistration
         switch handler {
         | None => ()
         | Some(handler) =>
@@ -200,7 +203,7 @@ let preloadBatchOrThrow = async (
           | _ => ()
           }
         }
-      | Block({onBlockConfig: {handler}, blockNumber}) =>
+      | Block({onBlockRegistration: {handler}, blockNumber}) =>
         try {
           promises->Array.push(
             handler({
@@ -264,11 +267,19 @@ let runBatchHandlersOrThrow = async (
   }
 }
 
-let registerProcessEventBatchMetrics = (~logger, ~loadDuration, ~handlerDuration) => {
-  logger->Logging.childTrace({
-    "msg": "Finished processing batch",
-    "loader_time_elapsed": loadDuration,
-    "handlers_time_elapsed": handlerDuration,
+let registerProcessEventBatchMetrics = (
+  ~logger,
+  ~batch: Batch.t,
+  ~loadDuration,
+  ~handlerDuration,
+) => {
+  batch.progressedChainsById->Dict.forEachWithKey((chainAfterBatch, chainId) => {
+    logger->Logging.childTrace({
+      "msg": "Finished processing",
+      "chainId": chainId->Int.fromString->Option.getUnsafe,
+      "batchSize": chainAfterBatch.batchSize,
+      "progress": chainAfterBatch.progressBlockNumber,
+    })
   })
 
   Prometheus.ProcessingBatch.registerMetrics(~loadDuration, ~handlerDuration)
@@ -281,6 +292,39 @@ type logPartitionInfo = {
   lastItemBlockNumber?: int,
 }
 
+// Off the hot path: bulk-materialise the selected transaction and block fields
+// for the batch's store-backed (HyperSync) items and write them onto the
+// payloads, so handlers read plain objects. A batch can span chains, each with
+// its own stores and field masks, so group items by chain before materialising.
+let materializeBatchEvents = async (
+  batch: Batch.t,
+  ~chainStates: dict<ChainState.t>,
+  ~ecosystem,
+) => {
+  switch chainStates->Dict.valuesToArray {
+  // Single-chain indexers (the common case): every item belongs to the one
+  // chain, so skip the per-chain grouping and its allocations.
+  | [cs] => await cs->ChainState.materializeBatchItems(~items=batch.items, ~ecosystem)
+  | _ =>
+    let itemsByChain: dict<array<Internal.item>> = Dict.make()
+    batch.items->Array.forEach(item => {
+      let chainId = item->Internal.getItemChainId->Int.toString
+      switch itemsByChain->Utils.Dict.dangerouslyGetNonOption(chainId) {
+      | Some(items) => items->Array.push(item)
+      | None => itemsByChain->Dict.set(chainId, [item])
+      }
+    })
+
+    let _ = await itemsByChain
+    ->Dict.toArray
+    ->Array.map(async ((chainId, items)) => {
+      let cs = chainStates->Dict.getUnsafe(chainId)
+      await cs->ChainState.materializeBatchItems(~items, ~ecosystem)
+    })
+    ->Promise.all
+  }
+}
+
 let processEventBatch = async (
   ~batch: Batch.t,
   ~indexerState: IndexerState.t,
@@ -289,33 +333,33 @@ let processEventBatch = async (
   ~config: Config.t,
   ~chainStates: dict<ChainState.t>,
 ) => {
-  let totalBatchSize = batch.totalBatchSize
   // Compute chains state for this batch
   let chains: Internal.chains = chainStates->computeChainsState
 
   let logger = Logging.getLogger()
-  logger->Logging.childTrace({
-    "msg": "Started processing batch",
-    "totalBatchSize": totalBatchSize,
-    "chains": batch.progressedChainsById->Utils.Dict.mapValues(chainAfterBatch => {
-      {
-        "batchSize": chainAfterBatch.batchSize,
-        "progress": chainAfterBatch.progressBlockNumber,
-      }
-    }),
+
+  batch.progressedChainsById->Dict.forEachWithKey((chainAfterBatch, chainId) => {
+    logger->Logging.childTrace({
+      "msg": "Started processing",
+      "chainId": chainId->Int.fromString->Option.getUnsafe,
+      "batchSize": chainAfterBatch.batchSize,
+    })
   })
 
   try {
     // Backpressure: keep processing within keepLatestChangesLimit of the cycle.
     await indexerState->Writing.awaitCapacity
 
-    let timeRef = Hrtime.makeTimer()
+    let timeRef = Performance.now()
 
     if batch.items->Utils.Array.notEmpty {
+      // Materialise store-backed transactions onto payloads before any handler
+      // (preload or execute) reads them.
+      await materializeBatchEvents(batch, ~chainStates, ~ecosystem=config.ecosystem.name)
       await batch->preloadBatchOrThrow(~loadManager, ~persistence, ~indexerState, ~chains, ~config)
     }
 
-    let elapsedTimeAfterLoaders = timeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let elapsedTimeAfterLoaders = timeRef->Performance.secondsSince
 
     if batch.items->Utils.Array.notEmpty {
       await batch->runBatchHandlersOrThrow(
@@ -327,13 +371,18 @@ let processEventBatch = async (
       )
     }
 
-    let elapsedTimeAfterProcessing = timeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let elapsedTimeAfterProcessing = timeRef->Performance.secondsSince
 
     indexerState->Writing.commitBatch(~batch)
 
     let loaderDuration = elapsedTimeAfterLoaders
     let handlerDuration = elapsedTimeAfterProcessing -. loaderDuration
-    registerProcessEventBatchMetrics(~logger, ~loadDuration=loaderDuration, ~handlerDuration)
+    registerProcessEventBatchMetrics(
+      ~logger,
+      ~batch,
+      ~loadDuration=loaderDuration,
+      ~handlerDuration,
+    )
     Ok()
   } catch {
   | Persistence.StorageError({message, reason}) =>

package/src/EventProcessing.res.mjs

@@ -1,13 +1,16 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Utils from "./Utils.res.mjs";
-import * as Hrtime from "./bindings/Hrtime.res.mjs";
 import * as Logging from "./Logging.res.mjs";
 import * as Writing from "./Writing.res.mjs";
+import * as Internal from "./Internal.res.mjs";
 import * as Ecosystem from "./Ecosystem.res.mjs";
 import * as ChainState from "./ChainState.res.mjs";
 import * as Prometheus from "./Prometheus.res.mjs";
+import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
+import * as Performance from "./bindings/Performance.res.mjs";
 import * as Persistence from "./Persistence.res.mjs";
+import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as UserContext from "./UserContext.res.mjs";
 import * as ErrorHandling from "./ErrorHandling.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
@@ -33,7 +36,7 @@ function computeChainsState(chainStates) {
 let ProcessingError = /* @__PURE__ */Primitive_exceptions.create("EventProcessing.ProcessingError");
 
 async function runEventHandlerOrThrow(item, checkpointId, handler, indexerState, loadManager, persistence, chains, config) {
-  let timeBeforeHandler = Hrtime.makeTimer();
+  let timeBeforeHandler = Performance.now();
   try {
     let contextParams = {
       item: item,
@@ -61,13 +64,14 @@ async function runEventHandlerOrThrow(item, checkpointId, handler, indexerState,
       Error: new Error()
     };
   }
-  let handlerDuration = Hrtime.toSecondsFloat(Hrtime.timeSince(timeBeforeHandler));
-  return Prometheus.ProcessingHandler.increment(item.eventConfig.contractName, item.eventConfig.name, handlerDuration);
+  let handlerDuration = Performance.secondsSince(timeBeforeHandler);
+  let eventConfig = item.onEventRegistration.eventConfig;
+  return Prometheus.ProcessingHandler.increment(eventConfig.contractName, eventConfig.name, handlerDuration);
 }
 
 async function runHandlerOrThrow(item, checkpointId, indexerState, loadManager, persistence, config, chains) {
   if (item.kind === 0) {
-    let handler = item.eventConfig.handler;
+    let handler = item.onEventRegistration.handler;
     if (handler !== undefined) {
       return await runEventHandlerOrThrow(item, checkpointId, handler, indexerState, loadManager, persistence, chains, config);
     } else {
@@ -86,7 +90,7 @@ async function runHandlerOrThrow(item, checkpointId, indexerState, loadManager,
       config: config,
       isResolved: false
     };
-    await item.onBlockConfig.handler(Ecosystem.makeOnBlockArgs(item.blockNumber, config.ecosystem, UserContext.getHandlerContext(contextParams)));
+    await item.onBlockRegistration.handler(Ecosystem.makeOnBlockArgs(item.blockNumber, config.ecosystem, UserContext.getHandlerContext(contextParams)));
     contextParams.isResolved = true;
     return;
   } catch (raw_exn) {
@@ -110,11 +114,12 @@ async function preloadBatchOrThrow(batch, loadManager, persistence, config, inde
     for (let idx = 0; idx < checkpointEventsProcessed; ++idx) {
       let item = batch.items[itemIdx + idx | 0];
       if (item.kind === 0) {
-        let match = item.eventConfig;
+        let match = item.onEventRegistration;
         let handler = match.handler;
         if (handler !== undefined) {
-          let contractName = match.contractName;
-          let eventName = match.name;
+          let match$1 = match.eventConfig;
+          let contractName = match$1.contractName;
+          let eventName = match$1.name;
           try {
             let timerRef = Prometheus.PreloadHandler.startOperation(contractName, eventName);
             promises.push(Utils.$$Promise.silentCatch(handler({
@@ -137,7 +142,7 @@ async function preloadBatchOrThrow(batch, loadManager, persistence, config, inde
         }
       } else {
         try {
-          promises.push(Utils.$$Promise.silentCatch(item.onBlockConfig.handler(Ecosystem.makeOnBlockArgs(item.blockNumber, config.ecosystem, UserContext.getHandlerContext({
+          promises.push(Utils.$$Promise.silentCatch(item.onBlockRegistration.handler(Ecosystem.makeOnBlockArgs(item.blockNumber, config.ecosystem, UserContext.getHandlerContext({
             item: item,
             checkpointId: checkpointId,
             indexerState: indexerState,
@@ -171,41 +176,62 @@ async function runBatchHandlersOrThrow(batch, indexerState, loadManager, persist
   }
 }
 
-function registerProcessEventBatchMetrics(logger, loadDuration, handlerDuration) {
-  Logging.childTrace(logger, {
-    msg: "Finished processing batch",
-    loader_time_elapsed: loadDuration,
-    handlers_time_elapsed: handlerDuration
-  });
+function registerProcessEventBatchMetrics(logger, batch, loadDuration, handlerDuration) {
+  Stdlib_Dict.forEachWithKey(batch.progressedChainsById, (chainAfterBatch, chainId) => Logging.childTrace(logger, {
+    msg: "Finished processing",
+    chainId: Stdlib_Int.fromString(chainId, undefined),
+    batchSize: chainAfterBatch.batchSize,
+    progress: chainAfterBatch.progressBlockNumber
+  }));
   Prometheus.ProcessingBatch.registerMetrics(loadDuration, handlerDuration);
 }
 
+async function materializeBatchEvents(batch, chainStates, ecosystem) {
+  let match = Object.values(chainStates);
+  if (match.length !== 1) {
+    let itemsByChain = {};
+    batch.items.forEach(item => {
+      let chainId = Internal.getItemChainId(item).toString();
+      let items = itemsByChain[chainId];
+      if (items !== undefined) {
+        items.push(item);
+      } else {
+        itemsByChain[chainId] = [item];
+      }
+    });
+    await Promise.all(Object.entries(itemsByChain).map(async param => {
+      let cs = chainStates[param[0]];
+      return await ChainState.materializeBatchItems(cs, param[1], ecosystem);
+    }));
+    return;
+  }
+  let cs = match[0];
+  return await ChainState.materializeBatchItems(cs, batch.items, ecosystem);
+}
+
 async function processEventBatch(batch, indexerState, loadManager, persistence, config, chainStates) {
-  let totalBatchSize = batch.totalBatchSize;
   let chains = computeChainsState(chainStates);
   let logger = Logging.getLogger();
-  Logging.childTrace(logger, {
-    msg: "Started processing batch",
-    totalBatchSize: totalBatchSize,
-    chains: Utils.Dict.mapValues(batch.progressedChainsById, chainAfterBatch => ({
-      batchSize: chainAfterBatch.batchSize,
-      progress: chainAfterBatch.progressBlockNumber
-    }))
-  });
+  Stdlib_Dict.forEachWithKey(batch.progressedChainsById, (chainAfterBatch, chainId) => Logging.childTrace(logger, {
+    msg: "Started processing",
+    chainId: Stdlib_Int.fromString(chainId, undefined),
+    batchSize: chainAfterBatch.batchSize
+  }));
   try {
     await Writing.awaitCapacity(indexerState);
-    let timeRef = Hrtime.makeTimer();
+    let timeRef = Performance.now();
     if (Utils.$$Array.notEmpty(batch.items)) {
+      await materializeBatchEvents(batch, chainStates, config.ecosystem.name);
       await preloadBatchOrThrow(batch, loadManager, persistence, config, indexerState, chains);
     }
-    let elapsedTimeAfterLoaders = Hrtime.toSecondsFloat(Hrtime.timeSince(timeRef));
+    let elapsedTimeAfterLoaders = Performance.secondsSince(timeRef);
     if (Utils.$$Array.notEmpty(batch.items)) {
       await runBatchHandlersOrThrow(batch, indexerState, loadManager, persistence, config, chains);
     }
-    let elapsedTimeAfterProcessing = Hrtime.toSecondsFloat(Hrtime.timeSince(timeRef));
+    let elapsedTimeAfterProcessing = Performance.secondsSince(timeRef);
     Writing.commitBatch(indexerState, batch);
     let handlerDuration = elapsedTimeAfterProcessing - elapsedTimeAfterLoaders;
-    registerProcessEventBatchMetrics(logger, elapsedTimeAfterLoaders, handlerDuration);
+    registerProcessEventBatchMetrics(logger, batch, elapsedTimeAfterLoaders, handlerDuration);
     return {
       TAG: "Ok",
       _0: undefined
@@ -240,6 +266,7 @@ export {
   preloadBatchOrThrow,
   runBatchHandlersOrThrow,
   registerProcessEventBatchMetrics,
+  materializeBatchEvents,
   processEventBatch,
 }
 /* Utils Not a pure module */

package/src/ExitOnCaughtUp.res

@@ -4,7 +4,15 @@ let run = async (state: IndexerState.t) => {
   ChainMetadata.stage(state)
   await state->Writing.flush
   if !(state->IndexerState.isStopped) && !(state->IndexerState.isResolvingReorg) {
-    Logging.info("Exiting with success")
-    NodeJs.process->NodeJs.exitWithCode(Success)
+    // A simulate run fails here when a provided item never reached a handler —
+    // dead test code. The tracker is None (a no-op) off the simulate path.
+    switch state
+    ->IndexerState.simulateDeadInputTracker
+    ->Option.flatMap(SimulateDeadInputTracker.failureMessage) {
+    | None =>
+      Logging.info("Exiting with success")
+      NodeJs.process->NodeJs.exitWithCode(Success)
+    | Some(message) => state->IndexerState.errorExit(ErrorHandling.make(Utils.Error.make(message)))
+    }
   }
 }