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

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,

package/src/sources/SimulateSource.res

@@ -1,11 +1,15 @@
-let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain.t): Source.t => {
+let make = (
+  ~items: array<Internal.item>,
+  ~endBlock: int,
+  ~chainId: ChainId.t,
+  ~addressStore: AddressStore.t,
+): Source.t => {
   let reportedHeight = max(endBlock, 1)
 
   {
     name: "SimulateSource",
-    simulateItems: items,
     sourceFor: Sync,
-    chain,
+    chainId,
     poweredByHyperSync: false,
     pollingInterval: 0,
     getBlockHashes: (~blockNumbers as _, ~logger as _) => {
@@ -27,8 +31,9 @@ let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain
       ~logger as _,
     ) => {
       // Mirror a real backend: return only the items this query would match —
-      // in the block range, part of the selection, and passing the same address
-      // gates a real source applies natively while routing (the emitter must be
+      // in the block range, part of the selection, at or after the
+      // registration's own start block, and passing the same address gates a
+      // real source applies natively while routing (the emitter must be
       // registered for the event's contract at or before the item's block, and
       // any address-valued param filter must hold). Overlapping queries may
       // return the same item more than once; the buffer dedups it.
@@ -36,27 +41,49 @@ let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain
       | Some(toBlock) => toBlock
       | None => reportedHeight
       }
-      let selectionEventIds = Utils.Set.make()
+      // By registration index, not `eventConfig.id`: two registrations of the
+      // same event are independent and may sit in different partitions, so
+      // matching on the shared event id would let a sibling's items leak into
+      // this query.
+      let selectionRegistrationIndexes = Utils.Set.make()
       selection.onEventRegistrations->Array.forEach(reg =>
-        selectionEventIds->Utils.Set.add(reg.eventConfig.id)->ignore
+        selectionRegistrationIndexes->Utils.Set.add(reg.index)->ignore
       )
 
+      // A client-filtered contract is queried address-free, so this partition
+      // holds none of its addresses and only the chain-wide store can answer
+      // for it — exactly the fallback every real source's router makes.
+      let isAddressAllowed = (address, ~contractName, ~blockNumber) =>
+        switch selection.clientFilteredContracts {
+        | Some(contractNames) if contractNames->Array.includes(contractName) =>
+          addressStore->AddressStore.isIndexedAt(address, contractName, blockNumber)
+        | _ => addressSet->AddressSet.containsAt(address, contractName, blockNumber)
+        }
+
+      // The registration's own start block, which the contract-wide address gate
+      // can't express. Every native router applies it while routing.
+      let hasStarted = (onEventRegistration: Internal.onEventRegistration, ~blockNumber) =>
+        switch onEventRegistration.startBlock {
+        | Some(startBlock) => blockNumber >= startBlock
+        | None => true
+        }
+
       let parsedQueueItems = items->Array.filter(item => {
         let eventItem = item->Internal.castUnsafeEventItem
         let {blockNumber, onEventRegistration} = eventItem
         if blockNumber < fromBlock || blockNumber > toBlockQueried {
           false
-        } else if !(selectionEventIds->Utils.Set.has(onEventRegistration.eventConfig.id)) {
+        } else if !(selectionRegistrationIndexes->Utils.Set.has(onEventRegistration.index)) {
+          false
+        } else if !(onEventRegistration->hasStarted(~blockNumber)) {
           false
         } else {
           let contractName = onEventRegistration.eventConfig.contractName
           let emitterAllowed =
             onEventRegistration.isWildcard ||
-              addressSet->AddressSet.has(
-                eventItem.payload->Internal.getPayloadSrcAddress,
-                contractName,
-                blockNumber,
-              )
+            eventItem.payload
+            ->Internal.getPayloadSrcAddress
+            ->isAddressAllowed(~contractName, ~blockNumber)
           emitterAllowed &&
           switch onEventRegistration.addressFilterParamGroups {
           | None
@@ -64,8 +91,8 @@ let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain
           | Some(groups) =>
             let params = eventItem.payload->Internal.getPayloadAddressParams
             groups->Array.some(group =>
-              group->Array.every(name =>
-                addressSet->AddressSet.has(params->Dict.getUnsafe(name), contractName, blockNumber)
+              group->Array.every(
+                name => params->Dict.getUnsafe(name)->isAddressAllowed(~contractName, ~blockNumber),
               )
             )
           }

package/src/sources/SimulateSource.res.mjs

@@ -2,12 +2,12 @@
 
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
 
-function make(items, endBlock, chain) {
+function make(items, endBlock, chainId, addressStore) {
   let reportedHeight = Primitive_int.max(endBlock, 1);
   return {
     name: "SimulateSource",
     sourceFor: "Sync",
-    chain: chain,
+    chainId: chainId,
     poweredByHyperSync: false,
     pollingInterval: 0,
     getBlockHashes: (param, param$1) => Promise.resolve({
@@ -23,21 +23,40 @@ function make(items, endBlock, chain) {
     }),
     getItemsOrThrow: (fromBlock, toBlock, addressSet, param, param$1, selection, param$2, param$3, param$4) => {
       let toBlockQueried = toBlock !== undefined ? toBlock : reportedHeight;
-      let selectionEventIds = new Set();
+      let selectionRegistrationIndexes = new Set();
       selection.onEventRegistrations.forEach(reg => {
-        selectionEventIds.add(reg.eventConfig.id);
+        selectionRegistrationIndexes.add(reg.index);
       });
+      let isAddressAllowed = (address, contractName, blockNumber) => {
+        let contractNames = selection.clientFilteredContracts;
+        if (contractNames !== undefined && contractNames.includes(contractName)) {
+          return addressStore.isIndexedAt(address, contractName, blockNumber);
+        } else {
+          return addressSet.containsAt(address, contractName, blockNumber);
+        }
+      };
+      let hasStarted = (onEventRegistration, blockNumber) => {
+        let startBlock = onEventRegistration.startBlock;
+        if (startBlock !== undefined) {
+          return blockNumber >= startBlock;
+        } else {
+          return true;
+        }
+      };
       let parsedQueueItems = items.filter(item => {
         let blockNumber = item.blockNumber;
         if (blockNumber < fromBlock || blockNumber > toBlockQueried) {
           return false;
         }
         let onEventRegistration = item.onEventRegistration;
-        if (!selectionEventIds.has(onEventRegistration.eventConfig.id)) {
+        if (!selectionRegistrationIndexes.has(onEventRegistration.index)) {
+          return false;
+        }
+        if (!hasStarted(onEventRegistration, blockNumber)) {
           return false;
         }
         let contractName = onEventRegistration.eventConfig.contractName;
-        let emitterAllowed = onEventRegistration.isWildcard || addressSet.has(item.payload.srcAddress, contractName, blockNumber);
+        let emitterAllowed = onEventRegistration.isWildcard || isAddressAllowed(item.payload.srcAddress, contractName, blockNumber);
         if (!emitterAllowed) {
           return false;
         }
@@ -49,7 +68,7 @@ function make(items, endBlock, chain) {
           return true;
         }
         let params = item.payload.params;
-        return groups.some(group => group.every(name => addressSet.has(params[name], contractName, blockNumber)));
+        return groups.some(group => group.every(name => isAddressAllowed(params[name], contractName, blockNumber)));
       });
       return Promise.resolve({
         knownHeight: reportedHeight,
@@ -65,8 +84,7 @@ function make(items, endBlock, chain) {
         },
         requestStats: []
       });
-    },
-    simulateItems: items
+    }
   };
 }
 

package/src/sources/Source.res

@@ -64,7 +64,7 @@ type sourceFor = Sync | Fallback | Realtime
 type t = {
   name: string,
   sourceFor: sourceFor,
-  chain: ChainMap.Chain.t,
+  chainId: ChainId.t,
   poweredByHyperSync: bool,
   /* Frequency (in ms) used when polling for new events on this network. */
   pollingInterval: int,
@@ -95,8 +95,4 @@ type t = {
   // Invoked by SourceManager once a rollback target is known so the source can
   // drop any state that may now point at an orphaned chain (e.g. RPC block cache).
   onReorg?: (~rollbackTargetBlock: int) => unit,
-  // Present only on the simulate source: the items a test fed in. The chain
-  // tracks which of these never reach a handler so the run can report dead
-  // simulate inputs on completion.
-  simulateItems?: array<Internal.item>,
 }

package/src/sources/SourceManager.res

@@ -32,7 +32,7 @@ let recordRequestStats = (sourceState: sourceState, requestStats: array<Source.r
 // inline into the /metrics response.
 type requestStatSample = {
   sourceName: string,
-  chainId: int,
+  chainId: ChainId.t,
   method: string,
   count: int,
   seconds: float,
@@ -81,7 +81,7 @@ let getActiveSource = sourceManager => sourceManager.activeSource
 let getRequestStatSamples = (sourceManager: t): array<requestStatSample> => {
   let samples = []
   sourceManager.sourcesState->Array.forEach(sourceState => {
-    let chainId = sourceState.source.chain->ChainMap.Chain.toChainId
+    let chainId = sourceState.source.chainId
     sourceState.requestStats->Utils.Dict.forEachWithKey((agg, method) => {
       samples
       ->Array.push({
@@ -101,7 +101,7 @@ let getRequestStatSamples = (sourceManager: t): array<requestStatSample> => {
 // observed height yet are skipped.
 type sourceHeightSample = {
   sourceName: string,
-  chainId: int,
+  chainId: ChainId.t,
   height: int,
 }
 
@@ -111,7 +111,7 @@ let getSourceHeightSamples = (sourceManager: t): array<sourceHeightSample> => {
     if sourceState.knownHeight > 0 {
       samples->Array.push({
         sourceName: sourceState.source.name,
-        chainId: sourceState.source.chain->ChainMap.Chain.toChainId,
+        chainId: sourceState.source.chainId,
         height: sourceState.knownHeight,
       })
     }
@@ -425,7 +425,7 @@ let getSourceNewHeight = async (
         logger->Logging.childTrace({
           "msg": "onHeight subscription stale, switching to polling fallback",
           "source": source.name,
-          "chainId": source.chain->ChainMap.Chain.toChainId,
+          "chainId": source.chainId,
         })
         let h = ref(initialHeight)
         while h.contents <= knownHeight && !(newHeight.contents > initialHeight) {
@@ -585,7 +585,7 @@ let waitForNewBlock = async (sourceManager: t, ~knownHeight, ~isRealtime, ~reduc
 
   let logger = Logging.createChild(
     ~params={
-      "chainId": sourceManager.activeSource.chain->ChainMap.Chain.toChainId,
+      "chainId": sourceManager.activeSource.chainId,
       "knownHeight": knownHeight,
     },
   )
@@ -725,7 +725,7 @@ let executeQuery = async (
     | Some(s) =>
       if s.source !== sourceManager.activeSource {
         let logger = Logging.createChild(
-          ~params={"chainId": sourceManager.activeSource.chain->ChainMap.Chain.toChainId},
+          ~params={"chainId": sourceManager.activeSource.chainId},
         )
         logger->Logging.childInfo({
           "msg": "Switching data-source",
@@ -737,7 +737,7 @@ let executeQuery = async (
       s
     | None =>
       let logger = Logging.createChild(
-        ~params={"chainId": sourceManager.activeSource.chain->ChainMap.Chain.toChainId},
+        ~params={"chainId": sourceManager.activeSource.chainId},
       )
       %raw(`null`)->ErrorHandling.mkLogAndRaise(~logger, ~msg=noSourcesError)
     }
@@ -748,7 +748,7 @@ let executeQuery = async (
 
     let logger = Logging.createChild(
       ~params={
-        "chainId": source.chain->ChainMap.Chain.toChainId,
+        "chainId": source.chainId,
         "logType": "Block Range Query",
         "partitionId": query.partitionId,
         "source": source.name,
@@ -766,7 +766,7 @@ let executeQuery = async (
         ~addressSet=query.addresses,
         ~partitionId=query.partitionId,
         ~knownHeight,
-        ~selection=query.selection,
+        ~selection=query.selection->FetchState.narrowSelectionToRange(~toBlock),
         ~itemsTarget=query.itemsTarget,
         ~retry,
         ~logger,
@@ -896,7 +896,7 @@ let getBlockHashes = async (sourceManager: t, ~blockNumbers: array<int>, ~isReal
     | Some(s) => s
     | None =>
       let logger = Logging.createChild(
-        ~params={"chainId": sourceManager.activeSource.chain->ChainMap.Chain.toChainId},
+        ~params={"chainId": sourceManager.activeSource.chainId},
       )
       %raw(`null`)->ErrorHandling.mkLogAndRaise(
         ~logger,
@@ -909,7 +909,7 @@ let getBlockHashes = async (sourceManager: t, ~blockNumbers: array<int>, ~isReal
 
     let logger = Logging.createChild(
       ~params={
-        "chainId": source.chain->ChainMap.Chain.toChainId,
+        "chainId": source.chainId,
         "logType": "Block Hash Query",
         "source": source.name,
         "retry": retry,

package/src/sources/SourceManager.res.mjs

@@ -3,6 +3,7 @@
 import * as Utils from "../Utils.res.mjs";
 import * as Source from "./Source.res.mjs";
 import * as Logging from "../Logging.res.mjs";
+import * as FetchState from "../FetchState.res.mjs";
 import * as Performance from "../bindings/Performance.res.mjs";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
@@ -36,7 +37,7 @@ function getActiveSource(sourceManager) {
 function getRequestStatSamples(sourceManager) {
   let samples = [];
   sourceManager.sourcesState.forEach(sourceState => {
-    let chainId = sourceState.source.chain;
+    let chainId = sourceState.source.chainId;
     Utils.Dict.forEachWithKey(sourceState.requestStats, (agg, method) => {
       samples.push({
         sourceName: sourceState.source.name,
@@ -56,7 +57,7 @@ function getSourceHeightSamples(sourceManager) {
     if (sourceState.knownHeight > 0) {
       samples.push({
         sourceName: sourceState.source.name,
-        chainId: sourceState.source.chain,
+        chainId: sourceState.source.chainId,
         height: sourceState.knownHeight
       });
       return;
@@ -350,7 +351,7 @@ async function getSourceNewHeight(sourceManager, sourceState, knownHeight, stall
         Logging.childTrace(logger, {
           msg: "onHeight subscription stale, switching to polling fallback",
           source: source.name,
-          chainId: source.chain
+          chainId: source.chainId
         });
         let h = initialHeight;
         while (h <= knownHeight && newHeight.contents <= initialHeight) {
@@ -506,7 +507,7 @@ function getNextSource(sourceManager, isRealtime, excludedSources) {
 async function waitForNewBlock(sourceManager, knownHeight, isRealtime, reducedPolling) {
   let sourcesState = sourceManager.sourcesState;
   let logger = Logging.createChild({
-    chainId: sourceManager.activeSource.chain,
+    chainId: sourceManager.activeSource.chainId,
     knownHeight: knownHeight
   });
   if (!sourceManager.waitingLogged) {
@@ -569,7 +570,7 @@ async function executeQuery(sourceManager, query, knownHeight, isRealtime) {
     if (s !== undefined) {
       if (s.source !== sourceManager.activeSource) {
         let logger = Logging.createChild({
-          chainId: sourceManager.activeSource.chain
+          chainId: sourceManager.activeSource.chainId
         });
         Logging.childInfo(logger, {
           msg: "Switching data-source",
@@ -581,7 +582,7 @@ async function executeQuery(sourceManager, query, knownHeight, isRealtime) {
       sourceState = s;
     } else {
       let logger$1 = Logging.createChild({
-        chainId: sourceManager.activeSource.chain
+        chainId: sourceManager.activeSource.chainId
       });
       sourceState = ErrorHandling.mkLogAndRaise(logger$1, "The indexer doesn't have data-sources which can continue fetching. Please, check the error logs or reach out to the Envio team.", null);
     }
@@ -590,7 +591,7 @@ async function executeQuery(sourceManager, query, knownHeight, isRealtime) {
     let toBlock = toBlockRef;
     let retry = retryRef;
     let logger$2 = Logging.createChild({
-      chainId: source.chain,
+      chainId: source.chainId,
       logType: "Block Range Query",
       partitionId: query.partitionId,
       source: source.name,
@@ -600,7 +601,7 @@ async function executeQuery(sourceManager, query, knownHeight, isRealtime) {
       retry: retry
     });
     try {
-      let response = await source.getItemsOrThrow(query.fromBlock, toBlock, query.addresses, knownHeight, query.partitionId, query.selection, query.itemsTarget, retry, logger$2);
+      let response = await source.getItemsOrThrow(query.fromBlock, toBlock, query.addresses, knownHeight, query.partitionId, FetchState.narrowSelectionToRange(query.selection, toBlock), query.itemsTarget, retry, logger$2);
       recordRequestStats(sourceState, response.requestStats);
       sourceState.lastFailedAt = undefined;
       if (response.knownHeight > sourceState.knownHeight) {
@@ -725,7 +726,7 @@ async function getBlockHashes(sourceManager, blockNumbers, isRealtime) {
       sourceState = s;
     } else {
       let logger = Logging.createChild({
-        chainId: sourceManager.activeSource.chain
+        chainId: sourceManager.activeSource.chainId
       });
       sourceState = ErrorHandling.mkLogAndRaise(logger, "No data-sources available for fetching block hashes.", null);
     }
@@ -733,7 +734,7 @@ async function getBlockHashes(sourceManager, blockNumbers, isRealtime) {
     let source = sourceState.source;
     let retry = retryRef;
     let logger$1 = Logging.createChild({
-      chainId: source.chain,
+      chainId: source.chainId,
       logType: "Block Hash Query",
       source: source.name,
       retry: retry

package/src/sources/SourceManager.resi

@@ -23,7 +23,7 @@ let getActiveSource: t => Source.t
 
 type requestStatSample = {
   sourceName: string,
-  chainId: int,
+  chainId: ChainId.t,
   method: string,
   count: int,
   seconds: float,
@@ -33,7 +33,7 @@ let getRequestStatSamples: t => array<requestStatSample>
 
 type sourceHeightSample = {
   sourceName: string,
-  chainId: int,
+  chainId: ChainId.t,
   height: int,
 }
 

package/src/sources/Svm.res

@@ -50,7 +50,7 @@ let make = (~logger: Pino.t): Ecosystem.t => {
       ~params={
         "program": eventItem.onEventRegistration.eventConfig.contractName,
         "instruction": eventItem.onEventRegistration.eventConfig.name,
-        "chainId": eventItem.chain->ChainMap.Chain.toChainId,
+        "chainId": eventItem.chainId,
         "slot": eventItem.blockNumber,
         "programId": instruction.programId,
       },
@@ -70,14 +70,13 @@ module GetFinalizedSlot = {
   )
 }
 
-let makeRPCSource = (~chain, ~rpc: string, ~sourceFor: Source.sourceFor=Sync): Source.t => {
+let makeRPCSource = (~chainId, ~rpc: string, ~sourceFor: Source.sourceFor=Sync): Source.t => {
   let client = Rest.client(rpc)
-  let chainId = chain->ChainMap.Chain.toChainId
 
   let urlHost = switch Utils.Url.getHostFromUrl(rpc) {
   | 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
   }
@@ -86,7 +85,7 @@ let makeRPCSource = (~chain, ~rpc: string, ~sourceFor: Source.sourceFor=Sync): S
   {
     name,
     sourceFor,
-    chain,
+    chainId,
     poweredByHyperSync: false,
     pollingInterval: 10_000,
     getBlockHashes: (~blockNumbers as _, ~logger as _) =>