envio 3.5.0-alpha.3 → 3.5.0

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,

package/src/sources/RpcSource.res

@@ -43,7 +43,7 @@ let parseBlockInfo = (json: JSON.t): blockInfo => {
 let getKnownRawBlockWithBackoff = async (
   ~client,
   ~sourceName,
-  ~chain,
+  ~chainId,
   ~blockNumber,
   ~backoffMsOnFailure,
   ~recordRequest: (~method: string, ~seconds: float) => unit,
@@ -60,7 +60,7 @@ let getKnownRawBlockWithBackoff = async (
         "err": err->Utils.prettifyExn,
         "msg": `Issue while running fetching batch of events from the RPC. Will wait ${currentBackoff.contents->Int.toString}ms and try again.`,
         "source": sourceName,
-        "chainId": chain->ChainMap.Chain.toChainId,
+        "chainId": chainId,
         "type": "EXPONENTIAL_BACKOFF",
       })
       await Time.resolvePromiseAfterDelay(~delayMilliseconds=currentBackoff.contents)
@@ -613,7 +613,7 @@ type options = {
   sourceFor: Source.sourceFor,
   syncConfig: Config.sourceSync,
   url: string,
-  chain: ChainMap.Chain.t,
+  chainId: ChainId.t,
   // The chain's registrations, indexed by their sequential `index`.
   onEventRegistrations: array<Internal.evmOnEventRegistration>,
   lowercaseAddresses: bool,
@@ -628,7 +628,7 @@ let make = (
     sourceFor,
     syncConfig,
     url,
-    chain,
+    chainId,
     onEventRegistrations,
     lowercaseAddresses,
     addressStore,
@@ -636,11 +636,10 @@ let make = (
     ?headers,
   }: options,
 ): t => {
-  let chainId = chain->ChainMap.Chain.toChainId
   let urlHost = switch Utils.Url.getHostFromUrl(url) {
   | None =>
     JsError.throwWithMessage(
-      `The RPC url for chain ${chainId->Int.toString} is in incorrect format. The RPC url needs to start with either http:// or https://`,
+      `The RPC url for chain ${chainId->ChainId.toString} is in incorrect format. The RPC url needs to start with either http:// or https://`,
     )
   | Some(host) => host
   }
@@ -694,7 +693,7 @@ let make = (
           "msg": `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ${(am._retryDelayMillis / 1000)
               ->Int.toString} seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
           "source": name,
-          "chainId": chain->ChainMap.Chain.toChainId,
+          "chainId": chainId,
           "metadata": {
             {
               "asyncTaskName": "transactionLoader: fetching transaction data - `getTransaction` rpc call",
@@ -711,7 +710,7 @@ let make = (
         getKnownRawBlockWithBackoff(
           ~client,
           ~sourceName=name,
-          ~chain,
+          ~chainId,
           ~backoffMsOnFailure=1000,
           ~blockNumber,
           ~recordRequest,
@@ -723,7 +722,7 @@ let make = (
           "msg": `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ${(am._retryDelayMillis / 1000)
               ->Int.toString} seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
           "source": name,
-          "chainId": chain->ChainMap.Chain.toChainId,
+          "chainId": chainId,
           "metadata": {
             {
               "asyncTaskName": "blockLoader: fetching block data - `getBlock` rpc call",
@@ -754,7 +753,7 @@ let make = (
           "msg": `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ${(am._retryDelayMillis / 1000)
               ->Int.toString} seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
           "source": name,
-          "chainId": chain->ChainMap.Chain.toChainId,
+          "chainId": chainId,
           "metadata": {
             {
               "asyncTaskName": "receiptLoader: fetching transaction receipt - `getTransactionReceipt` rpc call",
@@ -926,13 +925,13 @@ let make = (
           Internal.Event({
             onEventRegistration: (onEventRegistration :> Internal.onEventRegistration),
             blockNumber: block->getBlockNumber,
-            chain,
+            chainId,
             logIndex: log.logIndex,
             transactionIndex: log.transactionIndex,
             payload: {
               contractName: eventConfig.contractName,
               eventName: eventConfig.name,
-              chainId: chain->ChainMap.Chain.toChainId,
+              chainId: chainId,
               params: decoded,
               block,
               transaction,
@@ -1024,13 +1023,13 @@ let make = (
 
   let createHeightSubscription =
     ws->Option.map(wsUrl =>
-      (~onHeight) => RpcWebSocketHeightStream.subscribe(~wsUrl, ~chainId, ~onHeight)
+      (~onHeight) => RpcWebSocketHeightStream.subscribe(~wsUrl, ~chainId=chainId, ~onHeight)
     )
 
   {
     name,
     sourceFor,
-    chain,
+    chainId,
     poweredByHyperSync: false,
     pollingInterval: syncConfig.pollingInterval,
     getBlockHashes,

package/src/sources/RpcSource.res.mjs

@@ -6,6 +6,7 @@ import * as Time from "../Time.res.mjs";
 import * as Utils from "../Utils.res.mjs";
 import * as Source from "./Source.res.mjs";
 import * as Address from "../Address.res.mjs";
+import * as ChainId from "../ChainId.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as Internal from "../Internal.res.mjs";
 import * as LazyLoader from "../LazyLoader.res.mjs";
@@ -44,7 +45,7 @@ function parseBlockInfo(json) {
   };
 }
 
-async function getKnownRawBlockWithBackoff(client, sourceName, chain, blockNumber, backoffMsOnFailure, recordRequest) {
+async function getKnownRawBlockWithBackoff(client, sourceName, chainId, blockNumber, backoffMsOnFailure, recordRequest) {
   let currentBackoff = backoffMsOnFailure;
   let result;
   while (Stdlib_Option.isNone(result)) {
@@ -61,7 +62,7 @@ async function getKnownRawBlockWithBackoff(client, sourceName, chain, blockNumbe
         err: Utils.prettifyExn(err),
         msg: `Issue while running fetching batch of events from the RPC. Will wait ` + currentBackoff.toString() + `ms and try again.`,
         source: sourceName,
-        chainId: chain,
+        chainId: chainId,
         type: "EXPONENTIAL_BACKOFF"
       });
       await Time.resolvePromiseAfterDelay(currentBackoff);
@@ -727,11 +728,11 @@ function make(param) {
   let headers = param.headers;
   let lowercaseAddresses = param.lowercaseAddresses;
   let onEventRegistrations = param.onEventRegistrations;
-  let chain = param.chain;
+  let chainId = param.chainId;
   let url = param.url;
   let syncConfig = param.syncConfig;
   let host = Utils.Url.getHostFromUrl(url);
-  let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + chain.toString() + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
+  let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + ChainId.toString(chainId) + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
   let name = `RPC (` + urlHost + `)`;
   let client = Rpc.makeClient(url, headers);
   let rpcClient = EvmRpcClient.make(url, !lowercaseAddresses, syncConfig, undefined, headers, HyperSyncClient.Registration.fromOnEventRegistrations(onEventRegistrations), param.addressStore);
@@ -757,17 +758,17 @@ function make(param) {
     err: Utils.prettifyExn(exn),
     msg: `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ` + (am._retryDelayMillis / 1000 | 0).toString() + ` seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
     source: name,
-    chainId: chain,
+    chainId: chainId,
     metadata: {
       asyncTaskName: "transactionLoader: fetching transaction data - `getTransaction` rpc call",
       suggestedFix: "This likely means the RPC url you are using is not responding correctly. Please try another RPC endipoint."
     }
   }), undefined, undefined, undefined, undefined);
-  let makeBlockLoader = () => LazyLoader.make(blockNumber => getKnownRawBlockWithBackoff(client, name, chain, blockNumber, 1000, recordRequest), (am, exn) => Logging.error({
+  let makeBlockLoader = () => LazyLoader.make(blockNumber => getKnownRawBlockWithBackoff(client, name, chainId, blockNumber, 1000, recordRequest), (am, exn) => Logging.error({
     err: Utils.prettifyExn(exn),
     msg: `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ` + (am._retryDelayMillis / 1000 | 0).toString() + ` seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
     source: name,
-    chainId: chain,
+    chainId: chainId,
     metadata: {
       asyncTaskName: "blockLoader: fetching block data - `getBlock` rpc call",
       suggestedFix: "This likely means the RPC url you are using is not responding correctly. Please try another RPC endipoint."
@@ -783,7 +784,7 @@ function make(param) {
     err: Utils.prettifyExn(exn),
     msg: `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ` + (am._retryDelayMillis / 1000 | 0).toString() + ` seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
     source: name,
-    chainId: chain,
+    chainId: chainId,
     metadata: {
       asyncTaskName: "receiptLoader: fetching transaction receipt - `getTransactionReceipt` rpc call",
       suggestedFix: "This likely means the RPC url you are using is not responding correctly. Please try another RPC endipoint."
@@ -924,7 +925,7 @@ function make(param) {
         return {
           kind: 0,
           onEventRegistration: onEventRegistration,
-          chain: chain,
+          chainId: chainId,
           blockNumber: block.number,
           logIndex: log.logIndex,
           transactionIndex: log.transactionIndex,
@@ -932,7 +933,7 @@ function make(param) {
             contractName: eventConfig.contractName,
             eventName: eventConfig.name,
             params: decoded,
-            chainId: chain,
+            chainId: chainId,
             srcAddress: log.address,
             logIndex: log.logIndex,
             transaction: Primitive_option.some(match[1]),
@@ -1011,11 +1012,11 @@ function make(param) {
     },
     requestStats: drainRequestStats()
   }));
-  let createHeightSubscription = Stdlib_Option.map(param.ws, wsUrl => (onHeight => RpcWebSocketHeightStream.subscribe(wsUrl, chain, onHeight)));
+  let createHeightSubscription = Stdlib_Option.map(param.ws, wsUrl => (onHeight => RpcWebSocketHeightStream.subscribe(wsUrl, chainId, onHeight)));
   return {
     name: name,
     sourceFor: param.sourceFor,
-    chain: chain,
+    chainId: chainId,
     poweredByHyperSync: false,
     pollingInterval: syncConfig.pollingInterval,
     getBlockHashes: getBlockHashes,