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

package/src/FetchState.res.mjs

@@ -14,6 +14,16 @@ function deriveEffectiveStartBlock(registrationBlock, contractStartBlock) {
   return Primitive_int.max(Primitive_int.max(registrationBlock, 0), Stdlib_Option.getOr(contractStartBlock, 0));
 }
 
+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) {
+      result[addresses[i]] = contractName;
+    }
+  });
+  return result;
+});
+
 function calculateEstResponseSize(p, fromBlock, toBlock, maxQueryBlockNumber) {
   if (p.prevQueryRange <= 0) {
     return 10000;
@@ -965,8 +975,8 @@ function startFetchingQueries(param, queries) {
   }
 }
 
-function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock, maxQueryBlockNumber, maybeChunkRange, partition, selection, addressesByContractName, indexingAddresses) {
-  if (rangeFromBlock > maxQueryBlockNumber) {
+function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock, maxQueryBlockNumber, maybeChunkRange, maxChunks, partition, selection, addressesByContractName) {
+  if (!(rangeFromBlock <= maxQueryBlockNumber && maxChunks > 0)) {
     return;
   }
   if (rangeEndBlock !== undefined && rangeFromBlock > rangeEndBlock) {
@@ -975,19 +985,11 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
   if (maybeChunkRange !== undefined) {
     let maxBlock = rangeEndBlock !== undefined ? rangeEndBlock : maxQueryBlockNumber;
     let chunkSize = Js_math.ceil_int(maybeChunkRange * 1.8);
-    let probeSize = Js_math.ceil_int(maybeChunkRange * 0.9);
-    let getChunkSize = chunkIdx => {
-      if (chunkIdx < 2) {
-        return probeSize;
-      } else {
-        return chunkSize;
-      }
-    };
-    if ((((rangeFromBlock + probeSize | 0) + probeSize | 0) - 1 | 0) <= maxBlock) {
+    if (((rangeFromBlock + (chunkSize << 1) | 0) - 1 | 0) <= maxBlock) {
       let chunkFromBlock = rangeFromBlock;
       let chunkIdx = 0;
-      while (chunkIdx < 5 && ((chunkFromBlock + getChunkSize(chunkIdx) | 0) - 1 | 0) <= maxBlock) {
-        let chunkToBlock = (chunkFromBlock + getChunkSize(chunkIdx) | 0) - 1 | 0;
+      while (chunkIdx < maxChunks && ((chunkFromBlock + chunkSize | 0) - 1 | 0) <= maxBlock) {
+        let chunkToBlock = (chunkFromBlock + chunkSize | 0) - 1 | 0;
         queries.push({
           partitionId: partitionId,
           fromBlock: chunkFromBlock,
@@ -997,8 +999,7 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
           chainId: 0,
           progress: 0,
           selection: selection,
-          addressesByContractName: addressesByContractName,
-          indexingAddresses: indexingAddresses
+          addressesByContractName: addressesByContractName
         });
         chunkFromBlock = chunkToBlock + 1 | 0;
         chunkIdx = chunkIdx + 1 | 0;
@@ -1014,8 +1015,7 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
       chainId: 0,
       progress: 0,
       selection: selection,
-      addressesByContractName: addressesByContractName,
-      indexingAddresses: indexingAddresses
+      addressesByContractName: addressesByContractName
     });
     return;
   }
@@ -1028,15 +1028,13 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
     chainId: 0,
     progress: 0,
     selection: selection,
-    addressesByContractName: addressesByContractName,
-    indexingAddresses: indexingAddresses
+    addressesByContractName: addressesByContractName
   });
 }
 
 function getNextQuery(fetchState, budget, chainPendingBudget) {
   let knownHeight = fetchState.knownHeight;
   let blockLag = fetchState.blockLag;
-  let indexingAddresses = fetchState.indexingAddresses;
   let optimizedPartitions = fetchState.optimizedPartitions;
   let headBlockNumber = knownHeight - blockLag | 0;
   if (headBlockNumber <= 0) {
@@ -1083,9 +1081,10 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
       if (pq.fromBlock > cursor) {
         let addressesByContractName = p.addressesByContractName;
         let selection = p.selection;
+        let maxChunks = (10 - pendingCount | 0) - (queries.length - partitionQueriesStart | 0) | 0;
         let rangeEndBlock = Utils.$$Math.minOptInt(pq.fromBlock - 1 | 0, queryEndBlock$2);
         let rangeFromBlock = cursor;
-        if (rangeFromBlock <= maxQueryBlockNumber) {
+        if (rangeFromBlock <= maxQueryBlockNumber && maxChunks > 0) {
           let exit = 0;
           if (!(rangeEndBlock !== undefined && rangeFromBlock > rangeEndBlock)) {
             exit = 1;
@@ -1094,19 +1093,11 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
             if (maybeChunkRange !== undefined) {
               let maxBlock = rangeEndBlock !== undefined ? rangeEndBlock : maxQueryBlockNumber;
               let chunkSize = Js_math.ceil_int(maybeChunkRange * 1.8);
-              let probeSize = Js_math.ceil_int(maybeChunkRange * 0.9);
-              let getChunkSize = chunkIdx => {
-                if (chunkIdx < 2) {
-                  return probeSize;
-                } else {
-                  return chunkSize;
-                }
-              };
-              if ((((rangeFromBlock + getChunkSize(0) | 0) + getChunkSize(1) | 0) - 1 | 0) <= maxBlock) {
+              if (((rangeFromBlock + (chunkSize << 1) | 0) - 1 | 0) <= maxBlock) {
                 let chunkFromBlock = rangeFromBlock;
                 let chunkIdx = 0;
-                while (chunkIdx < 5 && ((chunkFromBlock + getChunkSize(chunkIdx) | 0) - 1 | 0) <= maxBlock) {
-                  let chunkToBlock = (chunkFromBlock + getChunkSize(chunkIdx) | 0) - 1 | 0;
+                while (chunkIdx < maxChunks && ((chunkFromBlock + chunkSize | 0) - 1 | 0) <= maxBlock) {
+                  let chunkToBlock = (chunkFromBlock + chunkSize | 0) - 1 | 0;
                   queries.push({
                     partitionId: partitionId,
                     fromBlock: chunkFromBlock,
@@ -1116,8 +1107,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                     chainId: 0,
                     progress: 0,
                     selection: selection,
-                    addressesByContractName: addressesByContractName,
-                    indexingAddresses: indexingAddresses
+                    addressesByContractName: addressesByContractName
                   });
                   chunkFromBlock = chunkToBlock + 1 | 0;
                   chunkIdx = chunkIdx + 1 | 0;
@@ -1132,8 +1122,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                   chainId: 0,
                   progress: 0,
                   selection: selection,
-                  addressesByContractName: addressesByContractName,
-                  indexingAddresses: indexingAddresses
+                  addressesByContractName: addressesByContractName
                 });
               }
             } else {
@@ -1146,8 +1135,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                 chainId: 0,
                 progress: 0,
                 selection: selection,
-                addressesByContractName: addressesByContractName,
-                indexingAddresses: indexingAddresses
+                addressesByContractName: addressesByContractName
               });
             }
           }
@@ -1170,8 +1158,9 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
     if (canContinue) {
       let addressesByContractName$1 = p.addressesByContractName;
       let selection$1 = p.selection;
+      let maxChunks$1 = (10 - pendingCount | 0) - (queries.length - partitionQueriesStart | 0) | 0;
       let rangeFromBlock$1 = cursor;
-      if (rangeFromBlock$1 <= maxQueryBlockNumber) {
+      if (rangeFromBlock$1 <= maxQueryBlockNumber && maxChunks$1 > 0) {
         let exit$1 = 0;
         if (!(queryEndBlock$2 !== undefined && rangeFromBlock$1 > queryEndBlock$2)) {
           exit$1 = 1;
@@ -1180,19 +1169,11 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
           if (maybeChunkRange !== undefined) {
             let maxBlock$1 = queryEndBlock$2 !== undefined ? queryEndBlock$2 : maxQueryBlockNumber;
             let chunkSize$1 = Js_math.ceil_int(maybeChunkRange * 1.8);
-            let probeSize$1 = Js_math.ceil_int(maybeChunkRange * 0.9);
-            let getChunkSize$1 = chunkIdx => {
-              if (chunkIdx < 2) {
-                return probeSize$1;
-              } else {
-                return chunkSize$1;
-              }
-            };
-            if ((((rangeFromBlock$1 + getChunkSize$1(0) | 0) + getChunkSize$1(1) | 0) - 1 | 0) <= maxBlock$1) {
+            if (((rangeFromBlock$1 + (chunkSize$1 << 1) | 0) - 1 | 0) <= maxBlock$1) {
               let chunkFromBlock$1 = rangeFromBlock$1;
               let chunkIdx$1 = 0;
-              while (chunkIdx$1 < 5 && ((chunkFromBlock$1 + getChunkSize$1(chunkIdx$1) | 0) - 1 | 0) <= maxBlock$1) {
-                let chunkToBlock$1 = (chunkFromBlock$1 + getChunkSize$1(chunkIdx$1) | 0) - 1 | 0;
+              while (chunkIdx$1 < maxChunks$1 && ((chunkFromBlock$1 + chunkSize$1 | 0) - 1 | 0) <= maxBlock$1) {
+                let chunkToBlock$1 = (chunkFromBlock$1 + chunkSize$1 | 0) - 1 | 0;
                 queries.push({
                   partitionId: partitionId,
                   fromBlock: chunkFromBlock$1,
@@ -1202,8 +1183,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                   chainId: 0,
                   progress: 0,
                   selection: selection$1,
-                  addressesByContractName: addressesByContractName$1,
-                  indexingAddresses: indexingAddresses
+                  addressesByContractName: addressesByContractName$1
                 });
                 chunkFromBlock$1 = chunkToBlock$1 + 1 | 0;
                 chunkIdx$1 = chunkIdx$1 + 1 | 0;
@@ -1218,8 +1198,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                 chainId: 0,
                 progress: 0,
                 selection: selection$1,
-                addressesByContractName: addressesByContractName$1,
-                indexingAddresses: indexingAddresses
+                addressesByContractName: addressesByContractName$1
               });
             }
           } else {
@@ -1232,18 +1211,12 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
               chainId: 0,
               progress: 0,
               selection: selection$1,
-              addressesByContractName: addressesByContractName$1,
-              indexingAddresses: indexingAddresses
+              addressesByContractName: addressesByContractName$1
             });
           }
         }
       }
     }
-    let maxNewChunks = Primitive_int.max(0, 10 - pendingCount | 0);
-    let generatedCount = queries.length - partitionQueriesStart | 0;
-    if (generatedCount > maxNewChunks) {
-      queries.splice(partitionQueriesStart + maxNewChunks | 0, generatedCount - maxNewChunks | 0);
-    }
     idxRef = idxRef + 1 | 0;
   };
   if (Utils.$$Array.isEmpty(queries)) {
@@ -1748,6 +1721,7 @@ let maxPendingChunksPerPartition = 10;
 
 export {
   deriveEffectiveStartBlock,
+  deriveContractNameByAddress,
   defaultEstResponseSize,
   calculateEstResponseSize,
   getMinHistoryRange,
@@ -1767,8 +1741,8 @@ export {
   registerDynamicContracts,
   handleQueryResult,
   startFetchingQueries,
-  pushQueriesForRange,
   maxPendingChunksPerPartition,
+  pushQueriesForRange,
   getNextQuery,
   hasReadyItem,
   getReadyItemsCount,
@@ -1787,4 +1761,4 @@ export {
   getProgressBlockNumberAt,
   updateKnownHeight,
 }
-/* Utils Not a pure module */
+/* deriveContractNameByAddress Not a pure module */

package/src/HandlerLoader.res

@@ -103,6 +103,7 @@ let applyRegistrations = (~config: Config.t): Config.t => {
               isWildcard,
               handler,
               contractRegister,
+              clientAddressFilter: ?EventConfigBuilder.buildAddressFilter([], ~isWildcard),
               dependsOnAddresses: Internal.dependsOnAddresses(
                 ~isWildcard,
                 ~filterByAddresses=false,
@@ -144,7 +145,10 @@ let applyRegistrations = (~config: Config.t): Config.t => {
               contractRegister,
               getEventFiltersOrThrow,
               filterByAddresses,
-              clientAddressFilter: ?EventConfigBuilder.buildAddressFilter(addressFilterParamGroups),
+              clientAddressFilter: ?EventConfigBuilder.buildAddressFilter(
+                addressFilterParamGroups,
+                ~isWildcard,
+              ),
               dependsOnAddresses: Internal.dependsOnAddresses(~isWildcard, ~filterByAddresses),
             } :> Internal.eventConfig)
           | Svm =>
@@ -155,6 +159,11 @@ let applyRegistrations = (~config: Config.t): Config.t => {
               isWildcard,
               handler,
               contractRegister,
+              clientAddressFilter: ?EventConfigBuilder.buildAddressFilter(
+                [],
+                ~isWildcard,
+                ~srcAddressExpr="event.programId",
+              ),
               dependsOnAddresses: Internal.dependsOnAddresses(
                 ~isWildcard,
                 ~filterByAddresses=false,

package/src/HandlerLoader.res.mjs

@@ -79,21 +79,28 @@ function applyRegistrations(config) {
             newrecord.getEventFiltersOrThrow = match$1.getEventFiltersOrThrow;
             newrecord.contractRegister = contractRegister;
             newrecord.handler = handler;
-            newrecord.clientAddressFilter = EventConfigBuilder.buildAddressFilter(match$1.addressFilterParamGroups);
+            newrecord.clientAddressFilter = EventConfigBuilder.buildAddressFilter(match$1.addressFilterParamGroups, isWildcard, undefined);
             newrecord.dependsOnAddresses = Internal.dependsOnAddresses(isWildcard, filterByAddresses);
             newrecord.filterByAddresses = filterByAddresses;
             newrecord.isWildcard = isWildcard;
             return newrecord;
           case "fuel" :
+            let newrecord$1 = {...ev};
+            newrecord$1.contractRegister = contractRegister;
+            newrecord$1.handler = handler;
+            newrecord$1.clientAddressFilter = EventConfigBuilder.buildAddressFilter([], isWildcard, undefined);
+            newrecord$1.dependsOnAddresses = Internal.dependsOnAddresses(isWildcard, false);
+            newrecord$1.isWildcard = isWildcard;
+            return newrecord$1;
           case "svm" :
-            break;
+            let newrecord$2 = {...ev};
+            newrecord$2.contractRegister = contractRegister;
+            newrecord$2.handler = handler;
+            newrecord$2.clientAddressFilter = EventConfigBuilder.buildAddressFilter([], isWildcard, "event.programId");
+            newrecord$2.dependsOnAddresses = Internal.dependsOnAddresses(isWildcard, false);
+            newrecord$2.isWildcard = isWildcard;
+            return newrecord$2;
         }
-        let newrecord$1 = {...ev};
-        newrecord$1.contractRegister = contractRegister;
-        newrecord$1.handler = handler;
-        newrecord$1.dependsOnAddresses = Internal.dependsOnAddresses(isWildcard, false);
-        newrecord$1.isWildcard = isWildcard;
-        return newrecord$1;
       });
       return {
         name: contract.name,

package/src/Internal.res

@@ -58,7 +58,6 @@ type evmTransactionField =
   | @as("root") Root
   | @as("status") Status
   | @as("yParity") YParity
-  | @as("accessList") AccessList
   | @as("maxFeePerBlobGas") MaxFeePerBlobGas
   | @as("blobVersionedHashes") BlobVersionedHashes
   | @as("type") Type
@@ -67,6 +66,7 @@ type evmTransactionField =
   | @as("l1GasUsed") L1GasUsed
   | @as("l1FeeScalar") L1FeeScalar
   | @as("gasUsedForL1") GasUsedForL1
+  | @as("accessList") AccessList
   | @as("authorizationList") AuthorizationList
 
 let allEvmBlockFields: array<evmBlockField> = [
@@ -123,7 +123,6 @@ let allEvmTransactionFields: array<evmTransactionField> = [
   Root,
   Status,
   YParity,
-  AccessList,
   MaxFeePerBlobGas,
   BlobVersionedHashes,
   Type,
@@ -132,6 +131,7 @@ let allEvmTransactionFields: array<evmTransactionField> = [
   L1GasUsed,
   L1FeeScalar,
   GasUsedForL1,
+  AccessList,
   AuthorizationList,
 ]
 let evmTransactionFieldSchema = S.enum(allEvmTransactionFields)
@@ -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 =
@@ -692,7 +697,7 @@ type effect = {
   input: S.t<effectInput>,
   // The number of functions that are currently running.
   mutable activeCallsCount: int,
-  mutable prevCallStartTimerRef: Hrtime.timeRef,
+  mutable prevCallStartTimerRef: Performance.timeRef,
   rateLimit: option<rateLimitState>,
 }
 let cacheTablePrefix = "envio_effect_"

package/src/Internal.res.mjs

@@ -60,7 +60,6 @@ let allEvmTransactionFields = [
   "root",
   "status",
   "yParity",
-  "accessList",
   "maxFeePerBlobGas",
   "blobVersionedHashes",
   "type",
@@ -69,6 +68,7 @@ let allEvmTransactionFields = [
   "l1GasUsed",
   "l1FeeScalar",
   "gasUsedForL1",
+  "accessList",
   "authorizationList"
 ];
 

package/src/LoadLayer.res

@@ -85,7 +85,7 @@ let callEffect = (
   )
 
   if hadActiveCalls {
-    let elapsed = Hrtime.secondsBetween(~from=effect.prevCallStartTimerRef, ~to=timerRef)
+    let elapsed = Performance.secondsBetween(~from=effect.prevCallStartTimerRef, ~to=timerRef)
     if elapsed > 0. {
       Prometheus.EffectCalls.timeCounter->Prometheus.SafeCounter.handleFloat(
         ~labels=effectName,
@@ -113,17 +113,17 @@ let callEffect = (
       ~labels=effectName,
       ~value=effect.activeCallsCount,
     )
-    let newTimer = Hrtime.makeTimer()
+    let newTimer = Performance.now()
     Prometheus.EffectCalls.timeCounter->Prometheus.SafeCounter.handleFloat(
       ~labels=effectName,
-      ~value=Hrtime.secondsBetween(~from=effect.prevCallStartTimerRef, ~to=newTimer),
+      ~value=Performance.secondsBetween(~from=effect.prevCallStartTimerRef, ~to=newTimer),
     )
     effect.prevCallStartTimerRef = newTimer
 
     Prometheus.EffectCalls.totalCallsCount->Prometheus.SafeCounter.increment(~labels=effectName)
     Prometheus.EffectCalls.sumTimeCounter->Prometheus.SafeCounter.handleFloat(
       ~labels=effectName,
-      ~value=timerRef->Hrtime.timeSince->Hrtime.toSecondsFloat,
+      ~value=timerRef->Performance.secondsSince,
     )
   })
 }
@@ -137,7 +137,7 @@ let rec executeWithRateLimit = (
 ) => {
   let effectName = effect.name
 
-  let timerRef = Hrtime.makeTimer()
+  let timerRef = Performance.now()
   let promises = []
 
   switch effect.rateLimit {

package/src/LoadLayer.res.mjs

@@ -2,11 +2,11 @@
 
 import * as Table from "./db/Table.res.mjs";
 import * as Utils from "./Utils.res.mjs";
-import * as Hrtime from "./bindings/Hrtime.res.mjs";
 import * as Logging from "./Logging.res.mjs";
 import * as Ecosystem from "./Ecosystem.res.mjs";
 import * as Prometheus from "./Prometheus.res.mjs";
 import * as LoadManager from "./LoadManager.res.mjs";
+import * as Performance from "./bindings/Performance.res.mjs";
 import * as Persistence from "./Persistence.res.mjs";
 import * as EntityFilter from "./db/EntityFilter.res.mjs";
 import * as IndexerState from "./IndexerState.res.mjs";
@@ -55,7 +55,7 @@ function callEffect(effect, arg, inMemTable, timerRef, onError) {
   effect.activeCallsCount = effect.activeCallsCount + 1 | 0;
   Prometheus.SafeGauge.handleInt(Prometheus.EffectCalls.activeCallsCount, effectName, effect.activeCallsCount);
   if (hadActiveCalls) {
-    let elapsed = Hrtime.secondsBetween(effect.prevCallStartTimerRef, timerRef);
+    let elapsed = Performance.secondsBetween(effect.prevCallStartTimerRef, timerRef);
     if (elapsed > 0) {
       Prometheus.SafeCounter.handleFloat(Prometheus.EffectCalls.timeCounter, effectName, elapsed);
     }
@@ -64,17 +64,17 @@ function callEffect(effect, arg, inMemTable, timerRef, onError) {
   return effect.handler(arg).then(output => InMemoryStore.setEffectOutput(inMemTable, arg.checkpointId, arg.cacheKey, output, arg.context.cache)).catch(exn => onError(arg.cacheKey, exn)).finally(() => {
     effect.activeCallsCount = effect.activeCallsCount - 1 | 0;
     Prometheus.SafeGauge.handleInt(Prometheus.EffectCalls.activeCallsCount, effectName, effect.activeCallsCount);
-    let newTimer = Hrtime.makeTimer();
-    Prometheus.SafeCounter.handleFloat(Prometheus.EffectCalls.timeCounter, effectName, Hrtime.secondsBetween(effect.prevCallStartTimerRef, newTimer));
+    let newTimer = Performance.now();
+    Prometheus.SafeCounter.handleFloat(Prometheus.EffectCalls.timeCounter, effectName, Performance.secondsBetween(effect.prevCallStartTimerRef, newTimer));
     effect.prevCallStartTimerRef = newTimer;
     Prometheus.SafeCounter.increment(Prometheus.EffectCalls.totalCallsCount, effectName);
-    Prometheus.SafeCounter.handleFloat(Prometheus.EffectCalls.sumTimeCounter, effectName, Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef)));
+    Prometheus.SafeCounter.handleFloat(Prometheus.EffectCalls.sumTimeCounter, effectName, Performance.secondsSince(timerRef));
   });
 }
 
 function executeWithRateLimit(effect, effectArgs, inMemTable, onError, isFromQueue) {
   let effectName = effect.name;
-  let timerRef = Hrtime.makeTimer();
+  let timerRef = Performance.now();
   let promises = [];
   let state = effect.rateLimit;
   if (state !== undefined) {

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/PgStorage.res

@@ -1707,13 +1707,13 @@ SELECT id, chain_id, -1, -1, contract_name FROM unnest($1::text[],$2::int[],$3::
     // Initialize sink if configured
     let sinkPromise = switch sink {
     | Some(sink) => {
-        let timerRef = Hrtime.makeTimer()
+        let timerRef = Performance.now()
         Some(
           sink.writeBatch(~batch, ~updatedEntities=chUpdates)
           ->Promise.thenResolve(_ => {
             Prometheus.StorageWrite.increment(
               ~storage=sink.name,
-              ~timeSeconds=timerRef->Hrtime.timeSince->Hrtime.toSecondsFloat,
+              ~timeSeconds=timerRef->Performance.secondsSince,
             )
             None
           })
@@ -1724,7 +1724,7 @@ SELECT id, chain_id, -1, -1, contract_name FROM unnest($1::text[],$2::int[],$3::
     | None => None
     }
 
-    let primaryTimerRef = Hrtime.makeTimer()
+    let primaryTimerRef = Performance.now()
     await writeBatch(
       sql,
       ~batch,
@@ -1741,7 +1741,7 @@ SELECT id, chain_id, -1, -1, contract_name FROM unnest($1::text[],$2::int[],$3::
     )
     Prometheus.StorageWrite.increment(
       ~storage="postgres",
-      ~timeSeconds=primaryTimerRef->Hrtime.timeSince->Hrtime.toSecondsFloat,
+      ~timeSeconds=primaryTimerRef->Performance.secondsSince,
     )
   }
 

package/src/PgStorage.res.mjs

@@ -8,13 +8,13 @@ import * as Table from "./db/Table.res.mjs";
 import * as Utils from "./Utils.res.mjs";
 import * as Config from "./Config.res.mjs";
 import * as Hasura from "./Hasura.res.mjs";
-import * as Hrtime from "./bindings/Hrtime.res.mjs";
 import * as Schema from "./db/Schema.res.mjs";
 import * as Logging from "./Logging.res.mjs";
 import * as Internal from "./Internal.res.mjs";
 import Postgres from "postgres";
 import * as ChainState from "./ChainState.res.mjs";
 import * as Prometheus from "./Prometheus.res.mjs";
+import * as Performance from "./bindings/Performance.res.mjs";
 import * as Persistence from "./Persistence.res.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as EntityHistory from "./db/EntityHistory.res.mjs";
@@ -1116,16 +1116,16 @@ SELECT id, chain_id, -1, -1, contract_name FROM unnest($1::text[],$2::int[],$3::
     }
     let sinkPromise;
     if (sink !== undefined) {
-      let timerRef = Hrtime.makeTimer();
+      let timerRef = Performance.now();
       sinkPromise = sink.writeBatch(batch, chUpdates).then(() => {
-        Prometheus.StorageWrite.increment(sink.name, Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef)));
+        Prometheus.StorageWrite.increment(sink.name, Performance.secondsSince(timerRef));
       }).catch(exn => exn);
     } else {
       sinkPromise = undefined;
     }
-    let primaryTimerRef = Hrtime.makeTimer();
+    let primaryTimerRef = Performance.now();
     await writeBatch(sql, batch, pgSchema, rollback, isInReorgThreshold, config, allEntities, setEffectCacheOrThrow, updatedEffectsCache, pgUpdates, sinkPromise, chainMetaData, undefined);
-    return Prometheus.StorageWrite.increment("postgres", Hrtime.toSecondsFloat(Hrtime.timeSince(primaryTimerRef)));
+    return Prometheus.StorageWrite.increment("postgres", Performance.secondsSince(primaryTimerRef));
   };
   let close = () => sql.end();
   return {