envio 3.3.0-alpha.3 → 3.3.0-alpha.4

package/src/FetchState.res.mjs

@@ -14,7 +14,7 @@ function deriveEffectiveStartBlock(registrationBlock, contractStartBlock) {
   return Primitive_int.max(Primitive_int.max(registrationBlock, 0), Stdlib_Option.getOr(contractStartBlock, 0));
 }
 
-function deriveContractNameByAddress(addressesByContractName) {
+let deriveContractNameByAddress = Utils.$$WeakMap.memoize(addressesByContractName => {
   let result = {};
   Utils.Dict.forEachWithKey(addressesByContractName, (addresses, contractName) => {
     for (let i = 0, i_finish = addresses.length; i < i_finish; ++i) {
@@ -22,7 +22,7 @@ function deriveContractNameByAddress(addressesByContractName) {
     }
   });
   return result;
-}
+});
 
 function calculateEstResponseSize(p, fromBlock, toBlock, maxQueryBlockNumber) {
   if (p.prevQueryRange <= 0) {
@@ -82,7 +82,6 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         latestFetchedBlock: p1.latestFetchedBlock,
         selection: p1.selection,
         addressesByContractName: p1.addressesByContractName,
-        contractNameByAddress: p1.contractNameByAddress,
         mergeBlock: potentialMergeBlock,
         dynamicContract: p1.dynamicContract,
         mutPendingQueries: p1.mutPendingQueries,
@@ -96,7 +95,6 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         latestFetchedBlock: p2.latestFetchedBlock,
         selection: p2.selection,
         addressesByContractName: p2.addressesByContractName,
-        contractNameByAddress: p2.contractNameByAddress,
         mergeBlock: potentialMergeBlock,
         dynamicContract: p2.dynamicContract,
         mutPendingQueries: p2.mutPendingQueries,
@@ -119,7 +117,6 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         },
         selection: p1.selection,
         addressesByContractName: {},
-        contractNameByAddress: {},
         mergeBlock: undefined,
         dynamicContract: contractName,
         mutPendingQueries: [],
@@ -134,7 +131,6 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         latestFetchedBlock: p1.latestFetchedBlock,
         selection: p1.selection,
         addressesByContractName: p1.addressesByContractName,
-        contractNameByAddress: p1.contractNameByAddress,
         mergeBlock: potentialMergeBlock,
         dynamicContract: p1.dynamicContract,
         mutPendingQueries: p1.mutPendingQueries,
@@ -151,7 +147,6 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
       latestFetchedBlock: p2.latestFetchedBlock,
       selection: p2.selection,
       addressesByContractName: p2.addressesByContractName,
-      contractNameByAddress: p2.contractNameByAddress,
       mergeBlock: potentialMergeBlock,
       dynamicContract: p2.dynamicContract,
       mutPendingQueries: p2.mutPendingQueries,
@@ -176,7 +171,6 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
       latestFetchedBlock: continuingBase.latestFetchedBlock,
       selection: continuingBase.selection,
       addressesByContractName: abcFull,
-      contractNameByAddress: continuingBase.contractNameByAddress,
       mergeBlock: continuingBase.mergeBlock,
       dynamicContract: continuingBase.dynamicContract,
       mutPendingQueries: continuingBase.mutPendingQueries,
@@ -192,7 +186,6 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
       latestFetchedBlock: continuingBase.latestFetchedBlock,
       selection: continuingBase.selection,
       addressesByContractName: abcRest,
-      contractNameByAddress: continuingBase.contractNameByAddress,
       mergeBlock: continuingBase.mergeBlock,
       dynamicContract: continuingBase.dynamicContract,
       mutPendingQueries: [],
@@ -210,7 +203,6 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
     latestFetchedBlock: continuingBase.latestFetchedBlock,
     selection: continuingBase.selection,
     addressesByContractName: abc,
-    contractNameByAddress: continuingBase.contractNameByAddress,
     mergeBlock: continuingBase.mergeBlock,
     dynamicContract: continuingBase.dynamicContract,
     mutPendingQueries: continuingBase.mutPendingQueries,
@@ -309,20 +301,7 @@ function make(partitions, maxAddrInPartition, nextPartitionIndex, dynamicContrac
   for (let idx$2 = 0; idx$2 < partitionsCount; ++idx$2) {
     let p$1 = newPartitions[idx$2];
     idsInAscOrder[idx$2] = p$1.id;
-    entities[p$1.id] = {
-      id: p$1.id,
-      latestFetchedBlock: p$1.latestFetchedBlock,
-      selection: p$1.selection,
-      addressesByContractName: p$1.addressesByContractName,
-      contractNameByAddress: deriveContractNameByAddress(p$1.addressesByContractName),
-      mergeBlock: p$1.mergeBlock,
-      dynamicContract: p$1.dynamicContract,
-      mutPendingQueries: p$1.mutPendingQueries,
-      prevQueryRange: p$1.prevQueryRange,
-      prevPrevQueryRange: p$1.prevPrevQueryRange,
-      prevRangeSize: p$1.prevRangeSize,
-      latestBlockRangeUpdateBlock: p$1.latestBlockRangeUpdateBlock
-    };
+    entities[p$1.id] = p$1;
   }
   return {
     idsInAscOrder: idsInAscOrder,
@@ -416,7 +395,6 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount
     let updatedMainPartition_id = p$1.id;
     let updatedMainPartition_selection = p$1.selection;
     let updatedMainPartition_addressesByContractName = p$1.addressesByContractName;
-    let updatedMainPartition_contractNameByAddress = p$1.contractNameByAddress;
     let updatedMainPartition_mergeBlock = p$1.mergeBlock;
     let updatedMainPartition_dynamicContract = p$1.dynamicContract;
     let updatedMainPartition_mutPendingQueries = p$1.mutPendingQueries;
@@ -426,7 +404,6 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount
       latestFetchedBlock: updatedLatestFetchedBlock,
       selection: updatedMainPartition_selection,
       addressesByContractName: updatedMainPartition_addressesByContractName,
-      contractNameByAddress: updatedMainPartition_contractNameByAddress,
       mergeBlock: updatedMainPartition_mergeBlock,
       dynamicContract: updatedMainPartition_dynamicContract,
       mutPendingQueries: updatedMainPartition_mutPendingQueries,
@@ -674,7 +651,6 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             latestFetchedBlock: latestFetchedBlock,
             selection: normalSelection,
             addressesByContractName: addressesByContractName,
-            contractNameByAddress: {},
             mergeBlock: undefined,
             dynamicContract: isDynamic ? contractName : undefined,
             mutPendingQueries: [],
@@ -726,7 +702,6 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             latestFetchedBlock: currentP.latestFetchedBlock,
             selection: currentP.selection,
             addressesByContractName: currentP.addressesByContractName,
-            contractNameByAddress: currentP.contractNameByAddress,
             mergeBlock: currentPBlock < nextPBlock ? nextPBlock : undefined,
             dynamicContract: currentP.dynamicContract,
             mutPendingQueries: currentP.mutPendingQueries,
@@ -740,7 +715,6 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             latestFetchedBlock: nextP.latestFetchedBlock,
             selection: nextP.selection,
             addressesByContractName: mergedAddresses,
-            contractNameByAddress: nextP.contractNameByAddress,
             mergeBlock: nextP.mergeBlock,
             dynamicContract: nextP.dynamicContract,
             mutPendingQueries: nextP.mutPendingQueries,
@@ -755,7 +729,6 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             latestFetchedBlock: currentP.latestFetchedBlock,
             selection: currentP.selection,
             addressesByContractName: mergedAddresses,
-            contractNameByAddress: currentP.contractNameByAddress,
             mergeBlock: currentP.mergeBlock,
             dynamicContract: currentP.dynamicContract,
             mutPendingQueries: currentP.mutPendingQueries,
@@ -901,7 +874,6 @@ function registerDynamicContracts(fetchState, items) {
                   latestFetchedBlock: p.latestFetchedBlock,
                   selection: p.selection,
                   addressesByContractName: restAddressesByContractName,
-                  contractNameByAddress: p.contractNameByAddress,
                   mergeBlock: p.mergeBlock,
                   dynamicContract: p.dynamicContract,
                   mutPendingQueries: p.mutPendingQueries,
@@ -917,7 +889,6 @@ function registerDynamicContracts(fetchState, items) {
                   latestFetchedBlock: p.latestFetchedBlock,
                   selection: fetchState.normalSelection,
                   addressesByContractName: addressesByContractName,
-                  contractNameByAddress: {},
                   mergeBlock: undefined,
                   dynamicContract: contractName,
                   mutPendingQueries: p.mutPendingQueries,
@@ -933,7 +904,6 @@ function registerDynamicContracts(fetchState, items) {
                 latestFetchedBlock: p.latestFetchedBlock,
                 selection: p.selection,
                 addressesByContractName: p.addressesByContractName,
-                contractNameByAddress: p.contractNameByAddress,
                 mergeBlock: p.mergeBlock,
                 dynamicContract: contractName,
                 mutPendingQueries: p.mutPendingQueries,
@@ -1029,8 +999,7 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
           chainId: 0,
           progress: 0,
           selection: selection,
-          addressesByContractName: addressesByContractName,
-          contractNameByAddress: partition.contractNameByAddress
+          addressesByContractName: addressesByContractName
         });
         chunkFromBlock = chunkToBlock + 1 | 0;
         chunkIdx = chunkIdx + 1 | 0;
@@ -1046,8 +1015,7 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
       chainId: 0,
       progress: 0,
       selection: selection,
-      addressesByContractName: addressesByContractName,
-      contractNameByAddress: partition.contractNameByAddress
+      addressesByContractName: addressesByContractName
     });
     return;
   }
@@ -1060,8 +1028,7 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
     chainId: 0,
     progress: 0,
     selection: selection,
-    addressesByContractName: addressesByContractName,
-    contractNameByAddress: partition.contractNameByAddress
+    addressesByContractName: addressesByContractName
   });
 }
 
@@ -1140,8 +1107,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                     chainId: 0,
                     progress: 0,
                     selection: selection,
-                    addressesByContractName: addressesByContractName,
-                    contractNameByAddress: p.contractNameByAddress
+                    addressesByContractName: addressesByContractName
                   });
                   chunkFromBlock = chunkToBlock + 1 | 0;
                   chunkIdx = chunkIdx + 1 | 0;
@@ -1156,8 +1122,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                   chainId: 0,
                   progress: 0,
                   selection: selection,
-                  addressesByContractName: addressesByContractName,
-                  contractNameByAddress: p.contractNameByAddress
+                  addressesByContractName: addressesByContractName
                 });
               }
             } else {
@@ -1170,8 +1135,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                 chainId: 0,
                 progress: 0,
                 selection: selection,
-                addressesByContractName: addressesByContractName,
-                contractNameByAddress: p.contractNameByAddress
+                addressesByContractName: addressesByContractName
               });
             }
           }
@@ -1219,8 +1183,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                   chainId: 0,
                   progress: 0,
                   selection: selection$1,
-                  addressesByContractName: addressesByContractName$1,
-                  contractNameByAddress: p.contractNameByAddress
+                  addressesByContractName: addressesByContractName$1
                 });
                 chunkFromBlock$1 = chunkToBlock$1 + 1 | 0;
                 chunkIdx$1 = chunkIdx$1 + 1 | 0;
@@ -1235,8 +1198,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                 chainId: 0,
                 progress: 0,
                 selection: selection$1,
-                addressesByContractName: addressesByContractName$1,
-                contractNameByAddress: p.contractNameByAddress
+                addressesByContractName: addressesByContractName$1
               });
             }
           } else {
@@ -1249,8 +1211,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
               chainId: 0,
               progress: 0,
               selection: selection$1,
-              addressesByContractName: addressesByContractName$1,
-              contractNameByAddress: p.contractNameByAddress
+              addressesByContractName: addressesByContractName$1
             });
           }
         }
@@ -1352,7 +1313,6 @@ function make$1(startBlock, endBlock, eventConfigs, addresses, maxAddrInPartitio
         dependsOnAddresses: false
       },
       addressesByContractName: {},
-      contractNameByAddress: {},
       mergeBlock: undefined,
       dynamicContract: undefined,
       mutPendingQueries: [],
@@ -1529,7 +1489,6 @@ function rollback(fetchState, targetBlockNumber) {
             latestFetchedBlock: p.latestFetchedBlock,
             selection: p.selection,
             addressesByContractName: rollbackedAddressesByContractName,
-            contractNameByAddress: p.contractNameByAddress,
             mergeBlock: mergeBlock$1,
             dynamicContract: p.dynamicContract,
             mutPendingQueries: rollbackPendingQueries(p.mutPendingQueries, targetBlockNumber),
@@ -1551,7 +1510,6 @@ function rollback(fetchState, targetBlockNumber) {
           }) : p.latestFetchedBlock,
         selection: p.selection,
         addressesByContractName: p.addressesByContractName,
-        contractNameByAddress: p.contractNameByAddress,
         mergeBlock: p.mergeBlock,
         dynamicContract: p.dynamicContract,
         mutPendingQueries: rollbackPendingQueries(p.mutPendingQueries, targetBlockNumber),
@@ -1597,7 +1555,6 @@ function resetPendingQueries(fetchState) {
         latestFetchedBlock: partition.latestFetchedBlock,
         selection: partition.selection,
         addressesByContractName: partition.addressesByContractName,
-        contractNameByAddress: partition.contractNameByAddress,
         mergeBlock: partition.mergeBlock,
         dynamicContract: partition.dynamicContract,
         mutPendingQueries: kept,
@@ -1804,4 +1761,4 @@ export {
   getProgressBlockNumberAt,
   updateKnownHeight,
 }
-/* Utils Not a pure module */
+/* deriveContractNameByAddress Not a pure module */

package/src/Internal.res

@@ -420,6 +420,11 @@ type eventConfig = private {
   // string set so the shared mask logic is ecosystem-agnostic; sources recover
   // the typed view where they need it.
   selectedTransactionFields: Utils.Set.t<string>,
+  // `selectedTransactionFields` precompiled to the transaction-store selection
+  // bitmask (bit per ecosystem field code). Materialisation reads this per item
+  // so each transaction decodes only the fields its event selected. `0.` when
+  // nothing is selected or the ecosystem carries the transaction inline (Fuel).
+  transactionFieldMask: float,
 }
 
 type fuelEventKind =

package/src/Main.res

@@ -687,6 +687,10 @@ let dropSchema = async () => {
   await persistence.storage.close()
 }
 
+// Rejection carried by `onError`: the failure is already logged with full
+// context, so callers should act on it (exit / re-throw) without logging again.
+exception FatalError(exn)
+
 let start = async (
   ~persistence: option<Persistence.t>=?,
   ~reset=false,
@@ -742,17 +746,20 @@ let start = async (
   | None => config
   }
   // The single fatal-error handler, invoked once via IndexerState.errorExit.
+  // It logs the failure once (with chain context) and rejects the run wrapped in
+  // `FatalError` so callers know it's already logged — `Bin.res` just exits, the
+  // test worker unwraps and re-throws it to the parent thread. `runUntilFatalError`
+  // only ever rejects: on a clean run it stays pending and the process exits via
+  // ExitOnCaughtUp / when the indexer loop drains.
+  let onErrorReject = ref(None)
+  let runUntilFatalError: promise<unit> = Promise.make((_resolve, reject) =>
+    onErrorReject := Some(reject)
+  )
+  // `onErrorReject` is filled synchronously by `Promise.make` above, before the
+  // indexer can run and call `onError`, so it's always present here.
   let onError = (errHandler: ErrorHandling.t) => {
     errHandler->ErrorHandling.log
-    if isTest {
-      // The TestIndexer runs the indexer in a worker thread and reads the
-      // failure off the worker 'error' event. Re-throw the original error
-      // outside the promise chain on the next tick so the test sees its real
-      // message instead of a generic non-zero exit code.
-      NodeJs.setImmediate(() => errHandler->ErrorHandling.raiseExn)
-    } else {
-      NodeJs.process->NodeJs.exitWithCode(Failure)
-    }
+    (onErrorReject.contents->Option.getUnsafe)(FatalError(errHandler.exn->Utils.prettifyExn))
   }
   let envioVersion = Utils.EnvioPackage.value.version
   Prometheus.Info.set(~version=envioVersion)
@@ -793,4 +800,5 @@ let start = async (
   }
   indexerStateRef := Some(state)
   state->IndexerLoop.start
+  await runUntilFatalError
 }

package/src/Main.res.mjs

@@ -522,6 +522,8 @@ async function dropSchema() {
   return await persistence.storage.close();
 }
 
+let FatalError = /* @__PURE__ */Primitive_exceptions.create("Main.FatalError");
+
 async function start(persistence, resetOpt, isTestOpt, exitAfterFirstEventBlockOpt, patchConfig) {
   let reset = resetOpt !== undefined ? resetOpt : false;
   let isTest = isTestOpt !== undefined ? isTestOpt : false;
@@ -562,13 +564,18 @@ async function start(persistence, resetOpt, isTestOpt, exitAfterFirstEventBlockO
       allEnums: config.allEnums
     }) : config;
   let config$2 = patchConfig !== undefined ? patchConfig(config$1, registrations) : config$1;
+  let onErrorReject = {
+    contents: undefined
+  };
+  let runUntilFatalError = new Promise((_resolve, reject) => {
+    onErrorReject.contents = reject;
+  });
   let onError = errHandler => {
     ErrorHandling.log(errHandler);
-    if (isTest) {
-      setImmediate(() => ErrorHandling.raiseExn(errHandler));
-    } else {
-      Process.exit(1);
-    }
+    onErrorReject.contents({
+      RE_EXN_ID: FatalError,
+      _1: Utils.prettifyExn(errHandler.exn)
+    });
   };
   let envioVersion = Utils.EnvioPackage.value.version;
   Prometheus.Info.set(envioVersion);
@@ -599,7 +606,8 @@ async function start(persistence, resetOpt, isTestOpt, exitAfterFirstEventBlockO
     Tui.start(() => state);
   }
   indexerStateRef.contents = Primitive_option.some(state);
-  return IndexerLoop.start(state);
+  IndexerLoop.start(state);
+  return await runUntilFatalError;
 }
 
 export {
@@ -616,6 +624,7 @@ export {
   getEnvioInfo,
   migrate,
   dropSchema,
+  FatalError,
   start,
 }
 /* chainDataSchema Not a pure module */

package/src/SimulateItems.res

@@ -234,6 +234,10 @@ let deriveSrcAddress = (
 // A non-wildcard event is gated by `clientAddressFilter` on srcAddress ownership,
 // so a simulate item whose srcAddress isn't indexed on this chain would be
 // silently dropped (handler never runs). Fail loudly instead.
+//
+// `config` must already have handler registrations applied, otherwise an event
+// made wildcard purely through `indexer.onEvent({ wildcard: true })` reads back
+// as non-wildcard and gets wrongly rejected.
 let validateSrcAddresses = (
   ~simulateItems: array<JSON.t>,
   ~config: Config.t,

package/src/TestIndexer.res

@@ -667,8 +667,11 @@ let makeCreateTestIndexer = (~config: Config.t, ~workerPath: string): (
             Int.compare(aId, bId)
           })
 
-          // Parse and validate all chain configs upfront before starting any workers
-          let preflightAddressesByChain = getIndexingAddressesByChain(state)
+          // Parse and validate the block ranges upfront before starting any
+          // workers. srcAddress validation can't run here: it depends on which
+          // events are wildcard, and `config` reflects config.yaml only —
+          // handler-level `wildcard: true` takes effect only once registrations
+          // are applied.
           let chainEntries = sortedChainKeys->Array.map(chainIdStr => {
             let rawChainConfig = rawChains->Dict.getUnsafe(chainIdStr)
             let chainId = switch chainIdStr->Int.fromString {
@@ -684,19 +687,6 @@ let makeCreateTestIndexer = (~config: Config.t, ~workerPath: string): (
               ~rawChainConfig,
               ~progressBlock=state.progressBlockByChain->Dict.get(chainIdStr),
             )
-            switch rawChainConfig.simulate {
-            | Some(simulateItems) =>
-              let chainConfig = config.chainMap->ChainMap.get(ChainMap.Chain.makeUnsafe(~chainId))
-              SimulateItems.validateSrcAddresses(
-                ~simulateItems,
-                ~config,
-                ~chainConfig,
-                ~indexingAddresses=preflightAddressesByChain
-                ->Dict.get(chainIdStr)
-                ->Option.getOr([]),
-              )
-            | None => ()
-            }
             (chainIdStr, chainId, rawChainConfig, processChainConfig)
           })
 
@@ -877,7 +867,27 @@ let initTestWorker = () => {
     | Some(_) => ()
     }
 
-    let patchConfig = (config, _registrations) => {
+    let patchConfig = (config: Config.t, _registrations) => {
+      // `config` here has handler registrations applied, so `isWildcard`
+      // reflects `indexer.onEvent({ wildcard: true })` — which the main thread
+      // can't see. Validate srcAddresses against it before patching in the
+      // simulate source.
+      switch simulate {
+      | Some(simulateItems) =>
+        let chainConfig = config.chainMap->ChainMap.get(ChainMap.Chain.makeUnsafe(~chainId))
+        let indexingAddresses =
+          initialState.chains
+          ->Array.find(c => c.id == chainId)
+          ->Option.mapOr([], c => c.indexingAddresses)
+        SimulateItems.validateSrcAddresses(
+          ~simulateItems,
+          ~config,
+          ~chainConfig,
+          ~indexingAddresses,
+        )
+      | None => ()
+      }
+
       let config = SimulateItems.patchConfig(~config, ~processConfig)
 
       // In auto-exit mode, set batchSize=1 to process one block checkpoint at a time
@@ -887,7 +897,23 @@ let initTestWorker = () => {
         config
       }
     }
-    Main.start(~persistence, ~isTest=true, ~patchConfig, ~exitAfterFirstEventBlock)->ignore
+    Main.start(~persistence, ~isTest=true, ~patchConfig, ~exitAfterFirstEventBlock)
+    ->Promise.catch(exn => {
+      // `Main.start` rejects on any fatal error: a runtime failure arrives wrapped
+      // in `Main.FatalError` (already logged), a setup throw (e.g. patchConfig's
+      // srcAddress validation) arrives raw. The parent only learns of failures
+      // through the worker `error` event, which fires on an *uncaught* exception.
+      // Throwing synchronously in this catch would just reject the catch's own
+      // promise (swallowed by `ignore`); `setImmediate` re-throws outside the
+      // promise chain so it becomes uncaught and reaches the parent.
+      let toThrow = switch exn {
+      | Main.FatalError(inner) => inner
+      | _ => exn->Utils.prettifyExn
+      }
+      NodeJs.setImmediate(() => throw(toThrow))
+      Promise.resolve()
+    })
+    ->ignore
   | None =>
     Logging.error("TestIndexerWorker: No worker data provided")
     NodeJs.process->NodeJs.exitWithCode(Failure)

package/src/TestIndexer.res.mjs

@@ -481,17 +481,11 @@ function makeCreateTestIndexer(config, workerPath) {
         let bId = Stdlib_Option.getOr(Stdlib_Int.fromString(b, undefined), 0);
         return Primitive_int.compare(aId, bId);
       });
-      let preflightAddressesByChain = getIndexingAddressesByChain(state);
       let chainEntries = sortedChainKeys.map(chainIdStr => {
         let rawChainConfig = rawChains[chainIdStr];
         let id = Stdlib_Int.fromString(chainIdStr, undefined);
         let chainId = id !== undefined ? id : Stdlib_JsError.throwWithMessage(`Invalid chain ID "` + chainIdStr + `": expected a numeric chain ID`);
         let processChainConfig = parseBlockRange(chainIdStr, config, rawChainConfig, state.progressBlockByChain[chainIdStr]);
-        let simulateItems = rawChainConfig.simulate;
-        if (simulateItems !== undefined) {
-          let chainConfig = ChainMap.get(config.chainMap, ChainMap.Chain.makeUnsafe(chainId));
-          SimulateItems.validateSrcAddresses(simulateItems, config, chainConfig, Stdlib_Option.getOr(preflightAddressesByChain[chainIdStr], []));
-        }
         return [
           chainIdStr,
           chainId,
@@ -592,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;
@@ -609,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);
@@ -619,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 {
@@ -646,7 +647,13 @@ 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 {

package/src/sources/Evm.res

@@ -52,7 +52,9 @@ let transactionFields = [
   "authorizationList",
 ]
 
-let transactionFieldMask = TransactionStore.makeMaskFn(transactionFields)
+// 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
@@ -83,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),
@@ -101,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,7 +40,7 @@ let transactionFields = [
   "authorizationList"
 ];
 
-let transactionFieldMask = TransactionStore.makeMaskFn(transactionFields);
+let eventTransactionFieldMask = TransactionStore.makeMaskFn(transactionFields);
 
 let cleanUpRawEventFieldsInPlace = (fields => {
     delete fields.hash
@@ -60,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,
@@ -71,15 +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,
-  transactionFieldMask,
+  eventTransactionFieldMask,
   cleanUpRawEventFieldsInPlace,
   make,
 }
-/* transactionFieldMask Not a pure module */
+/* eventTransactionFieldMask Not a pure module */

package/src/sources/Fuel.res

@@ -39,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

@@ -22,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/SourceManager.res

@@ -676,7 +676,7 @@ let executeQuery = async (
         ~fromBlock=query.fromBlock,
         ~toBlock,
         ~addressesByContractName=query.addressesByContractName,
-        ~contractNameByAddress=query.contractNameByAddress,
+        ~contractNameByAddress=query.addressesByContractName->FetchState.deriveContractNameByAddress,
         ~partitionId=query.partitionId,
         ~knownHeight,
         ~selection=query.selection,