envio 2.28.0-alpha.3 → 2.28.0

package/src/db/InternalTable.res.js

@@ -11,35 +11,6 @@ var Belt_Array = require("rescript/lib/js/belt_Array.js");
 var EntityHistory = require("./EntityHistory.res.js");
 var S$RescriptSchema = require("rescript-schema/src/S.res.js");
 
-var blockTimestampFieldName = "block_timestamp";
-
-var blockNumberFieldName = "block_number";
-
-var logIndexFieldName = "log_index";
-
-var isPreRegisteringDynamicContractsFieldName = "is_pre_registering_dynamic_contracts";
-
-var table = Table.mkTable("event_sync_state", undefined, [
-      Table.mkField("chain_id", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
-      Table.mkField(blockNumberFieldName, "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField(logIndexFieldName, "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField(blockTimestampFieldName, "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField(isPreRegisteringDynamicContractsFieldName, "BOOLEAN", S$RescriptSchema.bool, "false", undefined, undefined, undefined, undefined, undefined)
-    ]);
-
-function resetCurrentCurrentSyncStateQuery(pgSchema) {
-  return "UPDATE \"" + pgSchema + "\".\"" + table.tableName + "\"\n    SET " + blockNumberFieldName + " = 0, \n        " + logIndexFieldName + " = 0, \n        " + blockTimestampFieldName + " = 0, \n        " + isPreRegisteringDynamicContractsFieldName + " = false;";
-}
-
-var EventSyncState = {
-  blockTimestampFieldName: blockTimestampFieldName,
-  blockNumberFieldName: blockNumberFieldName,
-  logIndexFieldName: logIndexFieldName,
-  isPreRegisteringDynamicContractsFieldName: isPreRegisteringDynamicContractsFieldName,
-  table: table,
-  resetCurrentCurrentSyncStateQuery: resetCurrentCurrentSyncStateQuery
-};
-
 var fields = [
   "id",
   "start_block",
@@ -47,14 +18,15 @@ var fields = [
   "source_block",
   "first_event_block",
   "buffer_block",
+  "progress_block",
   "ready_at",
   "events_processed",
+  "_progress_log_index",
   "_is_hyper_sync",
-  "_latest_processed_block",
   "_num_batches_fetched"
 ];
 
-var table$1 = Table.mkTable("envio_chains", undefined, [
+var table = Table.mkTable("envio_chains", undefined, [
       Table.mkField("id", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
       Table.mkField("start_block", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("end_block", "INTEGER", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, undefined, undefined, undefined),
@@ -64,7 +36,8 @@ var table$1 = Table.mkTable("envio_chains", undefined, [
       Table.mkField("ready_at", "TIMESTAMP WITH TIME ZONE NULL", S$RescriptSchema.$$null(Utils.Schema.dbDate), undefined, undefined, true, undefined, undefined, undefined),
       Table.mkField("events_processed", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("_is_hyper_sync", "BOOLEAN", S$RescriptSchema.bool, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("_latest_processed_block", "INTEGER", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, undefined, undefined, undefined),
+      Table.mkField("progress_block", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("_progress_log_index", "INTEGER", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, undefined, undefined, undefined),
       Table.mkField("_num_batches_fetched", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined)
     ]);
 
@@ -73,12 +46,13 @@ function initialFromConfig(chainConfig) {
           id: chainConfig.id,
           start_block: chainConfig.startBlock,
           end_block: Js_null.fromOption(chainConfig.endBlock),
-          source_block: 0,
+          progress_block: -1,
+          _progress_log_index: null,
+          events_processed: 0,
           first_event_block: null,
           buffer_block: -1,
+          source_block: 0,
           ready_at: null,
-          events_processed: 0,
-          _latest_processed_block: null,
           _is_hyper_sync: false,
           _num_batches_fetched: 0
         };
@@ -113,53 +87,85 @@ function makeInitialValuesQuery(pgSchema, chainConfigs) {
                 }));
           return "(" + values.join(", ") + ")";
         }));
-  return "INSERT INTO \"" + pgSchema + "\".\"" + table$1.tableName + "\" (" + columnNames.join(", ") + ")\nVALUES " + valuesRows.join(",\n       ") + ";";
+  return "INSERT INTO \"" + pgSchema + "\".\"" + table.tableName + "\" (" + columnNames.join(", ") + ")\nVALUES " + valuesRows.join(",\n       ") + ";";
 }
 
-var updateFields = [
+var metaFields = [
   "source_block",
-  "first_event_block",
   "buffer_block",
+  "first_event_block",
   "ready_at",
-  "events_processed",
   "_is_hyper_sync",
-  "_latest_processed_block",
   "_num_batches_fetched"
 ];
 
-function makeSingleUpdateQuery(pgSchema) {
-  var setClauses = Belt_Array.mapWithIndex(updateFields, (function (index, field) {
+function makeMetaFieldsUpdateQuery(pgSchema) {
+  var setClauses = Belt_Array.mapWithIndex(metaFields, (function (index, field) {
           var paramIndex = index + 2 | 0;
           return "\"" + field + "\" = $" + String(paramIndex);
         }));
-  return "UPDATE \"" + pgSchema + "\".\"" + table$1.tableName + "\"\nSET " + setClauses.join(",\n    ") + "\nWHERE \"id\" = $1;";
+  return "UPDATE \"" + pgSchema + "\".\"" + table.tableName + "\"\nSET " + setClauses.join(",\n    ") + "\nWHERE \"id\" = $1;";
+}
+
+var progressFields = [
+  "progress_block",
+  "_progress_log_index",
+  "events_processed"
+];
+
+function makeProgressFieldsUpdateQuery(pgSchema) {
+  var setClauses = Belt_Array.mapWithIndex(progressFields, (function (index, field) {
+          var paramIndex = index + 2 | 0;
+          return "\"" + field + "\" = $" + String(paramIndex);
+        }));
+  return "UPDATE \"" + pgSchema + "\".\"" + table.tableName + "\"\nSET " + setClauses.join(",\n    ") + "\nWHERE \"id\" = $1;";
+}
+
+function setMeta(sql, pgSchema, chainsData) {
+  var query = makeMetaFieldsUpdateQuery(pgSchema);
+  var promises = [];
+  Utils.Dict.forEachWithKey(chainsData, (function (chainId, data) {
+          var params = [];
+          params.push(chainId);
+          metaFields.forEach(function (field) {
+                var value = data[field];
+                params.push(value);
+              });
+          promises.push(sql.unsafe(query, params, {prepare: true}));
+        }));
+  return Promise.all(promises);
 }
 
-function setValues(sql, pgSchema, chainsData) {
-  var query = makeSingleUpdateQuery(pgSchema);
-  return Promise.all(Belt_Array.map(chainsData, (function (chain) {
-                    var params = [];
-                    var idValue = Js_dict.get(chain, "id");
-                    params.push(idValue);
-                    updateFields.forEach(function (field) {
-                          var value = Js_dict.get(chain, field);
-                          params.push(value);
-                        });
-                    return sql.unsafe(query, params, {prepare: true});
-                  })));
+function setProgressedChains(sql, pgSchema, progressedChains) {
+  var query = makeProgressFieldsUpdateQuery(pgSchema);
+  var promises = [];
+  progressedChains.forEach(function (data) {
+        var params = [];
+        params.push(data.chainId);
+        progressFields.forEach(function (field) {
+              params.push(field === "events_processed" ? data.totalEventsProcessed : (
+                      field === "progress_block" ? data.progressBlockNumber : Js_null.fromOption(data.progressNextBlockLogIndex)
+                    ));
+            });
+        promises.push(sql.unsafe(query, params, {prepare: true}));
+      });
+  return Promise.all(promises);
 }
 
 var Chains = {
   fields: fields,
-  table: table$1,
+  table: table,
   initialFromConfig: initialFromConfig,
   makeInitialValuesQuery: makeInitialValuesQuery,
-  updateFields: updateFields,
-  makeSingleUpdateQuery: makeSingleUpdateQuery,
-  setValues: setValues
+  metaFields: metaFields,
+  makeMetaFieldsUpdateQuery: makeMetaFieldsUpdateQuery,
+  progressFields: progressFields,
+  makeProgressFieldsUpdateQuery: makeProgressFieldsUpdateQuery,
+  setMeta: setMeta,
+  setProgressedChains: setProgressedChains
 };
 
-var table$2 = Table.mkTable("persisted_state", undefined, [
+var table$1 = Table.mkTable("persisted_state", undefined, [
       Table.mkField("id", "SERIAL", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
       Table.mkField("envio_version", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("config_hash", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
@@ -169,17 +175,17 @@ var table$2 = Table.mkTable("persisted_state", undefined, [
     ]);
 
 var PersistedState = {
-  table: table$2
+  table: table$1
 };
 
-var table$3 = Table.mkTable("end_of_block_range_scanned_data", undefined, [
+var table$2 = Table.mkTable("end_of_block_range_scanned_data", undefined, [
       Table.mkField("chain_id", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
       Table.mkField("block_number", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
       Table.mkField("block_hash", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined)
     ]);
 
 var EndOfBlockRangeScannedData = {
-  table: table$3
+  table: table$2
 };
 
 var schema = S$RescriptSchema.schema(function (s) {
@@ -199,7 +205,7 @@ var schema = S$RescriptSchema.schema(function (s) {
             };
     });
 
-var table$4 = Table.mkTable("raw_events", undefined, [
+var table$3 = Table.mkTable("raw_events", undefined, [
       Table.mkField("chain_id", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("event_id", "NUMERIC", S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("event_name", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
@@ -218,7 +224,7 @@ var table$4 = Table.mkTable("raw_events", undefined, [
 
 var RawEvents = {
   schema: schema,
-  table: table$4
+  table: table$3
 };
 
 var metaViewName = "_meta";
@@ -226,11 +232,11 @@ var metaViewName = "_meta";
 var chainMetadataViewName = "chain_metadata";
 
 function makeMetaViewQuery(pgSchema) {
-  return "CREATE VIEW \"" + pgSchema + "\".\"" + metaViewName + "\" AS \n     SELECT \n       \"" + "id" + "\" AS \"chainId\",\n       \"" + "start_block" + "\" AS \"startBlock\", \n       \"" + "end_block" + "\" AS \"endBlock\",\n       \"" + "buffer_block" + "\" AS \"bufferBlock\",\n       \"" + "ready_at" + "\" AS \"readyAt\",\n       \"" + "first_event_block" + "\" AS \"firstEventBlock\",\n       \"" + "events_processed" + "\" AS \"eventsProcessed\",\n       (\"" + "ready_at" + "\" IS NOT NULL) AS \"isReady\"\n     FROM \"" + pgSchema + "\".\"" + table$1.tableName + "\"\n     ORDER BY \"" + "id" + "\";";
+  return "CREATE VIEW \"" + pgSchema + "\".\"" + metaViewName + "\" AS \n     SELECT \n       \"" + "id" + "\" AS \"chainId\",\n       \"" + "start_block" + "\" AS \"startBlock\", \n       \"" + "end_block" + "\" AS \"endBlock\",\n       \"" + "progress_block" + "\" AS \"progressBlock\",\n       \"" + "buffer_block" + "\" AS \"bufferBlock\",\n       \"" + "first_event_block" + "\" AS \"firstEventBlock\",\n       \"" + "events_processed" + "\" AS \"eventsProcessed\",\n       \"" + "source_block" + "\" AS \"sourceBlock\",\n       \"" + "ready_at" + "\" AS \"readyAt\",\n       (\"" + "ready_at" + "\" IS NOT NULL) AS \"isReady\"\n     FROM \"" + pgSchema + "\".\"" + table.tableName + "\"\n     ORDER BY \"" + "id" + "\";";
 }
 
 function makeChainMetadataViewQuery(pgSchema) {
-  return "CREATE VIEW \"" + pgSchema + "\".\"" + chainMetadataViewName + "\" AS \n     SELECT \n       \"" + "source_block" + "\" AS \"block_height\",\n       \"" + "id" + "\" AS \"chain_id\",\n       \"" + "end_block" + "\" AS \"end_block\", \n       \"" + "first_event_block" + "\" AS \"first_event_block_number\",\n       \"" + "_is_hyper_sync" + "\" AS \"is_hyper_sync\",\n       \"" + "buffer_block" + "\" AS \"latest_fetched_block_number\",\n       \"" + "_latest_processed_block" + "\" AS \"latest_processed_block\",\n       \"" + "_num_batches_fetched" + "\" AS \"num_batches_fetched\",\n       \"" + "events_processed" + "\" AS \"num_events_processed\",\n       \"" + "start_block" + "\" AS \"start_block\",\n       \"" + "ready_at" + "\" AS \"timestamp_caught_up_to_head_or_endblock\"\n     FROM \"" + pgSchema + "\".\"" + table$1.tableName + "\";";
+  return "CREATE VIEW \"" + pgSchema + "\".\"" + chainMetadataViewName + "\" AS \n     SELECT \n       \"" + "source_block" + "\" AS \"block_height\",\n       \"" + "id" + "\" AS \"chain_id\",\n       \"" + "end_block" + "\" AS \"end_block\", \n       \"" + "first_event_block" + "\" AS \"first_event_block_number\",\n       \"" + "_is_hyper_sync" + "\" AS \"is_hyper_sync\",\n       \"" + "buffer_block" + "\" AS \"latest_fetched_block_number\",\n       \"" + "progress_block" + "\" AS \"latest_processed_block\",\n       \"" + "_num_batches_fetched" + "\" AS \"num_batches_fetched\",\n       \"" + "events_processed" + "\" AS \"num_events_processed\",\n       \"" + "start_block" + "\" AS \"start_block\",\n       \"" + "ready_at" + "\" AS \"timestamp_caught_up_to_head_or_endblock\"\n     FROM \"" + pgSchema + "\".\"" + table.tableName + "\";";
 }
 
 var Views = {
@@ -263,7 +269,7 @@ var schema$1 = S$RescriptSchema.schema(function (s) {
 
 var rowsSchema = S$RescriptSchema.array(schema$1);
 
-var table$5 = Table.mkTable(name, undefined, [
+var table$4 = Table.mkTable(name, undefined, [
       Table.mkField("id", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, true, undefined, undefined),
       Table.mkField("chain_id", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("registering_event_block_number", "INTEGER", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
@@ -276,24 +282,50 @@ var table$5 = Table.mkTable(name, undefined, [
       Table.mkField("contract_name", "TEXT", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined)
     ]);
 
-var entityHistory = EntityHistory.fromTable(table$5, schema$1);
+var entityHistory = EntityHistory.fromTable(table$4, schema$1);
 
 var config = {
   name: name,
   schema: schema$1,
   rowsSchema: rowsSchema,
-  table: table$5,
+  table: table$4,
   entityHistory: entityHistory
 };
 
+function makeCleanUpOnRestartQuery(pgSchema, chains) {
+  var query = {
+    contents: ""
+  };
+  chains.forEach(function (chain) {
+        if (query.contents !== "") {
+          query.contents = query.contents + "\n";
+        }
+        var progressBlockNumber = chain.progress_block;
+        var progressNextBlockLogIndex = chain._progress_log_index;
+        var tmp;
+        tmp = progressNextBlockLogIndex === null ? (
+            progressBlockNumber !== -1 ? " AND registering_event_block_number > " + String(progressBlockNumber) : ""
+          ) : " AND (\n  registering_event_block_number > " + String(progressBlockNumber + 1 | 0) + "\n  OR registering_event_block_number = " + String(progressBlockNumber + 1 | 0) + "\n  AND registering_event_log_index > " + String(progressNextBlockLogIndex) + "\n)";
+        var progressBlockNumber$1 = chain.progress_block;
+        var progressNextBlockLogIndex$1 = chain._progress_log_index;
+        var tmp$1;
+        tmp$1 = progressNextBlockLogIndex$1 === null ? (
+            progressBlockNumber$1 !== -1 ? " AND entity_history_block_number > " + String(progressBlockNumber$1) : ""
+          ) : " AND (\n  entity_history_block_number > " + String(progressBlockNumber$1 + 1 | 0) + "\n  OR entity_history_block_number = " + String(progressBlockNumber$1 + 1 | 0) + "\n  AND entity_history_log_index > " + String(progressNextBlockLogIndex$1) + "\n)";
+        query.contents = query.contents + ("DELETE FROM \"" + pgSchema + "\".\"" + table$4.tableName + "\"\nWHERE chain_id = " + String(chain.id) + tmp + ";\nDELETE FROM \"" + pgSchema + "\".\"" + table$4.tableName + "_history\"\nWHERE entity_history_chain_id = " + String(chain.id) + tmp$1 + ";");
+      });
+  return query.contents;
+}
+
 var DynamicContractRegistry = {
   name: name,
   makeId: makeId,
   schema: schema$1,
   rowsSchema: rowsSchema,
-  table: table$5,
+  table: table$4,
   entityHistory: entityHistory,
-  config: config
+  config: config,
+  makeCleanUpOnRestartQuery: makeCleanUpOnRestartQuery
 };
 
 var isPrimaryKey = true;
@@ -305,7 +337,6 @@ var isIndex = true;
 exports.isPrimaryKey = isPrimaryKey;
 exports.isNullable = isNullable;
 exports.isIndex = isIndex;
-exports.EventSyncState = EventSyncState;
 exports.Chains = Chains;
 exports.PersistedState = PersistedState;
 exports.EndOfBlockRangeScannedData = EndOfBlockRangeScannedData;

package/src/sources/EventRouter.res

@@ -0,0 +1,113 @@
+open Belt
+
+exception EventDuplicate
+exception WildcardCollision
+
+module Group = {
+  type t<'a> = {
+    mutable wildcard: option<'a>,
+    byContractName: dict<'a>,
+  }
+
+  let empty = () => {
+    wildcard: None,
+    byContractName: Js.Dict.empty(),
+  }
+
+  let addOrThrow = (group: t<'a>, event, ~contractName, ~isWildcard) => {
+    let {byContractName, wildcard} = group
+    switch byContractName->Utils.Dict.dangerouslyGetNonOption(contractName) {
+    | Some(_) => raise(EventDuplicate)
+    | None =>
+      if isWildcard && wildcard->Option.isSome {
+        raise(WildcardCollision)
+      } else {
+        if isWildcard {
+          group.wildcard = Some(event)
+        }
+        byContractName->Js.Dict.set(contractName, event)
+      }
+    }
+  }
+
+  let get = (
+    group: t<'a>,
+    ~contractAddress,
+    ~blockNumber,
+    ~indexingContracts: dict<FetchState.indexingContract>,
+  ) =>
+    switch group {
+    | {wildcard, byContractName} =>
+      switch indexingContracts->Utils.Dict.dangerouslyGetNonOption(
+        contractAddress->Address.toString,
+      ) {
+      | Some(indexingContract) =>
+        if indexingContract.startBlock <= blockNumber {
+          byContractName->Utils.Dict.dangerouslyGetNonOption(indexingContract.contractName)
+        } else {
+          None
+        }
+      | None => wildcard
+      }
+    }
+}
+
+type t<'a> = dict<Group.t<'a>>
+
+let empty = () => Js.Dict.empty()
+
+let addOrThrow = (
+  router: t<'a>,
+  eventId,
+  event,
+  ~contractName,
+  ~isWildcard,
+  ~eventName,
+  ~chain,
+) => {
+  let group = switch router->Utils.Dict.dangerouslyGetNonOption(eventId) {
+  | None =>
+    let group = Group.empty()
+    router->Js.Dict.set(eventId, group)
+    group
+  | Some(group) => group
+  }
+  try group->Group.addOrThrow(event, ~contractName, ~isWildcard) catch {
+  | EventDuplicate =>
+    Js.Exn.raiseError(
+      `Duplicate event detected: ${eventName} for contract ${contractName} on chain ${chain->ChainMap.Chain.toString}`,
+    )
+  | WildcardCollision =>
+    Js.Exn.raiseError(
+      `Another event is already registered with the same signature that would interfer with wildcard filtering: ${eventName} for contract ${contractName} on chain ${chain->ChainMap.Chain.toString}`,
+    )
+  }
+}
+
+let get = (router: t<'a>, ~tag, ~contractAddress, ~blockNumber, ~indexingContracts) => {
+  switch router->Utils.Dict.dangerouslyGetNonOption(tag) {
+  | None => None
+  | Some(group) => group->Group.get(~contractAddress, ~blockNumber, ~indexingContracts)
+  }
+}
+
+let getEvmEventId = (~sighash, ~topicCount) => {
+  sighash ++ "_" ++ topicCount->Belt.Int.toString
+}
+
+let fromEvmEventModsOrThrow = (events: array<Internal.evmEventConfig>, ~chain): t<
+  Internal.evmEventConfig,
+> => {
+  let router = empty()
+  events->Belt.Array.forEach(config => {
+    router->addOrThrow(
+      config.id,
+      config,
+      ~contractName=config.contractName,
+      ~eventName=config.name,
+      ~chain,
+      ~isWildcard=config.isWildcard,
+    )
+  })
+  router
+}

package/src/sources/EventRouter.res.js

@@ -0,0 +1,125 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+'use strict';
+
+var Js_exn = require("rescript/lib/js/js_exn.js");
+var ChainMap = require("../ChainMap.res.js");
+var Belt_Array = require("rescript/lib/js/belt_Array.js");
+var Belt_Option = require("rescript/lib/js/belt_Option.js");
+var Caml_option = require("rescript/lib/js/caml_option.js");
+var Caml_exceptions = require("rescript/lib/js/caml_exceptions.js");
+var Caml_js_exceptions = require("rescript/lib/js/caml_js_exceptions.js");
+
+var EventDuplicate = /* @__PURE__ */Caml_exceptions.create("EventRouter.EventDuplicate");
+
+var WildcardCollision = /* @__PURE__ */Caml_exceptions.create("EventRouter.WildcardCollision");
+
+function empty() {
+  return {
+          wildcard: undefined,
+          byContractName: {}
+        };
+}
+
+function addOrThrow(group, $$event, contractName, isWildcard) {
+  var wildcard = group.wildcard;
+  var byContractName = group.byContractName;
+  var match = byContractName[contractName];
+  if (match !== undefined) {
+    throw {
+          RE_EXN_ID: EventDuplicate,
+          Error: new Error()
+        };
+  }
+  if (isWildcard && Belt_Option.isSome(wildcard)) {
+    throw {
+          RE_EXN_ID: WildcardCollision,
+          Error: new Error()
+        };
+  }
+  if (isWildcard) {
+    group.wildcard = Caml_option.some($$event);
+  }
+  byContractName[contractName] = $$event;
+}
+
+function get(group, contractAddress, blockNumber, indexingContracts) {
+  var wildcard = group.wildcard;
+  var indexingContract = indexingContracts[contractAddress];
+  if (indexingContract !== undefined) {
+    if (indexingContract.startBlock <= blockNumber) {
+      return group.byContractName[indexingContract.contractName];
+    } else {
+      return ;
+    }
+  } else {
+    return wildcard;
+  }
+}
+
+var Group = {
+  empty: empty,
+  addOrThrow: addOrThrow,
+  get: get
+};
+
+function empty$1() {
+  return {};
+}
+
+function addOrThrow$1(router, eventId, $$event, contractName, isWildcard, eventName, chain) {
+  var group = router[eventId];
+  var group$1;
+  if (group !== undefined) {
+    group$1 = group;
+  } else {
+    var group$2 = {
+      wildcard: undefined,
+      byContractName: {}
+    };
+    router[eventId] = group$2;
+    group$1 = group$2;
+  }
+  try {
+    return addOrThrow(group$1, $$event, contractName, isWildcard);
+  }
+  catch (raw_exn){
+    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+    if (exn.RE_EXN_ID === EventDuplicate) {
+      return Js_exn.raiseError("Duplicate event detected: " + eventName + " for contract " + contractName + " on chain " + ChainMap.Chain.toString(chain));
+    }
+    if (exn.RE_EXN_ID === WildcardCollision) {
+      return Js_exn.raiseError("Another event is already registered with the same signature that would interfer with wildcard filtering: " + eventName + " for contract " + contractName + " on chain " + ChainMap.Chain.toString(chain));
+    }
+    throw exn;
+  }
+}
+
+function get$1(router, tag, contractAddress, blockNumber, indexingContracts) {
+  var group = router[tag];
+  if (group !== undefined) {
+    return get(group, contractAddress, blockNumber, indexingContracts);
+  }
+  
+}
+
+function getEvmEventId(sighash, topicCount) {
+  return sighash + "_" + String(topicCount);
+}
+
+function fromEvmEventModsOrThrow(events, chain) {
+  var router = {};
+  Belt_Array.forEach(events, (function (config) {
+          addOrThrow$1(router, config.id, config, config.contractName, config.isWildcard, config.name, chain);
+        }));
+  return router;
+}
+
+exports.EventDuplicate = EventDuplicate;
+exports.WildcardCollision = WildcardCollision;
+exports.Group = Group;
+exports.empty = empty$1;
+exports.addOrThrow = addOrThrow$1;
+exports.get = get$1;
+exports.getEvmEventId = getEvmEventId;
+exports.fromEvmEventModsOrThrow = fromEvmEventModsOrThrow;
+/* ChainMap Not a pure module */

package/src/sources/HyperSync.res

@@ -76,15 +76,23 @@ module GetLogs = {
     fieldSelection,
   }
 
+  @inline
   let addMissingParams = (acc, fieldNames, returnedObj, ~prefix) => {
-    fieldNames->Array.forEach(fieldName => {
-      switch returnedObj
-      ->(Utils.magic: 'a => Js.Dict.t<unknown>)
-      ->Utils.Dict.dangerouslyGetNonOption(fieldName) {
-      | Some(_) => ()
-      | None => acc->Array.push(prefix ++ "." ++ fieldName)->ignore
+    if fieldNames->Utils.Array.notEmpty {
+      if !(returnedObj->Obj.magic) {
+        acc->Array.push(prefix)->ignore
+      } else {
+        for idx in 0 to fieldNames->Array.length - 1 {
+          let fieldName = fieldNames->Array.getUnsafe(idx)
+          switch returnedObj
+          ->(Utils.magic: 'a => Js.Dict.t<unknown>)
+          ->Utils.Dict.dangerouslyGetNonOption(fieldName) {
+          | Some(_) => ()
+          | None => acc->Array.push(prefix ++ "." ++ fieldName)->ignore
+          }
+        }
       }
-    })
+    }
   }
 
   //Note this function can throw an error

package/src/sources/HyperSync.res.js

@@ -57,18 +57,6 @@ function makeRequestBody(fromBlock, toBlockInclusive, addressesWithTopics, field
         };
 }
 
-function addMissingParams(acc, fieldNames, returnedObj, prefix) {
-  Belt_Array.forEach(fieldNames, (function (fieldName) {
-          var match = returnedObj[fieldName];
-          if (match !== undefined) {
-            return ;
-          } else {
-            acc.push(prefix + "." + fieldName);
-            return ;
-          }
-        }));
-}
-
 async function query(client, fromBlock, toBlock, logSelections, fieldSelection, nonOptionalBlockFieldNames, nonOptionalTransactionFieldNames) {
   var addressesWithTopics = Belt_Array.flatMap(logSelections, (function (param) {
           var addresses = param.addresses;
@@ -88,9 +76,54 @@ async function query(client, fromBlock, toBlock, logSelections, fieldSelection,
   }
   var items = Belt_Array.map(res.data, (function (item) {
           var missingParams = [];
-          addMissingParams(missingParams, fieldNames, item.log, "log");
-          addMissingParams(missingParams, nonOptionalBlockFieldNames, item.block, "block");
-          addMissingParams(missingParams, nonOptionalTransactionFieldNames, item.transaction, "transaction");
+          var returnedObj = item.log;
+          if (Utils.$$Array.notEmpty(fieldNames)) {
+            if (returnedObj) {
+              for(var idx = 0 ,idx_finish = fieldNames.length; idx < idx_finish; ++idx){
+                var fieldName = fieldNames[idx];
+                var match = returnedObj[fieldName];
+                if (match !== undefined) {
+                  
+                } else {
+                  missingParams.push("log." + fieldName);
+                }
+              }
+            } else {
+              missingParams.push("log");
+            }
+          }
+          var returnedObj$1 = item.block;
+          if (Utils.$$Array.notEmpty(nonOptionalBlockFieldNames)) {
+            if (returnedObj$1) {
+              for(var idx$1 = 0 ,idx_finish$1 = nonOptionalBlockFieldNames.length; idx$1 < idx_finish$1; ++idx$1){
+                var fieldName$1 = nonOptionalBlockFieldNames[idx$1];
+                var match$1 = returnedObj$1[fieldName$1];
+                if (match$1 !== undefined) {
+                  
+                } else {
+                  missingParams.push("block." + fieldName$1);
+                }
+              }
+            } else {
+              missingParams.push("block");
+            }
+          }
+          var returnedObj$2 = item.transaction;
+          if (Utils.$$Array.notEmpty(nonOptionalTransactionFieldNames)) {
+            if (returnedObj$2) {
+              for(var idx$2 = 0 ,idx_finish$2 = nonOptionalTransactionFieldNames.length; idx$2 < idx_finish$2; ++idx$2){
+                var fieldName$2 = nonOptionalTransactionFieldNames[idx$2];
+                var match$2 = returnedObj$2[fieldName$2];
+                if (match$2 !== undefined) {
+                  
+                } else {
+                  missingParams.push("transaction." + fieldName$2);
+                }
+              }
+            } else {
+              missingParams.push("transaction");
+            }
+          }
           if (missingParams.length !== 0) {
             throw {
                   RE_EXN_ID: $$Error,