envio 3.5.0-alpha.2 → 3.5.0-rc.0

package/src/db/Table.res.mjs

@@ -96,7 +96,8 @@ function getPgFieldName(fieldOrDerived) {
 
 let idFieldName = "id";
 
-function getPgFieldType(fieldType, pgSchema, isArray, isNumericArrayAsText, isNullable) {
+function getPgFieldType(fieldType, pgSchema, isArray, isNumericArrayAsText, isNullable, chainIdModeOpt) {
+  let chainIdMode = chainIdModeOpt !== undefined ? chainIdModeOpt : "int32";
   let columnType;
   if (typeof fieldType !== "object") {
     switch (fieldType) {
@@ -109,6 +110,9 @@ function getPgFieldType(fieldType, pgSchema, isArray, isNumericArrayAsText, isNu
       case "Int32" :
         columnType = "INTEGER";
         break;
+      case "ChainId" :
+        columnType = chainIdMode === "int32" ? "INTEGER" : "BIGINT";
+        break;
       case "Number" :
         columnType = "DOUBLE PRECISION";
         break;
@@ -153,12 +157,12 @@ function getPgFieldType(fieldType, pgSchema, isArray, isNumericArrayAsText, isNu
   );
 }
 
-function mkTable(tableName, compositeIndicesOpt, fields, description) {
-  let compositeIndices = compositeIndicesOpt !== undefined ? compositeIndicesOpt : [];
+function mkTable(tableName, compositeIndexesOpt, fields, description) {
+  let compositeIndexes = compositeIndexesOpt !== undefined ? compositeIndexesOpt : [];
   return {
     tableName: tableName,
     fields: fields,
-    compositeIndices: compositeIndices,
+    compositeIndexes: compositeIndexes,
     description: description
   };
 }
@@ -247,7 +251,7 @@ function getIdFieldOrThrow(table) {
 }
 
 function getIdPgFieldType(table, pgSchema) {
-  return getPgFieldType(getIdFieldOrThrow(table).fieldType, pgSchema, false, false, false);
+  return getPgFieldType(getIdFieldOrThrow(table).fieldType, pgSchema, false, false, false, undefined);
 }
 
 function getIdSchema(table) {
@@ -304,8 +308,8 @@ let pgRowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getPgD
 
 let NonExistingTableField = /* @__PURE__ */Primitive_exceptions.create("Table.NonExistingTableField");
 
-function getUnfilteredCompositeIndicesUnsafe(table) {
-  return table.compositeIndices.map(compositeIndex => compositeIndex.map(indexField => {
+function getUnfilteredCompositeIndexesUnsafe(table) {
+  return table.compositeIndexes.map(compositeIndex => compositeIndex.map(indexField => {
     let field = getFieldByName(table, indexField.fieldName);
     let dbFieldName;
     if (field !== undefined) {
@@ -324,7 +328,8 @@ function getUnfilteredCompositeIndicesUnsafe(table) {
   }));
 }
 
-function toSqlParams(table, schema, pgSchema) {
+function toSqlParams(table, schema, pgSchema, chainIdModeOpt) {
+  let chainIdMode = chainIdModeOpt !== undefined ? chainIdModeOpt : "int32";
   let quotedFieldNames = [];
   let quotedNonPrimaryFieldNames = [];
   let arrayFieldTypes = [];
@@ -395,7 +400,7 @@ function toSqlParams(table, schema, pgSchema) {
       let tmp;
       if (field$1.TAG === "Field") {
         let f = field$1._0;
-        let pgFieldType = getPgFieldType(f.fieldType, pgSchema, true, false, f.isNullable);
+        let pgFieldType = getPgFieldType(f.fieldType, pgSchema, true, false, f.isNullable, chainIdMode);
         let match = f.fieldType;
         tmp = typeof match !== "object" ? (
             match === "Boolean" ? "INTEGER" + `[]::` + pgFieldType : pgFieldType
@@ -419,7 +424,7 @@ function toSqlParams(table, schema, pgSchema) {
   };
 }
 
-function getSingleIndices(table) {
+function getSingleIndexes(table) {
   let indexFields = Stdlib_Array.filterMap(table.fields, field => {
     if (field.TAG !== "Field") {
       return;
@@ -429,7 +434,7 @@ function getSingleIndices(table) {
       return getPgDbFieldName(field$1);
     }
   });
-  return Array.from(new Set(Stdlib_Array.filterMap(getUnfilteredCompositeIndicesUnsafe(table), cidx => {
+  return Array.from(new Set(Stdlib_Array.filterMap(getUnfilteredCompositeIndexesUnsafe(table), cidx => {
     if (cidx.length !== 1) {
       return;
     }
@@ -438,8 +443,8 @@ function getSingleIndices(table) {
   }).concat([indexFields]).flat())).toSorted(Primitive_string.compare);
 }
 
-function getCompositeIndices(table) {
-  return getUnfilteredCompositeIndicesUnsafe(table).filter(ind => ind.length > 1);
+function getCompositeIndexes(table) {
+  return getUnfilteredCompositeIndexesUnsafe(table).filter(ind => ind.length > 1);
 }
 
 export {
@@ -473,9 +478,9 @@ export {
   rowsSchema,
   pgRowsSchema,
   NonExistingTableField,
-  getUnfilteredCompositeIndicesUnsafe,
+  getUnfilteredCompositeIndexesUnsafe,
   toSqlParams,
-  getSingleIndices,
-  getCompositeIndices,
+  getSingleIndexes,
+  getCompositeIndexes,
 }
 /* idsArraySchema Not a pure module */

package/src/sources/AddressSet.res

@@ -15,10 +15,11 @@ type startBlockGroup = {startBlock: int, count: int}
 // fetch state can size and split partitions without ever walking the addresses.
 @send external countFor: (t, string) => int = "countFor"
 
-// The chain-wide address gate, reachable through any set of the store. Not set
-// membership: the simulate source has no native query boundary, so it applies
-// the same gate every real source applies while routing.
-@send external has: (t, Address.t, string, int) => bool = "has"
+// This set holds the address under the contract and it has already started at
+// the block — the gate a real source's router applies to a server-side
+// address-filtered query. The temporal half still comes from the store: a
+// merged partition's addresses don't all start at the same block.
+@send external containsAt: (t, Address.t, string, int) => bool = "containsAt"
 
 @send external contractNames: t => array<string> = "contractNames"
 

package/src/sources/AddressStore.res

@@ -67,28 +67,39 @@ let make = (~ecosystem: Ecosystem.name, ~shouldChecksum: bool, ~contracts: array
 }
 
 // The contracts of a chain that have events, with the earliest block any of
-// their events may fire at.
+// their events may fire at. `None` means unrestricted, so it wins over any
+// `Some`: one registration without a start block makes the whole contract's
+// address gate open from the chain's start, and the per-registration start
+// block still holds back the registrations that declared one.
 let contractsOf = (~onEventRegistrations: array<Internal.onEventRegistration>): array<contract> => {
-  let startBlocks = Dict.make()
+  // Only ever holds a declared start block, so a missing key is unambiguous —
+  // storing `None` in a dict would be indistinguishable from "not seen yet".
+  let startBlocks: dict<int> = Dict.make()
+  let unrestricted = Utils.Set.make()
   let names = []
   onEventRegistrations->Array.forEach(reg => {
     let name = reg.eventConfig.contractName
-    switch startBlocks->Utils.Dict.dangerouslyGetNonOption(name) {
-    | None =>
+    if !(names->Array.includes(name)) {
       names->Array.push(name)->ignore
-      startBlocks->Dict.set(name, reg.startBlock)
-    | Some(existing) =>
+    }
+    switch reg.startBlock {
+    | None => unrestricted->Utils.Set.add(name)->ignore
+    | Some(startBlock) =>
       startBlocks->Dict.set(
         name,
-        switch (existing, reg.startBlock) {
-        | (Some(a), Some(b)) => Some(Pervasives.min(a, b))
-        | (Some(_) as s, None) | (None, Some(_) as s) => s
-        | (None, None) => None
+        switch startBlocks->Utils.Dict.dangerouslyGetNonOption(name) {
+        | Some(existing) => Pervasives.min(existing, startBlock)
+        | None => startBlock
         },
       )
     }
   })
-  names->Array.map(name => {name, startBlock: startBlocks->Dict.getUnsafe(name)})
+  names->Array.map(name => {
+    name,
+    startBlock: unrestricted->Utils.Set.has(name)
+      ? None
+      : startBlocks->Utils.Dict.dangerouslyGetNonOption(name),
+  })
 }
 
 @send external nextId: t => int = "nextId"
@@ -108,9 +119,9 @@ external startBlockGroups: (t, string) => array<AddressSet.startBlockGroup> = "s
 @send external contractCount: (t, string) => int = "contractCount"
 @send external size: t => int = "size"
 
-// The gate routing applies, exposed for the simulate source — it has no real
-// query boundary to gate at.
-@send external has: (t, Address.t, string, int) => bool = "has"
+// The chain-wide gate routing applies, exposed for the simulate source — it has
+// no real query boundary to gate at.
+@send external isIndexedAt: (t, Address.t, string, int) => bool = "isIndexedAt"
 
 // Drops every address registered after the target block, returning how many
 // were dropped. Ids are tombstoned rather than reused, so sets built before the

package/src/sources/AddressStore.res.mjs

@@ -19,26 +19,24 @@ function make(ecosystem, shouldChecksum, contracts) {
 
 function contractsOf(onEventRegistrations) {
   let startBlocks = {};
+  let unrestricted = new Set();
   let names = [];
   onEventRegistrations.forEach(reg => {
     let name = reg.eventConfig.contractName;
-    let existing = startBlocks[name];
-    if (existing !== undefined) {
-      let existing$1 = Primitive_option.valFromOption(existing);
-      let match = reg.startBlock;
-      startBlocks[name] = existing$1 !== undefined ? (
-          match !== undefined ? Primitive_int.min(existing$1, match) : existing$1
-        ) : (
-          match !== undefined ? match : undefined
-        );
+    if (!names.includes(name)) {
+      names.push(name);
+    }
+    let startBlock = reg.startBlock;
+    if (startBlock !== undefined) {
+      let existing = startBlocks[name];
+      startBlocks[name] = existing !== undefined ? Primitive_int.min(existing, startBlock) : startBlock;
       return;
     }
-    names.push(name);
-    startBlocks[name] = reg.startBlock;
+    unrestricted.add(name);
   });
   return names.map(name => ({
     name: name,
-    startBlock: startBlocks[name]
+    startBlock: unrestricted.has(name) ? undefined : startBlocks[name]
   }));
 }
 

package/src/sources/Evm.res

@@ -6,7 +6,7 @@ type payload = {
   contractName: string,
   eventName: string,
   params: Internal.eventParams,
-  chainId: int,
+  chainId: ChainId.t,
   srcAddress: Address.t,
   logIndex: int,
   transaction?: Internal.eventTransaction,
@@ -106,7 +106,7 @@ let make = (~logger: Pino.t): Ecosystem.t => {
       ~params={
         "contract": eventItem.onEventRegistration.eventConfig.contractName,
         "event": eventItem.onEventRegistration.eventConfig.name,
-        "chainId": eventItem.chain->ChainMap.Chain.toChainId,
+        "chainId": eventItem.chainId,
         "block": eventItem.blockNumber,
         "logIndex": eventItem.logIndex,
         "address": (eventItem.payload->toPayload).srcAddress,

package/src/sources/Evm.res.mjs

@@ -64,7 +64,7 @@ function make(logger) {
     toEventLogger: eventItem => Logging.createChildFrom(logger, {
       contract: eventItem.onEventRegistration.eventConfig.contractName,
       event: eventItem.onEventRegistration.eventConfig.name,
-      chainId: eventItem.chain,
+      chainId: eventItem.chainId,
       block: eventItem.blockNumber,
       logIndex: eventItem.logIndex,
       address: eventItem.payload.srcAddress

package/src/sources/EvmChain.res

@@ -40,7 +40,7 @@ let getSyncConfig = (
 }
 
 let makeSources = (
-  ~chain,
+  ~chainId,
   ~onEventRegistrations: array<Internal.evmOnEventRegistration>,
   ~hyperSync,
   ~rpcs: array<rpc>,
@@ -50,7 +50,7 @@ let makeSources = (
   let sources = switch hyperSync {
   | Some(endpointUrl) => [
       EvmHyperSyncSource.make({
-        chain,
+        chainId,
         endpointUrl,
         onEventRegistrations,
         apiToken: Env.envioApiToken,
@@ -66,7 +66,7 @@ let makeSources = (
   }
   rpcs->Array.forEach(({?syncConfig, url, sourceFor, ?ws, ?headers}) => {
     let source = RpcSource.make({
-      chain,
+      chainId,
       sourceFor,
       syncConfig: getSyncConfig(syncConfig->Option.getOr({})),
       url,

package/src/sources/EvmChain.res.mjs

@@ -19,9 +19,9 @@ function getSyncConfig(param) {
   };
 }
 
-function makeSources(chain, onEventRegistrations, hyperSync, rpcs, lowercaseAddresses, addressStore) {
+function makeSources(chainId, onEventRegistrations, hyperSync, rpcs, lowercaseAddresses, addressStore) {
   let sources = hyperSync !== undefined ? [EvmHyperSyncSource.make({
-        chain: chain,
+        chainId: chainId,
         endpointUrl: hyperSync,
         onEventRegistrations: onEventRegistrations,
         apiToken: Env.envioApiToken,
@@ -37,7 +37,7 @@ function makeSources(chain, onEventRegistrations, hyperSync, rpcs, lowercaseAddr
       sourceFor: param.sourceFor,
       syncConfig: getSyncConfig(Stdlib_Option.getOr(param.syncConfig, {})),
       url: param.url,
-      chain: chain,
+      chainId: chainId,
       onEventRegistrations: onEventRegistrations,
       lowercaseAddresses: lowercaseAddresses,
       addressStore: addressStore,

package/src/sources/EvmHyperSyncSource.res

@@ -6,7 +6,7 @@ open Source
 let isUnauthorizedError = (message: string) => message->String.includes("401 Unauthorized")
 
 type options = {
-  chain: ChainMap.Chain.t,
+  chainId: ChainId.t,
   endpointUrl: string,
   // The chain's registrations, indexed by their sequential `index`.
   onEventRegistrations: array<Internal.evmOnEventRegistration>,
@@ -22,7 +22,7 @@ type options = {
 
 let make = (
   {
-    chain,
+    chainId,
     endpointUrl,
     onEventRegistrations,
     apiToken,
@@ -70,7 +70,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
 
     Internal.Event({
       onEventRegistration: (onEventRegistration :> Internal.onEventRegistration),
-      chain,
+      chainId,
       blockNumber: item.blockNumber,
       logIndex,
       transactionIndex,
@@ -79,7 +79,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       payload: {
         contractName: onEventRegistration.eventConfig.contractName,
         eventName: onEventRegistration.eventConfig.name,
-        chainId: chain->ChainMap.Chain.toChainId,
+        chainId: chainId,
         params: item.params,
         srcAddress,
         logIndex,
@@ -253,7 +253,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       ~client,
       ~blockNumbers,
       ~sourceName=name,
-      ~chainId=chain->ChainMap.Chain.toChainId,
+      ~chainId=chainId,
       ~logger,
     )->Promise.thenResolve(((queryRes, requestStats)) => {
       Source.result: queryRes->HyperSync.mapExn,
@@ -263,7 +263,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
   {
     name,
     sourceFor: Sync,
-    chain,
+    chainId,
     pollingInterval: 100,
     poweredByHyperSync: true,
     getBlockHashes,
@@ -290,7 +290,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       HyperSyncHeightStream.subscribe(
         ~hyperSyncUrl=endpointUrl,
         ~apiToken,
-        ~chainId=chain->ChainMap.Chain.toChainId,
+        ~chainId=chainId,
         ~onHeight,
       ),
   }

package/src/sources/EvmHyperSyncSource.res.mjs

@@ -21,7 +21,7 @@ function make(param) {
   let apiToken = param.apiToken;
   let onEventRegistrations = param.onEventRegistrations;
   let endpointUrl = param.endpointUrl;
-  let chain = param.chain;
+  let chainId = param.chainId;
   let name = "HyperSync";
   let apiToken$1 = apiToken !== undefined ? apiToken : Stdlib_JsError.throwWithMessage(`An Envio API token is required for using HyperSync as a data-source.
 Set the ENVIO_API_TOKEN environment variable in your .env file.
@@ -38,7 +38,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     return {
       kind: 0,
       onEventRegistration: onEventRegistration,
-      chain: chain,
+      chainId: chainId,
       blockNumber: item.blockNumber,
       logIndex: logIndex,
       transactionIndex: item.transactionIndex,
@@ -46,7 +46,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         contractName: onEventRegistration.eventConfig.contractName,
         eventName: onEventRegistration.eventConfig.name,
         params: item.params,
-        chainId: chain,
+        chainId: chainId,
         srcAddress: item.srcAddress,
         logIndex: logIndex
       }
@@ -170,14 +170,14 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       requestStats: requestStats
     };
   };
-  let getBlockHashes = (blockNumbers, logger) => HyperSync.queryBlockDataMulti(client, blockNumbers, name, chain, logger).then(param => ({
+  let getBlockHashes = (blockNumbers, logger) => HyperSync.queryBlockDataMulti(client, blockNumbers, name, chainId, logger).then(param => ({
     result: HyperSync.mapExn(param[0]),
     requestStats: param[1]
   }));
   return {
     name: name,
     sourceFor: "Sync",
-    chain: chain,
+    chainId: chainId,
     poweredByHyperSync: true,
     pollingInterval: 100,
     getBlockHashes: getBlockHashes,
@@ -224,7 +224,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       };
     },
     getItemsOrThrow: getItemsOrThrow,
-    createHeightSubscription: onHeight => HyperSyncHeightStream.subscribe(endpointUrl, apiToken$1, chain, onHeight)
+    createHeightSubscription: onHeight => HyperSyncHeightStream.subscribe(endpointUrl, apiToken$1, chainId, onHeight)
   };
 }
 

package/src/sources/Fuel.res

@@ -4,7 +4,7 @@ type payload = {
   contractName: string,
   eventName: string,
   params: Internal.eventParams,
-  chainId: int,
+  chainId: ChainId.t,
   srcAddress: Address.t,
   logIndex: int,
   transaction: Internal.eventTransaction,
@@ -48,7 +48,7 @@ let make = (~logger: Pino.t): Ecosystem.t => {
       ~params={
         "contract": eventItem.onEventRegistration.eventConfig.contractName,
         "event": eventItem.onEventRegistration.eventConfig.name,
-        "chainId": eventItem.chain->ChainMap.Chain.toChainId,
+        "chainId": eventItem.chainId,
         "block": eventItem.blockNumber,
         "logIndex": eventItem.logIndex,
         "address": (eventItem.payload->toPayload).srcAddress,

package/src/sources/Fuel.res.mjs

@@ -25,7 +25,7 @@ function make(logger) {
     toEventLogger: eventItem => Logging.createChildFrom(logger, {
       contract: eventItem.onEventRegistration.eventConfig.contractName,
       event: eventItem.onEventRegistration.eventConfig.name,
-      chainId: eventItem.chain,
+      chainId: eventItem.chainId,
       block: eventItem.blockNumber,
       logIndex: eventItem.logIndex,
       address: eventItem.payload.srcAddress

package/src/sources/FuelHyperSyncClient.res

@@ -22,6 +22,8 @@ module Registration = {
     eventName: string,
     contractName: string,
     isWildcard: bool,
+    // Earliest block height this registration accepts; `None` is unrestricted.
+    startBlock: option<int>,
     kind: kind,
     // The LogData `rb` value as a decimal string; absent for other kinds.
     logId?: string,
@@ -45,6 +47,7 @@ module Registration = {
         eventName: eventConfig.name,
         contractName: eventConfig.contractName,
         isWildcard: reg.isWildcard,
+        startBlock: reg.startBlock,
         kind,
         ?logId,
       }

package/src/sources/FuelHyperSyncClient.res.mjs

@@ -46,6 +46,7 @@ function fromOnEventRegistrations(onEventRegistrations) {
       eventName: eventConfig.name,
       contractName: eventConfig.contractName,
       isWildcard: reg.isWildcard,
+      startBlock: reg.startBlock,
       kind: match$1[0],
       logId: match$1[1]
     };

package/src/sources/FuelHyperSyncSource.res

@@ -3,7 +3,7 @@ open Source
 let isUnauthorizedError = (message: string) => message->String.includes("401 Unauthorized")
 
 type options = {
-  chain: ChainMap.Chain.t,
+  chainId: ChainId.t,
   endpointUrl: string,
   apiToken: option<string>,
   // The chain's registrations, indexed by their sequential `index`.
@@ -12,7 +12,7 @@ type options = {
   addressStore: AddressStore.t,
 }
 
-let make = ({chain, endpointUrl, apiToken, onEventRegistrations, addressStore}: options): t => {
+let make = ({chainId, endpointUrl, apiToken, onEventRegistrations, addressStore}: options): t => {
   let name = "HyperFuel"
 
   let apiToken = switch apiToken {
@@ -120,8 +120,6 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       blocksByHeight->Utils.Map.set(block.height, block)->ignore
     })
 
-    let chainId = chain->ChainMap.Chain.toChainId
-
     let parsedQueueItems = pageUnsafe.items->Array.map(item => {
       // Routing happened in Rust; the item references its registration by
       // chain-scoped index.
@@ -171,7 +169,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
 
       Internal.Event({
         onEventRegistration,
-        chain,
+        chainId,
         blockNumber: item.blockHeight,
         logIndex: item.receiptIndex,
         // Fuel carries the transaction inline on the payload; the store key is
@@ -180,7 +178,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
         payload: {
           contractName: eventConfig.contractName,
           eventName: eventConfig.name,
-          chainId,
+          chainId: chainId,
           params,
           transaction: {
             "id": item.txId,
@@ -235,7 +233,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
   {
     name,
     sourceFor: Sync,
-    chain,
+    chainId,
     getBlockHashes,
     pollingInterval: 100,
     poweredByHyperSync: true,

package/src/sources/FuelHyperSyncSource.res.mjs

@@ -18,7 +18,7 @@ function isUnauthorizedError(message) {
 function make(param) {
   let onEventRegistrations = param.onEventRegistrations;
   let apiToken = param.apiToken;
-  let chain = param.chain;
+  let chainId = param.chainId;
   let apiToken$1 = apiToken !== undefined ? apiToken : Stdlib_JsError.throwWithMessage(`An Envio API token is required for using HyperFuel as a data-source.
 Set the ENVIO_API_TOKEN environment variable in your .env file.
 Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
@@ -119,7 +119,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         } catch (raw_exn) {
           let exn = Primitive_exceptions.internalToException(raw_exn);
           let params$1 = {
-            chainId: chain,
+            chainId: chainId,
             blockNumber: item.blockHeight,
             logIndex: item.receiptIndex
           };
@@ -145,7 +145,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       return {
         kind: 0,
         onEventRegistration: onEventRegistration,
-        chain: chain,
+        chainId: chainId,
         blockNumber: item.blockHeight,
         logIndex: item.receiptIndex,
         transactionIndex: 0,
@@ -153,7 +153,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
           contractName: eventConfig.contractName,
           eventName: eventConfig.name,
           params: params,
-          chainId: chain,
+          chainId: chainId,
           srcAddress: item.srcAddress,
           logIndex: item.receiptIndex,
           transaction: {
@@ -195,7 +195,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
   return {
     name: "HyperFuel",
     sourceFor: "Sync",
-    chain: chain,
+    chainId: chainId,
     poweredByHyperSync: true,
     pollingInterval: 100,
     getBlockHashes: getBlockHashes,

package/src/sources/HyperSync.resi

@@ -43,7 +43,7 @@ let queryBlockData: (
   ~client: HyperSyncClient.t,
   ~blockNumber: int,
   ~sourceName: string,
-  ~chainId: int,
+  ~chainId: ChainId.t,
   ~logger: Pino.t,
 ) => promise<(
   queryResponse<option<ReorgDetection.blockDataWithTimestamp>>,
@@ -54,7 +54,7 @@ let queryBlockDataMulti: (
   ~client: HyperSyncClient.t,
   ~blockNumbers: array<int>,
   ~sourceName: string,
-  ~chainId: int,
+  ~chainId: ChainId.t,
   ~logger: Pino.t,
 ) => promise<(
   queryResponse<array<ReorgDetection.blockDataWithTimestamp>>,

package/src/sources/HyperSyncClient.res

@@ -254,6 +254,10 @@ module Registration = {
     contractName: string,
     isWildcard: bool,
     dependsOnAddresses: bool,
+    // Earliest block this registration accepts; `None` is unrestricted. The
+    // address store's start block is contract-wide, so it can't hold one
+    // registration back when a sibling declares no start block.
+    startBlock: option<int>,
     params: array<Internal.paramMeta>,
     topicSelections: array<topicSelectionInput>,
     // Capitalized field names matching the Rust BlockField/TransactionField
@@ -281,6 +285,7 @@ module Registration = {
         contractName: event.contractName,
         isWildcard: reg.isWildcard,
         dependsOnAddresses: reg.dependsOnAddresses,
+        startBlock: reg.startBlock,
         params: event.paramsMetadata,
         topicSelections: reg.resolvedWhere.topicSelections->Array.map((ts): topicSelectionInput => {
           topic0: ts.topic0->EvmTypes.Hex.toStrings,

package/src/sources/HyperSyncClient.res.mjs

@@ -53,6 +53,7 @@ function fromOnEventRegistrations(onEventRegistrations) {
       contractName: event.contractName,
       isWildcard: reg.isWildcard,
       dependsOnAddresses: reg.dependsOnAddresses,
+      startBlock: reg.startBlock,
       params: event.paramsMetadata,
       topicSelections: reg.resolvedWhere.topicSelections.map(ts => ({
         topic0: ts.topic0,