envio 3.1.0 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "type": "module",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.mjs",
@@ -70,10 +70,10 @@
     "tsx": "4.21.0"
   },
   "optionalDependencies": {
-    "envio-linux-x64": "3.1.0",
-    "envio-linux-x64-musl": "3.1.0",
-    "envio-linux-arm64": "3.1.0",
-    "envio-darwin-x64": "3.1.0",
-    "envio-darwin-arm64": "3.1.0"
+    "envio-linux-x64": "3.1.2",
+    "envio-linux-x64-musl": "3.1.2",
+    "envio-linux-arm64": "3.1.2",
+    "envio-darwin-x64": "3.1.2",
+    "envio-darwin-arm64": "3.1.2"
   }
 }

package/src/FetchState.res

@@ -555,6 +555,63 @@ let blockItemLogIndex = 16777216
 
 let numAddresses = fetchState => fetchState.indexingAddresses->Utils.Dict.size
 
+// Appends Block items produced by the onBlock handlers for every block in
+// (fromBlock, maxBlockNumber] into mutItems and returns the new
+// latestOnBlockBlockNumber pointer. targetBufferSize bounds how many items
+// are generated at once to prevent OOM.
+let appendOnBlockItems = (
+  ~mutItems: array<Internal.item>,
+  ~onBlockConfigs: array<Internal.onBlockConfig>,
+  ~indexerStartBlock,
+  ~fromBlock,
+  ~maxBlockNumber,
+  ~targetBufferSize,
+) => {
+  let newItemsCounter = ref(0)
+  let latestOnBlockBlockNumber = ref(fromBlock)
+
+  // Simply iterate over every block
+  // could have a better algorithm to iterate over blocks in a more efficient way
+  // but raw loops are fast enough
+  while (
+    latestOnBlockBlockNumber.contents < maxBlockNumber &&
+      // Additional safeguard to prevent OOM
+      newItemsCounter.contents <= targetBufferSize
+  ) {
+    let blockNumber = latestOnBlockBlockNumber.contents + 1
+    latestOnBlockBlockNumber := blockNumber
+
+    for configIdx in 0 to onBlockConfigs->Array.length - 1 {
+      let onBlockConfig = onBlockConfigs->Array.getUnsafe(configIdx)
+
+      let handlerStartBlock = switch onBlockConfig.startBlock {
+      | Some(startBlock) => startBlock
+      | None => indexerStartBlock
+      }
+
+      if (
+        blockNumber >= handlerStartBlock &&
+        switch onBlockConfig.endBlock {
+        | Some(endBlock) => blockNumber <= endBlock
+        | None => true
+        } &&
+        (blockNumber - handlerStartBlock)->Pervasives.mod(onBlockConfig.interval) === 0
+      ) {
+        mutItems->Array.push(
+          Block({
+            onBlockConfig,
+            blockNumber,
+            logIndex: blockItemLogIndex + onBlockConfig.index,
+          }),
+        )
+        newItemsCounter := newItemsCounter.contents + 1
+      }
+    }
+  }
+
+  latestOnBlockBlockNumber.contents
+}
+
 /*
 Update fetchState, merge registers and recompute derived values.
 Runs partition optimization when partitions change.
@@ -597,49 +654,14 @@ let updateInternal = (
       }
       mutItemsRef := Some(mutItems)
 
-      let newItemsCounter = ref(0)
-      let latestOnBlockBlockNumber = ref(fetchState.latestOnBlockBlockNumber)
-
-      // Simply iterate over every block
-      // could have a better algorithm to iterate over blocks in a more efficient way
-      // but raw loops are fast enough
-      while (
-        latestOnBlockBlockNumber.contents < maxBlockNumber &&
-          // Additional safeguard to prevent OOM
-          newItemsCounter.contents <= fetchState.targetBufferSize
-      ) {
-        let blockNumber = latestOnBlockBlockNumber.contents + 1
-        latestOnBlockBlockNumber := blockNumber
-
-        for configIdx in 0 to onBlockConfigs->Array.length - 1 {
-          let onBlockConfig = onBlockConfigs->Array.getUnsafe(configIdx)
-
-          let handlerStartBlock = switch onBlockConfig.startBlock {
-          | Some(startBlock) => startBlock
-          | None => fetchState.startBlock
-          }
-
-          if (
-            blockNumber >= handlerStartBlock &&
-            switch onBlockConfig.endBlock {
-            | Some(endBlock) => blockNumber <= endBlock
-            | None => true
-            } &&
-            (blockNumber - handlerStartBlock)->Pervasives.mod(onBlockConfig.interval) === 0
-          ) {
-            mutItems->Array.push(
-              Block({
-                onBlockConfig,
-                blockNumber,
-                logIndex: blockItemLogIndex + onBlockConfig.index,
-              }),
-            )
-            newItemsCounter := newItemsCounter.contents + 1
-          }
-        }
-      }
-
-      latestOnBlockBlockNumber.contents
+      appendOnBlockItems(
+        ~mutItems,
+        ~onBlockConfigs,
+        ~indexerStartBlock=fetchState.startBlock,
+        ~fromBlock=fetchState.latestOnBlockBlockNumber,
+        ~maxBlockNumber,
+        ~targetBufferSize=fetchState.targetBufferSize,
+      )
     }
   }
 
@@ -1661,35 +1683,59 @@ let make = (
     )
   }
 
-  let numAddresses = indexingAddresses->Utils.Dict.size
-  Prometheus.IndexingAddresses.set(~addressesCount=numAddresses, ~chainId)
-  Prometheus.IndexingPartitions.set(
-    ~partitionsCount=optimizedPartitions->OptimizedPartitions.count,
-    ~chainId,
-  )
-  Prometheus.IndexingBufferSize.set(~bufferSize=0, ~chainId)
-  Prometheus.IndexingBufferBlockNumber.set(~blockNumber=latestFetchedBlock.blockNumber, ~chainId)
-  switch endBlock {
-  | Some(endBlock) => Prometheus.IndexingEndBlock.set(~endBlock, ~chainId)
-  | None => ()
+  // On resume knownHeight is restored from the DB but the buffer starts empty.
+  // For onBlock-only indexers (e.g. SVM onSlot) there are no partitions to drive
+  // fetching, so without seeding the buffer here getNextQuery would return
+  // NothingToQuery and the indexer would get stuck.
+  let buffer = []
+  let latestOnBlockBlockNumber = if knownHeight > 0 && onBlockConfigs->Utils.Array.notEmpty {
+    let maxBlockNumber = switch optimizedPartitions->OptimizedPartitions.getLatestFullyFetchedBlock {
+    | None => knownHeight
+    | Some(latestFullyFetchedBlock) => latestFullyFetchedBlock.blockNumber
+    }
+    appendOnBlockItems(
+      ~mutItems=buffer,
+      ~onBlockConfigs,
+      ~indexerStartBlock=startBlock,
+      ~fromBlock=progressBlockNumber,
+      ~maxBlockNumber,
+      ~targetBufferSize,
+    )
+  } else {
+    progressBlockNumber
   }
 
-  {
+  let fetchState = {
     optimizedPartitions,
     contractConfigs,
     chainId,
     startBlock,
     endBlock,
-    latestOnBlockBlockNumber: progressBlockNumber,
+    latestOnBlockBlockNumber,
     normalSelection,
     indexingAddresses,
     blockLag,
     onBlockConfigs,
     targetBufferSize,
     knownHeight,
-    buffer: [],
+    buffer,
     firstEventBlock,
   }
+
+  let numAddresses = indexingAddresses->Utils.Dict.size
+  Prometheus.IndexingAddresses.set(~addressesCount=numAddresses, ~chainId)
+  Prometheus.IndexingPartitions.set(
+    ~partitionsCount=optimizedPartitions->OptimizedPartitions.count,
+    ~chainId,
+  )
+  Prometheus.IndexingBufferSize.set(~bufferSize=buffer->Array.length, ~chainId)
+  Prometheus.IndexingBufferBlockNumber.set(~blockNumber=fetchState->bufferBlockNumber, ~chainId)
+  switch endBlock {
+  | Some(endBlock) => Prometheus.IndexingEndBlock.set(~endBlock, ~chainId)
+  | None => ()
+  }
+
+  fetchState
 }
 
 let bufferSize = ({buffer}: t) => buffer->Array.length

package/src/FetchState.res.mjs

@@ -450,6 +450,35 @@ function numAddresses(fetchState) {
   return Utils.Dict.size(fetchState.indexingAddresses);
 }
 
+function appendOnBlockItems(mutItems, onBlockConfigs, indexerStartBlock, fromBlock, maxBlockNumber, targetBufferSize) {
+  let newItemsCounter = 0;
+  let latestOnBlockBlockNumber = fromBlock;
+  while (latestOnBlockBlockNumber < maxBlockNumber && newItemsCounter <= targetBufferSize) {
+    let blockNumber = latestOnBlockBlockNumber + 1 | 0;
+    latestOnBlockBlockNumber = blockNumber;
+    for (let configIdx = 0, configIdx_finish = onBlockConfigs.length; configIdx < configIdx_finish; ++configIdx) {
+      let onBlockConfig = onBlockConfigs[configIdx];
+      let startBlock = onBlockConfig.startBlock;
+      let handlerStartBlock = startBlock !== undefined ? startBlock : indexerStartBlock;
+      let tmp = false;
+      if (blockNumber >= handlerStartBlock) {
+        let endBlock = onBlockConfig.endBlock;
+        tmp = endBlock !== undefined ? blockNumber <= endBlock : true;
+      }
+      if (tmp && Primitive_int.mod_(blockNumber - handlerStartBlock | 0, onBlockConfig.interval) === 0) {
+        mutItems.push({
+          kind: 1,
+          onBlockConfig: onBlockConfig,
+          blockNumber: blockNumber,
+          logIndex: 16777216 + onBlockConfig.index | 0
+        });
+        newItemsCounter = newItemsCounter + 1 | 0;
+      }
+    }
+  };
+  return latestOnBlockBlockNumber;
+}
+
 function updateInternal(fetchState, optimizedPartitionsOpt, indexingAddressesOpt, mutItems, blockLagOpt, knownHeightOpt) {
   let optimizedPartitions = optimizedPartitionsOpt !== undefined ? optimizedPartitionsOpt : fetchState.optimizedPartitions;
   let indexingAddresses = indexingAddressesOpt !== undefined ? indexingAddressesOpt : fetchState.indexingAddresses;
@@ -472,32 +501,7 @@ function updateInternal(fetchState, optimizedPartitionsOpt, indexingAddressesOpt
     let mutItems$2 = mutItemsRef;
     let mutItems$3 = mutItems$2 !== undefined ? mutItems$2 : fetchState.buffer.slice();
     mutItemsRef = mutItems$3;
-    let newItemsCounter = 0;
-    let latestOnBlockBlockNumber$1 = fetchState.latestOnBlockBlockNumber;
-    while (latestOnBlockBlockNumber$1 < maxBlockNumber && newItemsCounter <= fetchState.targetBufferSize) {
-      let blockNumber = latestOnBlockBlockNumber$1 + 1 | 0;
-      latestOnBlockBlockNumber$1 = blockNumber;
-      for (let configIdx = 0, configIdx_finish = onBlockConfigs.length; configIdx < configIdx_finish; ++configIdx) {
-        let onBlockConfig = onBlockConfigs[configIdx];
-        let startBlock = onBlockConfig.startBlock;
-        let handlerStartBlock = startBlock !== undefined ? startBlock : fetchState.startBlock;
-        let tmp = false;
-        if (blockNumber >= handlerStartBlock) {
-          let endBlock = onBlockConfig.endBlock;
-          tmp = endBlock !== undefined ? blockNumber <= endBlock : true;
-        }
-        if (tmp && Primitive_int.mod_(blockNumber - handlerStartBlock | 0, onBlockConfig.interval) === 0) {
-          mutItems$3.push({
-            kind: 1,
-            onBlockConfig: onBlockConfig,
-            blockNumber: blockNumber,
-            logIndex: 16777216 + onBlockConfig.index | 0
-          });
-          newItemsCounter = newItemsCounter + 1 | 0;
-        }
-      }
-    };
-    latestOnBlockBlockNumber = latestOnBlockBlockNumber$1;
+    latestOnBlockBlockNumber = appendOnBlockItems(mutItems$3, onBlockConfigs, fetchState.startBlock, fetchState.latestOnBlockBlockNumber, maxBlockNumber, fetchState.targetBufferSize);
   } else {
     latestOnBlockBlockNumber = knownHeight;
   }
@@ -1299,15 +1303,17 @@ function make$1(startBlock, endBlock, eventConfigs, addresses, maxAddrInPartitio
   if (optimizedPartitions.idsInAscOrder.length === 0 && Utils.$$Array.isEmpty(onBlockConfigs)) {
     Stdlib_JsError.throwWithMessage(`Invalid configuration: Nothing to fetch on chain ` + chainId.toString() + `. ` + (`addresses=` + addresses.length.toString() + `, `) + (`eventConfigs=` + eventConfigs.length.toString() + `, `) + (`normalEventConfigs=` + normalEventConfigs.length.toString() + `. `) + `Make sure that you provided at least one contract address to index, or have events with Wildcard mode enabled, or have onBlock handlers.`);
   }
-  let numAddresses = Utils.Dict.size(indexingAddresses);
-  Prometheus.IndexingAddresses.set(numAddresses, chainId);
-  Prometheus.IndexingPartitions.set(optimizedPartitions.idsInAscOrder.length, chainId);
-  Prometheus.IndexingBufferSize.set(0, chainId);
-  Prometheus.IndexingBufferBlockNumber.set(progressBlockNumber, chainId);
-  if (endBlock !== undefined) {
-    Prometheus.IndexingEndBlock.set(endBlock, chainId);
+  let buffer = [];
+  let latestOnBlockBlockNumber;
+  if (knownHeight > 0 && Utils.$$Array.notEmpty(onBlockConfigs)) {
+    let id = optimizedPartitions.idsInAscOrder[0];
+    let latestFullyFetchedBlock = id !== undefined ? optimizedPartitions.entities[id].latestFetchedBlock : undefined;
+    let maxBlockNumber = latestFullyFetchedBlock !== undefined ? latestFullyFetchedBlock.blockNumber : knownHeight;
+    latestOnBlockBlockNumber = appendOnBlockItems(buffer, onBlockConfigs, startBlock, progressBlockNumber, maxBlockNumber, targetBufferSize);
+  } else {
+    latestOnBlockBlockNumber = progressBlockNumber;
   }
-  return {
+  let fetchState = {
     optimizedPartitions: optimizedPartitions,
     startBlock: startBlock,
     endBlock: endBlock,
@@ -1315,14 +1321,23 @@ function make$1(startBlock, endBlock, eventConfigs, addresses, maxAddrInPartitio
     indexingAddresses: indexingAddresses,
     contractConfigs: contractConfigs,
     chainId: chainId,
-    latestOnBlockBlockNumber: progressBlockNumber,
+    latestOnBlockBlockNumber: latestOnBlockBlockNumber,
     blockLag: blockLag,
-    buffer: [],
+    buffer: buffer,
     targetBufferSize: targetBufferSize,
     onBlockConfigs: onBlockConfigs,
     knownHeight: knownHeight,
     firstEventBlock: firstEventBlock
   };
+  let numAddresses = Utils.Dict.size(indexingAddresses);
+  Prometheus.IndexingAddresses.set(numAddresses, chainId);
+  Prometheus.IndexingPartitions.set(optimizedPartitions.idsInAscOrder.length, chainId);
+  Prometheus.IndexingBufferSize.set(buffer.length, chainId);
+  Prometheus.IndexingBufferBlockNumber.set(bufferBlockNumber(fetchState), chainId);
+  if (endBlock !== undefined) {
+    Prometheus.IndexingEndBlock.set(endBlock, chainId);
+  }
+  return fetchState;
 }
 
 function bufferSize(param) {
@@ -1607,6 +1622,7 @@ export {
   compareBufferItem,
   blockItemLogIndex,
   numAddresses,
+  appendOnBlockItems,
   updateInternal,
   warnDifferentContractType,
   addressesByContractNameCount,

package/src/InMemoryStore.res

@@ -124,10 +124,19 @@ let getEffectInMemTable = (inMemoryStore: t, ~effect: Internal.effect) => {
   }
 }
 
-let getEffectOutput = (inMemTable: effectCacheInMemTable, key) =>
+let hasEffectOutput = (inMemTable: effectCacheInMemTable, key) =>
   switch inMemTable.dict->Utils.Dict.dangerouslyGetNonOption(key) {
-  | Some(Set({entity: output})) => Some(output)
-  | Some(Delete(_)) | None => None
+  | Some(Set(_)) => true
+  | Some(Delete(_)) | None => false
+  }
+
+// Returns the raw output. The output is itself an option for effects with an
+// optional output, so it must never be wrapped in another option here: Some(None)
+// is encoded as the nested-option sentinel and would leak to the handler.
+let getEffectOutputUnsafe = (inMemTable: effectCacheInMemTable, key): Internal.effectOutput =>
+  switch inMemTable.dict->Utils.Dict.dangerouslyGetNonOption(key) {
+  | Some(Set({entity: output})) => output
+  | Some(Delete(_)) | None => %raw(`undefined`)
   }
 
 // Records a handler output. Persisted on the next write only when shouldCache;

package/src/InMemoryStore.res.mjs

@@ -90,11 +90,21 @@ function getEffectInMemTable(inMemoryStore, effect) {
   return table$1;
 }
 
-function getEffectOutput(inMemTable, key) {
+function hasEffectOutput(inMemTable, key) {
+  let match = inMemTable.dict[key];
+  if (match !== undefined) {
+    return match.type === "SET";
+  } else {
+    return false;
+  }
+}
+
+function getEffectOutputUnsafe(inMemTable, key) {
   let match = inMemTable.dict[key];
   if (match !== undefined && match.type === "SET") {
-    return Primitive_option.some(match.entity);
+    return match.entity;
   }
+  return undefined;
 }
 
 function setEffectOutput(inMemTable, checkpointId, cacheKey, output, shouldCache) {
@@ -487,7 +497,8 @@ export {
   make$1 as make,
   keepLatestChangesLimit,
   getEffectInMemTable,
-  getEffectOutput,
+  hasEffectOutput,
+  getEffectOutputUnsafe,
   setEffectOutput,
   initEffectOutputFromDb,
   dropCommittedEffects,

package/src/LoadLayer.res

@@ -336,8 +336,8 @@ let loadEffect = (
     ~load,
     ~shouldGroup,
     ~hasher=args => args.cacheKey,
-    ~getUnsafeInMemory=hash => inMemTable->InMemoryStore.getEffectOutput(hash)->Option.getUnsafe,
-    ~hasInMemory=hash => inMemTable->InMemoryStore.getEffectOutput(hash)->Option.isSome,
+    ~getUnsafeInMemory=hash => inMemTable->InMemoryStore.getEffectOutputUnsafe(hash),
+    ~hasInMemory=hash => inMemTable->InMemoryStore.hasEffectOutput(hash),
     ~input=effectArgs,
   )
 }

package/src/LoadLayer.res.mjs

@@ -12,7 +12,6 @@ import * as TableIndices from "./TableIndices.res.mjs";
 import * as ErrorHandling from "./ErrorHandling.res.mjs";
 import * as InMemoryStore from "./InMemoryStore.res.mjs";
 import * as InMemoryTable from "./InMemoryTable.res.mjs";
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 
@@ -187,7 +186,7 @@ function loadEffect(loadManager, persistence, effect, effectArgs, inMemoryStore,
       return await executeWithRateLimit(effect, argsToCall, inMemTable, onError, false);
     }
   };
-  return LoadManager.call(loadManager, effectArgs, key, load, args => args.cacheKey, shouldGroup, hash => Stdlib_Option.isSome(InMemoryStore.getEffectOutput(inMemTable, hash)), hash => InMemoryStore.getEffectOutput(inMemTable, hash));
+  return LoadManager.call(loadManager, effectArgs, key, load, args => args.cacheKey, shouldGroup, hash => InMemoryStore.hasEffectOutput(inMemTable, hash), hash => InMemoryStore.getEffectOutputUnsafe(inMemTable, hash));
 }
 
 function loadByField(loadManager, persistence, operator, entityConfig, inMemoryStore, fieldName, fieldValueSchema, shouldGroup, item, fieldValue) {

package/src/sources/EvmChain.res

@@ -41,25 +41,18 @@ let getSyncConfig = (
 let collectEventParams = (contracts: array<Internal.evmContractConfig>): array<
   HyperSyncClient.Decoder.eventParamsInput,
 > => {
-  let seen = Dict.make()
   let result = []
   contracts->Array.forEach(contract => {
     contract.events->Array.forEach(event => {
-      let key = event.sighash ++ "_" ++ event.topicCount->Int.toString
-      switch seen->Dict.get(key) {
-      | Some(_) => ()
-      | None => {
-          seen->Dict.set(key, true)
-          result
-          ->Array.push({
-            HyperSyncClient.Decoder.sighash: event.sighash,
-            topicCount: event.topicCount,
-            eventName: event.name,
-            params: event.paramsMetadata,
-          })
-          ->ignore
-        }
-      }
+      result
+      ->Array.push({
+        HyperSyncClient.Decoder.sighash: event.sighash,
+        topicCount: event.topicCount,
+        eventName: event.name,
+        contractName: contract.name,
+        params: event.paramsMetadata,
+      })
+      ->ignore
     })
   })
   result

package/src/sources/EvmChain.res.mjs

@@ -22,24 +22,16 @@ function getSyncConfig(param) {
 }
 
 function collectEventParams(contracts) {
-  let seen = {};
   let result = [];
   contracts.forEach(contract => {
     contract.events.forEach(event => {
-      let key = event.sighash + "_" + event.topicCount.toString();
-      let match = seen[key];
-      if (match !== undefined) {
-        return;
-      } else {
-        seen[key] = true;
-        result.push({
-          sighash: event.sighash,
-          topicCount: event.topicCount,
-          eventName: event.name,
-          params: event.paramsMetadata
-        });
-        return;
-      }
+      result.push({
+        sighash: event.sighash,
+        topicCount: event.topicCount,
+        eventName: event.name,
+        contractName: contract.name,
+        params: event.paramsMetadata
+      });
     });
   });
   return result;

package/src/sources/HyperSyncClient.res

@@ -322,11 +322,17 @@ module Decoder = {
     sighash: string,
     topicCount: int,
     eventName: string,
+    contractName: string,
     params: array<Internal.paramMeta>,
   }
 
+  // Decoded params keyed by contract name. Contracts that emit the same-signature
+  // event share one decode but get their own param names, so the caller picks the
+  // entry for the contract its router resolved the log to.
   type tWithParams = {
-    decodeLogs: array<ResponseTypes.event> => promise<array<Nullable.t<Internal.eventParams>>>,
+    decodeLogs: array<ResponseTypes.event> => promise<
+      array<Nullable.t<dict<Internal.eventParams>>>,
+    >,
   }
 
   @send
@@ -348,7 +354,7 @@ module EventItems = {
     topicCount: int,
     block: ResponseTypes.block,
     transaction: ResponseTypes.transaction,
-    params: Nullable.t<Internal.eventParams>,
+    params: Nullable.t<dict<Internal.eventParams>>,
   }
 
   type response = {

package/src/sources/HyperSyncSource.res

@@ -351,20 +351,23 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`)
           ~blockNumber=item.block.number->Belt.Option.getUnsafe,
         )
 
-      switch (maybeEventConfig, item.params) {
-      | (Some(eventConfig), Value(decoded)) =>
-        parsedQueueItems
-        ->Array.push(makeEventBatchQueueItem(item, ~params=decoded, ~eventConfig))
-        ->ignore
-      | (Some(eventConfig), Null | Undefined) =>
-        handleDecodeFailure(
-          ~eventConfig,
-          ~logIndex=item.logIndex,
-          ~blockNumber=item.block.number->Belt.Option.getUnsafe,
-          ~chainId,
-          ~exn=UndefinedValue,
-        )
-      | (None, _) => () //ignore events that aren't registered
+      switch maybeEventConfig {
+      | None => () //ignore events that aren't registered
+      | Some(eventConfig) =>
+        switch item.params
+        ->Nullable.toOption
+        ->Option.flatMap(Dict.get(_, eventConfig.contractName)) {
+        | Some(params) =>
+          parsedQueueItems->Array.push(makeEventBatchQueueItem(item, ~params, ~eventConfig))->ignore
+        | None =>
+          handleDecodeFailure(
+            ~eventConfig,
+            ~logIndex=item.logIndex,
+            ~blockNumber=item.block.number->Belt.Option.getUnsafe,
+            ~chainId,
+            ~exn=UndefinedValue,
+          )
+        }
       }
     })
 

package/src/sources/HyperSyncSource.res.mjs

@@ -14,6 +14,7 @@ import * as ErrorHandling from "../ErrorHandling.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as HyperSyncClient from "./HyperSyncClient.res.mjs";
+import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as HyperSyncHeightStream from "./HyperSyncHeightStream.res.mjs";
 
@@ -215,32 +216,31 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`);
     let parsedQueueItems = [];
     Belt_Array.forEach(pageUnsafe.items, item => {
       let maybeEventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(item.topic0, item.topicCount), item.srcAddress, item.block.number, indexingAddresses);
-      let match = item.params;
       if (maybeEventConfig === undefined) {
         return;
       }
-      if (match == null) {
-        match === null;
-      } else {
-        parsedQueueItems.push(makeEventBatchQueueItem(item, match, maybeEventConfig));
-        return;
-      }
-      let logIndex = item.logIndex;
-      let blockNumber = item.block.number;
-      let exn = {
-        RE_EXN_ID: UndefinedValue
-      };
-      if (maybeEventConfig.isWildcard) {
+      let params = Stdlib_Option.flatMap(Primitive_option.fromNullable(item.params), __x => __x[maybeEventConfig.contractName]);
+      if (params !== undefined) {
+        parsedQueueItems.push(makeEventBatchQueueItem(item, Primitive_option.valFromOption(params), maybeEventConfig));
         return;
+      } else {
+        let logIndex = item.logIndex;
+        let blockNumber = item.block.number;
+        let exn = {
+          RE_EXN_ID: UndefinedValue
+        };
+        if (maybeEventConfig.isWildcard) {
+          return;
+        }
+        let msg = `Event ` + maybeEventConfig.name + ` was unexpectedly parsed as undefined`;
+        let logger$1 = Logging.createChildFrom(logger, {
+          chainId: chain,
+          blockNumber: blockNumber,
+          logIndex: logIndex,
+          decoder: "hypersync-client"
+        });
+        return ErrorHandling.mkLogAndRaise(logger$1, msg, exn);
       }
-      let msg = `Event ` + maybeEventConfig.name + ` was unexpectedly parsed as undefined`;
-      let logger$1 = Logging.createChildFrom(logger, {
-        chainId: chain,
-        blockNumber: blockNumber,
-        logIndex: logIndex,
-        decoder: "hypersync-client"
-      });
-      ErrorHandling.mkLogAndRaise(logger$1, msg, exn);
     });
     let parsingTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(parsingTimeRef));
     let blockHashes = [];

package/src/sources/RpcSource.res

@@ -1115,7 +1115,7 @@ let make = (
     ->Array.zip(parsedEvents)
     ->Array.filterMap(((
       log: Rpc.GetLogs.log,
-      maybeDecodedEvent: Nullable.t<Internal.eventParams>,
+      maybeDecodedEvent: Nullable.t<dict<Internal.eventParams>>,
     )) => {
       let topic0 = log.topics[0]->Option.getOr("0x0")
       let routedAddress = if lowercaseAddresses {
@@ -1132,8 +1132,10 @@ let make = (
       ) {
       | None => None
       | Some(eventConfig) =>
-        switch maybeDecodedEvent {
-        | Value(decoded) =>
+        switch maybeDecodedEvent
+        ->Nullable.toOption
+        ->Option.flatMap(Dict.get(_, eventConfig.contractName)) {
+        | Some(decoded) =>
           Some(
             (
               async () => {
@@ -1176,7 +1178,7 @@ let make = (
               }
             )(),
           )
-        | Null | Undefined => None
+        | None => None
         }
       }
     })

package/src/sources/RpcSource.res.mjs

@@ -1064,54 +1064,59 @@ function make(param) {
       };
     }
     let parsedQueueItems = await Promise.all(Stdlib_Array.filterMap(Stdlib_Array.zip(logs, parsedEvents), param => {
-      let maybeDecodedEvent = param[1];
       let log = param[0];
       let topic0 = Stdlib_Option.getOr(log.topics[0], "0x0");
       let routedAddress = lowercaseAddresses ? Address.Evm.fromAddressLowercaseOrThrow(log.address) : Address.Evm.fromAddressOrThrow(log.address);
       let eventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), routedAddress, log.blockNumber, indexingAddresses);
-      if (eventConfig !== undefined && maybeDecodedEvent !== null && maybeDecodedEvent !== undefined) {
-        return (async () => {
-          let match;
-          try {
-            match = await Promise.all([
-              getEventBlockOrThrow(log, eventConfig.selectedBlockFields),
-              getEventTransactionOrThrow(log, eventConfig.selectedTransactionFields)
-            ]);
-          } catch (raw_exn) {
-            let exn = Primitive_exceptions.internalToException(raw_exn);
-            throw {
-              RE_EXN_ID: Source.GetItemsError,
-              _1: {
-                TAG: "FailedGettingFieldSelection",
-                exn: exn,
-                blockNumber: log.blockNumber,
-                logIndex: log.logIndex,
-                message: "Failed getting selected fields. Please double-check your RPC provider returns correct data."
-              },
-              Error: new Error()
-            };
-          }
-          let block = match[0];
-          return {
-            kind: 0,
-            eventConfig: eventConfig,
-            timestamp: block.timestamp,
-            chain: chain,
-            blockNumber: block.number,
-            logIndex: log.logIndex,
-            event: {
-              contractName: eventConfig.contractName,
-              eventName: eventConfig.name,
-              params: maybeDecodedEvent,
-              chainId: chain,
-              srcAddress: routedAddress,
+      if (eventConfig === undefined) {
+        return;
+      }
+      let decoded = Stdlib_Option.flatMap(Primitive_option.fromNullable(param[1]), __x => __x[eventConfig.contractName]);
+      if (decoded === undefined) {
+        return;
+      }
+      let decoded$1 = Primitive_option.valFromOption(decoded);
+      return (async () => {
+        let match;
+        try {
+          match = await Promise.all([
+            getEventBlockOrThrow(log, eventConfig.selectedBlockFields),
+            getEventTransactionOrThrow(log, eventConfig.selectedTransactionFields)
+          ]);
+        } catch (raw_exn) {
+          let exn = Primitive_exceptions.internalToException(raw_exn);
+          throw {
+            RE_EXN_ID: Source.GetItemsError,
+            _1: {
+              TAG: "FailedGettingFieldSelection",
+              exn: exn,
+              blockNumber: log.blockNumber,
               logIndex: log.logIndex,
-              transaction: match[1],
-              block: block
-            }
+              message: "Failed getting selected fields. Please double-check your RPC provider returns correct data."
+            },
+            Error: new Error()
           };
-        })();
-      }
+        }
+        let block = match[0];
+        return {
+          kind: 0,
+          eventConfig: eventConfig,
+          timestamp: block.timestamp,
+          chain: chain,
+          blockNumber: block.number,
+          logIndex: log.logIndex,
+          event: {
+            contractName: eventConfig.contractName,
+            eventName: eventConfig.name,
+            params: decoded$1,
+            chainId: chain,
+            srcAddress: routedAddress,
+            logIndex: log.logIndex,
+            transaction: match[1],
+            block: block
+          }
+        };
+      })();
     }));
     let optFirstBlockParent = await firstBlockParentPromise;
     let totalTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(startFetchingBatchTimeRef));