envio 3.0.2 → 3.1.0-rc.0

package/src/db/InternalTable.res

@@ -186,26 +186,67 @@ WHERE "${(#id: field :> string)}" = $1;`
 "${(#ready_at: field :> string)}" as "timestampCaughtUpToHeadOrEndblock",
 "${(#events_processed: field :> string)}"::float8 as "numEventsProcessed",
 "${(#progress_block: field :> string)}" as "progressBlockNumber",
-"${(#source_block: field :> string)}" as "sourceBlockNumber",
-(
-  -- envio_addresses.id is a composite "{chainId}-{address}" string produced by
-  -- Config.EnvioAddresses.makeId; extract the address by taking everything
-  -- after the first '-'. Keep in sync with makeId / getAddress.
-  SELECT COALESCE(json_agg(json_build_object(
-    'address', SUBSTRING("id" FROM POSITION('-' IN "id") + 1),
-    'contractName', "contract_name",
-    'registrationBlock', "registration_block"
-  )), '[]'::json)
-  FROM "${pgSchema}"."${EnvioAddresses.table.tableName}"
-  WHERE "chain_id" = chains."${(#id: field :> string)}"
-) as "indexingAddresses"
-FROM "${pgSchema}"."${table.tableName}" as chains;`
+"${(#source_block: field :> string)}" as "sourceBlockNumber"
+FROM "${pgSchema}"."${table.tableName}";`
   }
 
-  let getInitialState = (sql, ~pgSchema) => {
-    sql
-    ->Postgres.unsafe(makeGetInitialStateQuery(~pgSchema))
-    ->(Utils.magic: promise<array<unknown>> => promise<array<rawInitialState>>)
+  type rawIndexingAddress = {
+    chainId: int,
+    address: Address.t,
+    contractName: string,
+    registrationBlock: int,
+  }
+
+  // Addresses are read as plain rows rather than aggregated per chain with
+  // json_agg: a single chain's aggregate can exceed V8's max string length
+  // (postgres.js decodes the column with Buffer.toString and throws
+  // ERR_STRING_TOO_LONG). Grouping happens in JS instead — see getInitialState.
+  let makeGetIndexingAddressesQuery = (~pgSchema) => {
+    // envio_addresses.id is a composite "{chainId}-{address}" string produced by
+    // Config.EnvioAddresses.makeId; extract the address by taking everything
+    // after the first '-'. Keep in sync with makeId / getAddress.
+    `SELECT "chain_id" as "chainId",
+SUBSTRING("id" FROM POSITION('-' IN "id") + 1) as "address",
+"contract_name" as "contractName",
+"registration_block" as "registrationBlock"
+FROM "${pgSchema}"."${EnvioAddresses.table.tableName}";`
+  }
+
+  let getInitialState = async (sql, ~pgSchema) => {
+    let (rawInitialStates, rawIndexingAddresses) = await Promise.all2((
+      sql
+      ->Postgres.unsafe(makeGetInitialStateQuery(~pgSchema))
+      ->(Utils.magic: promise<array<unknown>> => promise<array<rawInitialState>>),
+      sql
+      ->Postgres.unsafe(makeGetIndexingAddressesQuery(~pgSchema))
+      ->(Utils.magic: promise<array<unknown>> => promise<array<rawIndexingAddress>>),
+    ))
+
+    let indexingAddressesByChainId = Dict.make()
+    rawIndexingAddresses->Array.forEach(row => {
+      let key = row.chainId->Int.toString
+      let addresses = switch indexingAddressesByChainId->Dict.get(key) {
+      | Some(addresses) => addresses
+      | None =>
+        let addresses: array<Internal.indexingAddress> = []
+        indexingAddressesByChainId->Dict.set(key, addresses)
+        addresses
+      }
+      addresses
+      ->Array.push({
+        address: row.address,
+        contractName: row.contractName,
+        registrationBlock: row.registrationBlock,
+      })
+      ->ignore
+    })
+
+    rawInitialStates->Array.map(rawInitialState => {
+      ...rawInitialState,
+      indexingAddresses: indexingAddressesByChainId
+      ->Dict.get(rawInitialState.id->Int.toString)
+      ->Option.getOr([]),
+    })
   }
 
   let progressFields: array<progressFields> = [#progress_block, #events_processed, #source_block]

package/src/db/InternalTable.res.mjs

@@ -7,6 +7,7 @@ import * as Address from "../Address.res.mjs";
 import * as Belt_Array from "@rescript/runtime/lib/es6/Belt_Array.js";
 import * as Belt_Option from "@rescript/runtime/lib/es6/Belt_Option.js";
 import * as Stdlib_Null from "@rescript/runtime/lib/es6/Stdlib_Null.js";
+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 S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
@@ -26,18 +27,18 @@ let fields = [
 ];
 
 let table = Table.mkTable("envio_chains", undefined, [
-  Table.mkField("id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, true, undefined, undefined),
-  Table.mkField("start_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("end_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined),
-  Table.mkField("max_reorg_depth", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("buffer_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("source_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("first_event_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined),
-  Table.mkField("ready_at", "Date", S$RescriptSchema.$$null(Utils.Schema.dbDate), undefined, undefined, true, undefined, undefined, undefined),
-  Table.mkField("events_processed", "UInt52", S$RescriptSchema.float, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("_is_hyper_sync", "Boolean", S$RescriptSchema.bool, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("progress_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined)
-]);
+  Table.mkField("id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, true, undefined, undefined, undefined),
+  Table.mkField("start_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("end_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined, undefined),
+  Table.mkField("max_reorg_depth", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("buffer_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("source_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("first_event_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined, undefined),
+  Table.mkField("ready_at", "Date", S$RescriptSchema.$$null(Utils.Schema.dbDate), undefined, undefined, true, undefined, undefined, undefined, undefined),
+  Table.mkField("events_processed", "UInt52", S$RescriptSchema.float, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("_is_hyper_sync", "Boolean", S$RescriptSchema.bool, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("progress_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+], undefined);
 
 function initialFromConfig(chainConfig) {
   return {
@@ -113,24 +114,53 @@ function makeGetInitialStateQuery(pgSchema) {
 "` + "ready_at" + `" as "timestampCaughtUpToHeadOrEndblock",
 "` + "events_processed" + `"::float8 as "numEventsProcessed",
 "` + "progress_block" + `" as "progressBlockNumber",
-"` + "source_block" + `" as "sourceBlockNumber",
-(
-  -- envio_addresses.id is a composite "{chainId}-{address}" string produced by
-  -- Config.EnvioAddresses.makeId; extract the address by taking everything
-  -- after the first '-'. Keep in sync with makeId / getAddress.
-  SELECT COALESCE(json_agg(json_build_object(
-    'address', SUBSTRING("id" FROM POSITION('-' IN "id") + 1),
-    'contractName', "contract_name",
-    'registrationBlock', "registration_block"
-  )), '[]'::json)
-  FROM "` + pgSchema + `"."` + Config.EnvioAddresses.table.tableName + `"
-  WHERE "chain_id" = chains."` + "id" + `"
-) as "indexingAddresses"
-FROM "` + pgSchema + `"."` + table.tableName + `" as chains;`;
+"` + "source_block" + `" as "sourceBlockNumber"
+FROM "` + pgSchema + `"."` + table.tableName + `";`;
+}
+
+function makeGetIndexingAddressesQuery(pgSchema) {
+  return `SELECT "chain_id" as "chainId",
+SUBSTRING("id" FROM POSITION('-' IN "id") + 1) as "address",
+"contract_name" as "contractName",
+"registration_block" as "registrationBlock"
+FROM "` + pgSchema + `"."` + Config.EnvioAddresses.table.tableName + `";`;
 }
 
-function getInitialState(sql, pgSchema) {
-  return sql.unsafe(makeGetInitialStateQuery(pgSchema));
+async function getInitialState(sql, pgSchema) {
+  let match = await Promise.all([
+    sql.unsafe(makeGetInitialStateQuery(pgSchema)),
+    sql.unsafe(makeGetIndexingAddressesQuery(pgSchema))
+  ]);
+  let indexingAddressesByChainId = {};
+  match[1].forEach(row => {
+    let key = row.chainId.toString();
+    let addresses = indexingAddressesByChainId[key];
+    let addresses$1;
+    if (addresses !== undefined) {
+      addresses$1 = addresses;
+    } else {
+      let addresses$2 = [];
+      indexingAddressesByChainId[key] = addresses$2;
+      addresses$1 = addresses$2;
+    }
+    addresses$1.push({
+      address: row.address,
+      contractName: row.contractName,
+      registrationBlock: row.registrationBlock
+    });
+  });
+  return match[0].map(rawInitialState => ({
+    id: rawInitialState.id,
+    startBlock: rawInitialState.startBlock,
+    endBlock: rawInitialState.endBlock,
+    maxReorgDepth: rawInitialState.maxReorgDepth,
+    firstEventBlockNumber: rawInitialState.firstEventBlockNumber,
+    timestampCaughtUpToHeadOrEndblock: rawInitialState.timestampCaughtUpToHeadOrEndblock,
+    numEventsProcessed: rawInitialState.numEventsProcessed,
+    progressBlockNumber: rawInitialState.progressBlockNumber,
+    indexingAddresses: Stdlib_Option.getOr(indexingAddressesByChainId[rawInitialState.id.toString()], []),
+    sourceBlockNumber: rawInitialState.sourceBlockNumber
+  }));
 }
 
 let progressFields = [
@@ -188,6 +218,7 @@ let Chains = {
   metaFields: metaFields,
   makeMetaFieldsUpdateQuery: makeMetaFieldsUpdateQuery,
   makeGetInitialStateQuery: makeGetInitialStateQuery,
+  makeGetIndexingAddressesQuery: makeGetIndexingAddressesQuery,
   getInitialState: getInitialState,
   progressFields: progressFields,
   makeProgressFieldsUpdateQuery: makeProgressFieldsUpdateQuery,
@@ -196,9 +227,9 @@ let Chains = {
 };
 
 let table$1 = Table.mkTable("envio_info", undefined, [
-  Table.mkField("id", "Int32", S$RescriptSchema.int, "1", undefined, undefined, true, undefined, undefined),
-  Table.mkField("config", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined)
-]);
+  Table.mkField("id", "Int32", S$RescriptSchema.int, "1", undefined, undefined, true, undefined, undefined, undefined),
+  Table.mkField("config", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+], undefined);
 
 let undefinedTableSqlState = "42P01";
 
@@ -245,12 +276,12 @@ let dbSchema = S$RescriptSchema.object(s => ({
 }));
 
 let table$2 = Table.mkTable("envio_checkpoints", undefined, [
-  Table.mkField("id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, true, undefined, undefined),
-  Table.mkField("chain_id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_hash", "String", S$RescriptSchema.$$null(S$RescriptSchema.string), undefined, undefined, true, undefined, undefined, undefined),
-  Table.mkField("events_processed", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined)
-]);
+  Table.mkField("id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, true, undefined, undefined, undefined),
+  Table.mkField("chain_id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_hash", "String", S$RescriptSchema.$$null(S$RescriptSchema.string), undefined, undefined, true, undefined, undefined, undefined, undefined),
+  Table.mkField("events_processed", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+], undefined);
 
 function makeGetReorgCheckpointsQuery(pgSchema) {
   return `WITH reorg_chains AS (
@@ -370,20 +401,20 @@ let schema = S$RescriptSchema.schema(s => ({
 }));
 
 let table$3 = Table.mkTable("raw_events", undefined, [
-  Table.mkField("chain_id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("event_id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("event_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("log_index", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("src_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_timestamp", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("transaction_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("params", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("serial", "BigSerial", S$RescriptSchema.$$null(S$RescriptSchema.bigint), undefined, undefined, true, true, undefined, undefined)
-]);
+  Table.mkField("chain_id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("event_id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("event_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("log_index", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("src_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_timestamp", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("transaction_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("params", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("serial", "BigSerial", S$RescriptSchema.$$null(S$RescriptSchema.bigint), undefined, undefined, true, true, undefined, undefined, undefined)
+], undefined);
 
 let RawEvents = {
   schema: schema,

package/src/db/Table.res

@@ -43,12 +43,14 @@ type field = {
   isIndex: bool,
   linkedEntity: option<string>,
   defaultValue: option<string>,
+  description: option<string>,
 }
 
 type derivedFromField = {
   fieldName: string,
   derivedFromEntity: string,
   derivedFromField: string,
+  description: option<string>,
 }
 
 type fieldOrDerived = Field(field) | DerivedFrom(derivedFromField)
@@ -63,6 +65,7 @@ let mkField = (
   ~isPrimaryKey=false,
   ~isIndex=false,
   ~linkedEntity=?,
+  ~description=?,
 ) =>
   {
     fieldName,
@@ -74,13 +77,15 @@ let mkField = (
     isIndex,
     linkedEntity,
     defaultValue: default,
+    description,
   }->Field
 
-let mkDerivedFromField = (fieldName, ~derivedFromEntity, ~derivedFromField) =>
+let mkDerivedFromField = (fieldName, ~derivedFromEntity, ~derivedFromField, ~description=?) =>
   {
     fieldName,
     derivedFromField,
     derivedFromEntity,
+    description,
   }->DerivedFrom
 
 let getUserDefinedFieldName = fieldOrDerived =>
@@ -162,12 +167,14 @@ type table = {
   tableName: string,
   fields: array<fieldOrDerived>,
   compositeIndices: array<array<compositeIndexField>>,
+  description: option<string>,
 }
 
-let mkTable = (tableName, ~compositeIndices=[], ~fields) => {
+let mkTable = (tableName, ~compositeIndices=[], ~fields, ~description=?) => {
   tableName,
   fields,
   compositeIndices,
+  description,
 }
 
 let getPrimaryKeyFieldNames = table =>

package/src/db/Table.res.mjs

@@ -17,7 +17,7 @@ function makeEnumConfig(name, variants) {
   };
 }
 
-function mkField(fieldName, fieldType, fieldSchema, $$default, isArrayOpt, isNullableOpt, isPrimaryKeyOpt, isIndexOpt, linkedEntity) {
+function mkField(fieldName, fieldType, fieldSchema, $$default, isArrayOpt, isNullableOpt, isPrimaryKeyOpt, isIndexOpt, linkedEntity, description) {
   let isArray = isArrayOpt !== undefined ? isArrayOpt : false;
   let isNullable = isNullableOpt !== undefined ? isNullableOpt : false;
   let isPrimaryKey = isPrimaryKeyOpt !== undefined ? isPrimaryKeyOpt : false;
@@ -33,18 +33,20 @@ function mkField(fieldName, fieldType, fieldSchema, $$default, isArrayOpt, isNul
       isPrimaryKey: isPrimaryKey,
       isIndex: isIndex,
       linkedEntity: linkedEntity,
-      defaultValue: $$default
+      defaultValue: $$default,
+      description: description
     }
   };
 }
 
-function mkDerivedFromField(fieldName, derivedFromEntity, derivedFromField) {
+function mkDerivedFromField(fieldName, derivedFromEntity, derivedFromField, description) {
   return {
     TAG: "DerivedFrom",
     _0: {
       fieldName: fieldName,
       derivedFromEntity: derivedFromEntity,
-      derivedFromField: derivedFromField
+      derivedFromField: derivedFromField,
+      description: description
     }
   };
 }
@@ -133,12 +135,13 @@ function getPgFieldType(fieldType, pgSchema, isArray, isNumericArrayAsText, isNu
   );
 }
 
-function mkTable(tableName, compositeIndicesOpt, fields) {
+function mkTable(tableName, compositeIndicesOpt, fields, description) {
   let compositeIndices = compositeIndicesOpt !== undefined ? compositeIndicesOpt : [];
   return {
     tableName: tableName,
     fields: fields,
-    compositeIndices: compositeIndices
+    compositeIndices: compositeIndices,
+    description: description
   };
 }
 
@@ -209,7 +212,7 @@ function getNonDefaultFieldNames(table) {
 }
 
 function getFieldByName(table, fieldName) {
-  return table.fields.find(field => field._0.fieldName === fieldName);
+  return table.fields.find(field => getUserDefinedFieldName(field) === fieldName);
 }
 
 function getFieldByDbName(table, dbFieldName) {

package/src/sources/EvmChain.res

@@ -22,33 +22,53 @@ let getSyncConfig = (
     initialBlockInterval: Env.Configurable.SyncConfig.initialBlockInterval->Option.getOr(
       initialBlockInterval->Option.getOr(10_000),
     ),
-    // After an RPC error, how much to scale back the number of blocks requested at once
     backoffMultiplicative: Env.Configurable.SyncConfig.backoffMultiplicative->Option.getOr(
       backoffMultiplicative->Option.getOr(0.8),
     ),
-    // Without RPC errors or timeouts, how much to increase the number of blocks requested by for the next batch
     accelerationAdditive: Env.Configurable.SyncConfig.accelerationAdditive->Option.getOr(
       accelerationAdditive->Option.getOr(500),
     ),
-    // Do not further increase the block interval past this limit
     intervalCeiling: Env.Configurable.SyncConfig.intervalCeiling->Option.getOr(
       intervalCeiling->Option.getOr(10_000),
     ),
-    // After an error, how long to wait before retrying
     backoffMillis: backoffMillis->Option.getOr(5000),
-    // How long to wait before cancelling an RPC request
     queryTimeoutMillis,
     fallbackStallTimeout: fallbackStallTimeout->Option.getOr(queryTimeoutMillis / 2),
-    // How frequently to check for new blocks in realtime (default: 1000ms)
     pollingInterval: pollingInterval->Option.getOr(1000),
   }
 }
 
+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
+}
+
 let makeSources = (
   ~chain,
   ~contracts: array<Internal.evmContractConfig>,
   ~hyperSync,
-  ~allEventSignatures,
   ~rpcs: array<rpc>,
   ~lowercaseAddresses,
 ) => {
@@ -57,12 +77,14 @@ let makeSources = (
     ->Belt.Array.flatMap(contract => contract.events)
     ->EventRouter.fromEvmEventModsOrThrow(~chain)
 
+  let allEventParams = collectEventParams(contracts)
+
   let sources = switch hyperSync {
   | Some(endpointUrl) => [
       HyperSyncSource.make({
         chain,
         endpointUrl,
-        allEventSignatures,
+        allEventParams,
         eventRouter,
         apiToken: Env.envioApiToken,
         clientMaxRetries: Env.hyperSyncClientMaxRetries,
@@ -70,6 +92,7 @@ let makeSources = (
         lowercaseAddresses,
         serializationFormat: Env.hypersyncClientSerializationFormat,
         enableQueryCaching: Env.hypersyncClientEnableQueryCaching,
+        logLevel: Env.hypersyncLogLevel,
       }),
     ]
   | _ => []
@@ -81,7 +104,7 @@ let makeSources = (
       syncConfig: getSyncConfig(syncConfig->Option.getOr({})),
       url,
       eventRouter,
-      allEventSignatures,
+      allEventParams,
       lowercaseAddresses,
       ?ws,
     })

package/src/sources/EvmChain.res.mjs

@@ -21,19 +21,45 @@ function getSyncConfig(param) {
   };
 }
 
-function makeSources(chain, contracts, hyperSync, allEventSignatures, rpcs, lowercaseAddresses) {
+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;
+      }
+    });
+  });
+  return result;
+}
+
+function makeSources(chain, contracts, hyperSync, rpcs, lowercaseAddresses) {
   let eventRouter = EventRouter.fromEvmEventModsOrThrow(Belt_Array.flatMap(contracts, contract => contract.events), chain);
+  let allEventParams = collectEventParams(contracts);
   let sources = hyperSync !== undefined ? [HyperSyncSource.make({
         chain: chain,
         endpointUrl: hyperSync,
-        allEventSignatures: allEventSignatures,
+        allEventParams: allEventParams,
         eventRouter: eventRouter,
         apiToken: Env.envioApiToken,
         clientMaxRetries: Env.hyperSyncClientMaxRetries,
         clientTimeoutMillis: Env.hyperSyncClientTimeoutMillis,
         lowercaseAddresses: lowercaseAddresses,
         serializationFormat: Env.hypersyncClientSerializationFormat,
-        enableQueryCaching: Env.hypersyncClientEnableQueryCaching
+        enableQueryCaching: Env.hypersyncClientEnableQueryCaching,
+        logLevel: Env.hypersyncLogLevel
       })] : [];
   rpcs.forEach(param => {
     let source = RpcSource.make({
@@ -42,7 +68,7 @@ function makeSources(chain, contracts, hyperSync, allEventSignatures, rpcs, lowe
       url: param.url,
       chain: chain,
       eventRouter: eventRouter,
-      allEventSignatures: allEventSignatures,
+      allEventParams: allEventParams,
       lowercaseAddresses: lowercaseAddresses,
       ws: param.ws
     });
@@ -53,6 +79,7 @@ function makeSources(chain, contracts, hyperSync, allEventSignatures, rpcs, lowe
 
 export {
   getSyncConfig,
+  collectEventParams,
   makeSources,
 }
 /* Env Not a pure module */

package/src/sources/HyperFuelSource.res

@@ -225,7 +225,6 @@ let make = ({chain, endpointUrl}: options): t => {
     ~retry,
     ~logger,
   ) => {
-    let mkLogAndRaise = ErrorHandling.mkLogAndRaise(~logger, ...)
     let totalTimeRef = Hrtime.makeTimer()
 
     let selectionConfig = getSelectionConfig(selection)
@@ -299,55 +298,6 @@ let make = ({chain, endpointUrl}: options): t => {
     //In the query
     let heighestBlockQueried = pageUnsafe.nextBlock - 1
 
-    let lastBlockQueriedPromise = // switch pageUnsafe.rollbackGuard {
-    // //In the case a rollbackGuard is returned (this only happens at the head for unconfirmed blocks)
-    // //use these values
-    // | Some({blockNumber, timestamp, hash}) =>
-    //   {
-    //     ReorgDetection.blockNumber,
-    //     blockTimestamp: timestamp,
-    //     blockHash: hash,
-    //   }->Promise.resolve
-    // | None =>
-    //The optional block and timestamp of the last item returned by the query
-    //(Optional in the case that there are no logs returned in the query)
-    switch pageUnsafe.items->Belt.Array.get(pageUnsafe.items->Belt.Array.length - 1) {
-    | Some({block}) if block.height == heighestBlockQueried =>
-      //If the last log item in the current page is equal to the
-      //heighest block acounted for in the query. Simply return this
-      //value without making an extra query
-
-      (
-        {
-          blockNumber: block.height,
-          blockTimestamp: block.time,
-          blockHash: block.id,
-        }: ReorgDetection.blockDataWithTimestamp
-      )->Promise.resolve
-    //If it does not match it means that there were no matching logs in the last
-    //block so we should fetch the block data
-    | Some(_)
-    | None =>
-      //If there were no logs at all in the current page query then fetch the
-      //timestamp of the heighest block accounted for
-      HyperFuel.queryBlockData(~serverUrl=endpointUrl, ~blockNumber=heighestBlockQueried, ~logger)
-      ->Promise.thenResolve(res => {
-        switch res {
-        | Some(blockData) => blockData
-        | None =>
-          mkLogAndRaise(
-            Not_found,
-            ~msg=`Failure, blockData for block ${heighestBlockQueried->Int.toString} unexpectedly returned None`,
-          )
-        }
-      })
-      ->Promise.catch(exn => {
-        exn->mkLogAndRaise(
-          ~msg=`Failed to query blockData for block ${heighestBlockQueried->Int.toString}`,
-        )
-      })
-    }
-
     let parsingTimeRef = Hrtime.makeTimer()
 
     let parsedQueueItems = pageUnsafe.items->Array.map(item => {
@@ -463,11 +413,18 @@ let make = ({chain, endpointUrl}: options): t => {
 
     let parsingTimeElapsed = parsingTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
 
-    let rangeLastBlock = await lastBlockQueriedPromise
+    // Fuel never rolls back on reorg, so block hashes here are purely informational
+    // for detect-only logging via ReorgDetection.
+    let blockHashes = pageUnsafe.items->Array.map(({block}) => {
+      ReorgDetection.blockNumber: block.height,
+      blockHash: block.id,
+    })
 
-    let reorgGuard: ReorgDetection.reorgGuard = {
-      rangeLastBlock: rangeLastBlock->ReorgDetection.generalizeBlockDataWithTimestamp,
-      prevRangeLastBlock: None,
+    let latestFetchedBlockTimestamp = switch pageUnsafe.items->Belt.Array.get(
+      pageUnsafe.items->Belt.Array.length - 1,
+    ) {
+    | Some({block}) if block.height == heighestBlockQueried => block.time
+    | _ => 0
     }
 
     let totalTimeElapsed = totalTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
@@ -479,12 +436,12 @@ let make = ({chain, endpointUrl}: options): t => {
     }
 
     {
-      latestFetchedBlockTimestamp: rangeLastBlock.blockTimestamp,
+      latestFetchedBlockTimestamp,
       parsedQueueItems,
-      latestFetchedBlockNumber: rangeLastBlock.blockNumber,
+      latestFetchedBlockNumber: heighestBlockQueried,
       stats,
       knownHeight,
-      reorgGuard,
+      blockHashes,
       fromBlockQueried: fromBlock,
     }
   }