envio 3.1.2 → 3.2.0

package/src/sources/RpcSource.res

@@ -2,6 +2,12 @@ open Source
 
 exception QueryTimout(string)
 
+// eth_getTransactionByHash/eth_getTransactionReceipt returning null is usually
+// transient: a load-balanced provider can route the lookup to a node that
+// hasn't caught up with the one that served eth_getLogs. Must stay retryable,
+// unlike other field-selection failures which disable the source.
+exception TransactionDataNotFound({message: string})
+
 // Minimal block data needed for infrastructure (reorg guard, timestamps, etc.)
 type blockInfo = {
   number: int,
@@ -14,7 +20,7 @@ let getKnownRawBlock = async (~client, ~blockNumber) =>
   switch await Rpc.getRawBlock(~client, ~blockNumber) {
   | Some(json) => json
   | None =>
-    JsError.throwWithMessage(`RPC returned null for blockNumber ${blockNumber->Belt.Int.toString}`)
+    JsError.throwWithMessage(`RPC returned null for blockNumber ${blockNumber->Int.toString}`)
   }
 
 // Extract infrastructure fields (number, timestamp, hash) from raw block JSON
@@ -56,7 +62,7 @@ let getKnownRawBlockWithBackoff = async (
     | exception err =>
       Logging.warn({
         "err": err->Utils.prettifyExn,
-        "msg": `Issue while running fetching batch of events from the RPC. Will wait ${currentBackoff.contents->Belt.Int.toString}ms and try again.`,
+        "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,
         "type": "EXPONENTIAL_BACKOFF",
@@ -241,9 +247,7 @@ let getNextPage = (
   let queryTimoutPromise =
     Time.resolvePromiseAfterDelay(~delayMilliseconds=sc.queryTimeoutMillis)->Promise.then(() =>
       Promise.reject(
-        QueryTimout(
-          `Query took longer than ${Belt.Int.toString(sc.queryTimeoutMillis / 1000)} seconds`,
-        ),
+        QueryTimout(`Query took longer than ${Int.toString(sc.queryTimeoutMillis / 1000)} seconds`),
       )
     )
 
@@ -287,7 +291,7 @@ let getNextPage = (
     | None =>
       let executedBlockInterval = toBlock - fromBlock + 1
       let nextBlockIntervalTry =
-        (executedBlockInterval->Belt.Int.toFloat *. sc.backoffMultiplicative)->Belt.Int.fromFloat
+        (executedBlockInterval->Int.toFloat *. sc.backoffMultiplicative)->Float.toInt
       mutSuggestedBlockIntervals->Dict.set(partitionId, nextBlockIntervalTry)
       throw(
         Source.GetItemsError(
@@ -320,7 +324,7 @@ let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
 
   selection.eventConfigs
   ->(Utils.magic: array<Internal.eventConfig> => array<Internal.evmEventConfig>)
-  ->Belt.Array.forEach(({getEventFiltersOrThrow}) => {
+  ->Array.forEach(({getEventFiltersOrThrow}) => {
     switch getEventFiltersOrThrow(chain) {
     | Static(s) => staticTopicSelections->Array.pushMany(s)->ignore
     | Dynamic(fn) => dynamicEventFilters->Array.push(fn)->ignore
@@ -527,6 +531,12 @@ let makeThrowingGetEventBlock = (
   }
 }
 
+// `number`, `timestamp` and `hash` are always part of the selected block
+// fields, so they can be read from the assembled block at item construction.
+@get external getBlockNumber: Internal.eventBlock => int = "number"
+@get external getBlockTimestamp: Internal.eventBlock => int = "timestamp"
+@get external getBlockHash: Internal.eventBlock => string = "hash"
+
 // Field source classification for RPC calls
 type fieldSource = TransactionOnly | ReceiptOnly | Both
 
@@ -863,7 +873,7 @@ let make = (
   let urlHost = switch Utils.Url.getHostFromUrl(url) {
   | None =>
     JsError.throwWithMessage(
-      `The RPC url for chain ${chainId->Belt.Int.toString} is in incorrect format. The RPC url needs to start with either http:// or https://`,
+      `The RPC url for chain ${chainId->Int.toString} is in incorrect format. The RPC url needs to start with either http:// or https://`,
     )
   | Some(host) => host
   }
@@ -874,6 +884,7 @@ let make = (
   let mutSuggestedBlockIntervals = Dict.make()
 
   let client = Rpc.makeClient(url)
+  let rpcClient = EvmRpcClient.make(~url)
 
   let makeTransactionLoader = () =>
     LazyLoader.make(
@@ -889,7 +900,7 @@ let make = (
         Logging.error({
           "err": exn->Utils.prettifyExn,
           "msg": `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ${(am._retryDelayMillis / 1000)
-              ->Belt.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`,
+              ->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,
           "metadata": {
@@ -917,7 +928,7 @@ let make = (
         Logging.error({
           "err": exn->Utils.prettifyExn,
           "msg": `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ${(am._retryDelayMillis / 1000)
-              ->Belt.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`,
+              ->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,
           "metadata": {
@@ -944,7 +955,7 @@ let make = (
         Logging.error({
           "err": exn->Utils.prettifyExn,
           "msg": `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ${(am._retryDelayMillis / 1000)
-              ->Belt.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`,
+              ->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,
           "metadata": {
@@ -969,14 +980,21 @@ let make = (
     ~getTransactionJson=async transactionHash => {
       switch await transactionLoader.contents->LazyLoader.get(transactionHash) {
       | Some(json) => json
-      | None => JsError.throwWithMessage(`Transaction not found for hash: ${transactionHash}`)
+      | None =>
+        throw(
+          TransactionDataNotFound({message: `Transaction not found for hash: ${transactionHash}`}),
+        )
       }
     },
     ~getReceiptJson=async transactionHash => {
       switch await receiptLoader.contents->LazyLoader.get(transactionHash) {
       | Some(json) => json
       | None =>
-        JsError.throwWithMessage(`Transaction receipt not found for hash: ${transactionHash}`)
+        throw(
+          TransactionDataNotFound({
+            message: `Transaction receipt not found for hash: ${transactionHash}`,
+          }),
+        )
       }
     },
     ~lowercaseAddresses,
@@ -1020,7 +1038,7 @@ let make = (
     ~knownHeight,
     ~partitionId,
     ~selection: FetchState.selection,
-    ~retry as _,
+    ~retry,
     ~logger as _,
   ) => {
     let startFetchingBatchTimeRef = Hrtime.makeTimer()
@@ -1032,7 +1050,7 @@ let make = (
     | None =>
       mutSuggestedBlockIntervals
       ->Utils.Dict.dangerouslyGetNonOption(partitionId)
-      ->Belt.Option.getWithDefault(syncConfig.initialBlockInterval)
+      ->Option.getOr(syncConfig.initialBlockInterval)
     }
 
     // Always have a toBlock for an RPC worker
@@ -1093,7 +1111,7 @@ let make = (
     }
 
     // Convert RPC logs to HyperSync events
-    let hyperSyncEvents = logs->Belt.Array.map(convertLogToHyperSyncEvent)
+    let hyperSyncEvents = logs->Array.map(convertLogToHyperSyncEvent)
 
     // Decode using HyperSyncClient decoder
     let parsedEvents = try await getHscDecoder().decodeLogs(hyperSyncEvents) catch {
@@ -1145,6 +1163,23 @@ let make = (
                     ~selectedTransactionFields=eventConfig.selectedTransactionFields,
                   ),
                 )) catch {
+                | TransactionDataNotFound({message}) =>
+                  let backoffMillis = switch retry {
+                  | 0 => 100
+                  | _ => 500 * retry
+                  }
+                  throw(
+                    Source.GetItemsError(
+                      FailedGettingItems({
+                        exn: %raw(`null`),
+                        attemptedToBlock: toBlock,
+                        retry: WithBackoff({
+                          message: `${message}. The RPC provider might be load-balanced between nodes that drift independently slightly from the head. Indexing should continue correctly after retrying the query in ${backoffMillis->Int.toString}ms.`,
+                          backoffMillis,
+                        }),
+                      }),
+                    ),
+                  )
                 | exn =>
                   throw(
                     Source.GetItemsError(
@@ -1160,8 +1195,9 @@ let make = (
 
                 Internal.Event({
                   eventConfig: (eventConfig :> Internal.eventConfig),
-                  timestamp: block->Evm.getTimestamp,
-                  blockNumber: block->Evm.getNumber,
+                  timestamp: block->getBlockTimestamp,
+                  blockNumber: block->getBlockNumber,
+                  blockHash: block->getBlockHash,
                   chain,
                   logIndex: log.logIndex,
                   event: {
@@ -1204,7 +1240,7 @@ let make = (
     | Some(b) => pushBlockInfo(b)
     | None => ()
     }
-    logs->Belt.Array.forEach(log =>
+    logs->Array.forEach(log =>
       blockHashes
       ->Array.push({ReorgDetection.blockNumber: log.blockNumber, blockHash: log.blockHash})
       ->ignore
@@ -1254,7 +1290,7 @@ let make = (
   }
 
   let createHeightSubscription =
-    ws->Belt.Option.map(wsUrl =>
+    ws->Option.map(wsUrl =>
       (~onHeight) => RpcWebSocketHeightStream.subscribe(~wsUrl, ~chainId, ~onHeight)
     )
 
@@ -1269,7 +1305,7 @@ let make = (
     getHeightOrThrow: async () => {
       let timerRef = Hrtime.makeTimer()
       let height = try {
-        await Rpc.GetBlockHeight.route->Rest.fetch((), ~client)
+        await rpcClient.getHeight()
       } catch {
       | exn =>
         let seconds = timerRef->Hrtime.timeSince->Hrtime.toSecondsFloat

package/src/sources/RpcSource.res.mjs

@@ -9,13 +9,12 @@ import * as Source from "./Source.res.mjs";
 import * as Address from "../Address.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as Internal from "../Internal.res.mjs";
-import * as Belt_Array from "@rescript/runtime/lib/es6/Belt_Array.js";
 import * as FetchState from "../FetchState.res.mjs";
 import * as LazyLoader from "../LazyLoader.res.mjs";
 import * as Prometheus from "../Prometheus.res.mjs";
 import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
-import * as Belt_Option from "@rescript/runtime/lib/es6/Belt_Option.js";
 import * as EventRouter from "./EventRouter.res.mjs";
+import * as EvmRpcClient from "./EvmRpcClient.res.mjs";
 import * as LogSelection from "../LogSelection.res.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
@@ -30,12 +29,14 @@ import * as RpcWebSocketHeightStream from "./RpcWebSocketHeightStream.res.mjs";
 
 let QueryTimout = /* @__PURE__ */Primitive_exceptions.create("RpcSource.QueryTimout");
 
+let TransactionDataNotFound = /* @__PURE__ */Primitive_exceptions.create("RpcSource.TransactionDataNotFound");
+
 async function getKnownRawBlock(client, blockNumber) {
   let json = await Rpc.getRawBlock(client, blockNumber);
   if (json !== undefined) {
     return json;
   } else {
-    return Stdlib_JsError.throwWithMessage(`RPC returned null for blockNumber ` + String(blockNumber));
+    return Stdlib_JsError.throwWithMessage(`RPC returned null for blockNumber ` + blockNumber.toString());
   }
 }
 
@@ -62,7 +63,7 @@ async function getKnownRawBlockWithBackoff(client, sourceName, chain, blockNumbe
       let err = Primitive_exceptions.internalToException(raw_err);
       Logging.warn({
         err: Utils.prettifyExn(err),
-        msg: `Issue while running fetching batch of events from the RPC. Will wait ` + String(currentBackoff) + `ms and try again.`,
+        msg: `Issue while running fetching batch of events from the RPC. Will wait ` + currentBackoff.toString() + `ms and try again.`,
         source: sourceName,
         chainId: chain,
         type: "EXPONENTIAL_BACKOFF"
@@ -223,7 +224,7 @@ let maxSuggestedBlockIntervalKey = "max";
 function getNextPage(fromBlock, toBlock, addresses, topicQuery, loadBlock, sc, client, mutSuggestedBlockIntervals, partitionId, sourceName, chainId) {
   let queryTimoutPromise = Time.resolvePromiseAfterDelay(sc.queryTimeoutMillis).then(() => Promise.reject({
     RE_EXN_ID: QueryTimout,
-    _1: `Query took longer than ` + String(sc.queryTimeoutMillis / 1000 | 0) + ` seconds`
+    _1: `Query took longer than ` + (sc.queryTimeoutMillis / 1000 | 0).toString() + ` seconds`
   }));
   let latestFetchedBlockPromise = loadBlock(toBlock);
   Prometheus.SourceRequestCount.increment(sourceName, chainId, "eth_getLogs");
@@ -281,7 +282,7 @@ function getNextPage(fromBlock, toBlock, addresses, topicQuery, loadBlock, sc, c
 function getSelectionConfig(selection, chain) {
   let staticTopicSelections = [];
   let dynamicEventFilters = [];
-  Belt_Array.forEach(selection.eventConfigs, param => {
+  selection.eventConfigs.forEach(param => {
     let s = param.getEventFiltersOrThrow(chain);
     if (s.TAG === "Static") {
       staticTopicSelections.push(...s._0);
@@ -924,17 +925,18 @@ function make(param) {
   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 ` + String(chain) + ` 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 ` + chain.toString() + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
   let name = `RPC (` + urlHost + `)`;
   let getSelectionConfig = memoGetSelectionConfig(chain);
   let mutSuggestedBlockIntervals = {};
   let client = Rpc.makeClient(url);
+  let rpcClient = EvmRpcClient.make(url, undefined);
   let makeTransactionLoader = () => LazyLoader.make(transactionHash => {
     Prometheus.SourceRequestCount.increment(name, chain, "eth_getTransactionByHash");
     return Rest.fetch(Rpc.GetTransactionByHash.rawRoute, transactionHash, client);
   }, (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 ` + String(am._retryDelayMillis / 1000 | 0) + ` 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`,
+    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,
     metadata: {
@@ -944,7 +946,7 @@ function make(param) {
   }), undefined, undefined, undefined, undefined);
   let makeBlockLoader = () => LazyLoader.make(blockNumber => getKnownRawBlockWithBackoff(client, name, chain, blockNumber, 1000), (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 ` + String(am._retryDelayMillis / 1000 | 0) + ` 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`,
+    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,
     metadata: {
@@ -957,7 +959,7 @@ function make(param) {
     return Rest.fetch(Rpc.GetTransactionReceipt.rawRoute, transactionHash, client);
   }, (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 ` + String(am._retryDelayMillis / 1000 | 0) + ` 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`,
+    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,
     metadata: {
@@ -979,16 +981,22 @@ function make(param) {
     let json = await LazyLoader.get(transactionLoader.contents, transactionHash);
     if (json !== undefined) {
       return json;
-    } else {
-      return Stdlib_JsError.throwWithMessage(`Transaction not found for hash: ` + transactionHash);
     }
+    throw {
+      RE_EXN_ID: TransactionDataNotFound,
+      message: `Transaction not found for hash: ` + transactionHash,
+      Error: new Error()
+    };
   }, async transactionHash => {
     let json = await LazyLoader.get(receiptLoader.contents, transactionHash);
     if (json !== undefined) {
       return json;
-    } else {
-      return Stdlib_JsError.throwWithMessage(`Transaction receipt not found for hash: ` + transactionHash);
     }
+    throw {
+      RE_EXN_ID: TransactionDataNotFound,
+      message: `Transaction receipt not found for hash: ` + transactionHash,
+      Error: new Error()
+    };
   }, lowercaseAddresses);
   let convertLogToHyperSyncEvent = log => {
     let hyperSyncLog_removed = log.removed;
@@ -1027,10 +1035,10 @@ function make(param) {
     hscDecoder.contents = decoder$1;
     return decoder$1;
   };
-  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, indexingAddresses, knownHeight, partitionId, selection, param, param$1) => {
+  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, indexingAddresses, knownHeight, partitionId, selection, retry, param) => {
     let startFetchingBatchTimeRef = Hrtime.makeTimer();
     let maxSuggestedBlockInterval = mutSuggestedBlockIntervals[maxSuggestedBlockIntervalKey];
-    let suggestedBlockInterval = maxSuggestedBlockInterval !== undefined ? maxSuggestedBlockInterval : Belt_Option.getWithDefault(mutSuggestedBlockIntervals[partitionId], syncConfig.initialBlockInterval);
+    let suggestedBlockInterval = maxSuggestedBlockInterval !== undefined ? maxSuggestedBlockInterval : Stdlib_Option.getOr(mutSuggestedBlockIntervals[partitionId], syncConfig.initialBlockInterval);
     let toBlock$1 = toBlock !== undefined ? Primitive_int.min(toBlock, knownHeight) : knownHeight;
     let suggestedToBlock = Primitive_int.max(Primitive_int.min((fromBlock + suggestedBlockInterval | 0) - 1 | 0, toBlock$1), fromBlock);
     let firstBlockParentPromise = fromBlock > 0 ? LazyLoader.get(blockLoader.contents, fromBlock - 1 | 0).then(json => parseBlockInfo(json)) : Promise.resolve(undefined);
@@ -1043,7 +1051,7 @@ function make(param) {
     if (executedBlockInterval >= suggestedBlockInterval && !(maxSuggestedBlockIntervalKey in mutSuggestedBlockIntervals)) {
       mutSuggestedBlockIntervals[partitionId] = Primitive_int.min(executedBlockInterval + syncConfig.accelerationAdditive | 0, syncConfig.intervalCeiling);
     }
-    let hyperSyncEvents = Belt_Array.map(logs, convertLogToHyperSyncEvent);
+    let hyperSyncEvents = logs.map(convertLogToHyperSyncEvent);
     let parsedEvents;
     try {
       parsedEvents = await getHscDecoder().decodeLogs(hyperSyncEvents);
@@ -1085,6 +1093,23 @@ function make(param) {
           ]);
         } catch (raw_exn) {
           let exn = Primitive_exceptions.internalToException(raw_exn);
+          if (exn.RE_EXN_ID === TransactionDataNotFound) {
+            let backoffMillis = retry !== 0 ? 500 * retry | 0 : 100;
+            throw {
+              RE_EXN_ID: Source.GetItemsError,
+              _1: {
+                TAG: "FailedGettingItems",
+                exn: null,
+                attemptedToBlock: toBlock$1,
+                retry: {
+                  TAG: "WithBackoff",
+                  message: exn.message + `. The RPC provider might be load-balanced between nodes that drift independently slightly from the head. Indexing should continue correctly after retrying the query in ` + backoffMillis.toString() + `ms.`,
+                  backoffMillis: backoffMillis
+                }
+              },
+              Error: new Error()
+            };
+          }
           throw {
             RE_EXN_ID: Source.GetItemsError,
             _1: {
@@ -1104,6 +1129,7 @@ function make(param) {
           timestamp: block.timestamp,
           chain: chain,
           blockNumber: block.number,
+          blockHash: block.hash,
           logIndex: log.logIndex,
           event: {
             contractName: eventConfig.contractName,
@@ -1138,7 +1164,7 @@ function make(param) {
     if (optFirstBlockParent !== undefined) {
       pushBlockInfo(optFirstBlockParent);
     }
-    Belt_Array.forEach(logs, log => {
+    logs.forEach(log => {
       blockHashes.push({
         blockHash: log.blockHash,
         blockNumber: log.blockNumber
@@ -1175,7 +1201,7 @@ function make(param) {
     TAG: "Error",
     _0: exn
   }));
-  let createHeightSubscription = Belt_Option.map(param.ws, wsUrl => (onHeight => RpcWebSocketHeightStream.subscribe(wsUrl, chain, onHeight)));
+  let createHeightSubscription = Stdlib_Option.map(param.ws, wsUrl => (onHeight => RpcWebSocketHeightStream.subscribe(wsUrl, chain, onHeight)));
   return {
     name: name,
     sourceFor: param.sourceFor,
@@ -1187,7 +1213,7 @@ function make(param) {
       let timerRef = Hrtime.makeTimer();
       let height;
       try {
-        height = await Rest.fetch(Rpc.GetBlockHeight.route, undefined, client);
+        height = await rpcClient.getHeight();
       } catch (exn) {
         let seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
         Prometheus.SourceRequestCount.increment(name, chain, "eth_blockNumber");
@@ -1207,6 +1233,7 @@ function make(param) {
 
 export {
   QueryTimout,
+  TransactionDataNotFound,
   getKnownRawBlock,
   parseBlockInfo,
   getKnownRawBlockWithBackoff,

package/src/sources/RpcWebSocketHeightStream.res

@@ -82,7 +82,7 @@ let subscribe = (~wsUrl, ~chainId, ~onHeight: int => unit): (unit => unit) => {
   let rec scheduleReconnect = () => {
     if !isUnsubscribed.contents && errorCount.contents < retryCount {
       let duration =
-        baseDuration * Math.pow(2.0, ~exp=errorCount.contents->Belt.Int.toFloat)->Belt.Float.toInt
+        baseDuration * Math.pow(2.0, ~exp=errorCount.contents->Int.toFloat)->Float.toInt
       let _ = setTimeout(() => {
         if !isUnsubscribed.contents {
           startConnection()

package/src/sources/SourceManager.res

@@ -338,7 +338,7 @@ let getSourceNewHeight = async (
       // that go quiet together don't all start polling at the same instant.
       let half = stallTimeout / 2
       let pollingFallback = Utils.delay(
-        half + (Math.random() *. half->Belt.Int.toFloat)->Belt.Float.toInt,
+        half + (Math.random() *. half->Int.toFloat)->Float.toInt,
       )->Promise.then(async () => {
         logger->Logging.childTrace({
           "msg": "onHeight subscription stale, switching to polling fallback",
@@ -546,10 +546,11 @@ let waitForNewBlock = async (sourceManager: t, ~knownHeight, ~isRealtime, ~reduc
     })
     ->Array.concat([
       Utils.delay(stallTimeout)->Promise.then(() => {
-        // Build fallback: sources not in mainSources with a valid role, even with recent lastFailedAt
+        // Build fallback: non-disabled sources not in mainSources with a valid role, even with recent lastFailedAt
         let fallbackSources = []
         sourcesState->Array.forEach(sourceState => {
           if (
+            !sourceState.disabled &&
             !(mainSources->Array.includes(sourceState)) &&
             getSourceRole(
               ~sourceFor=sourceState.source.sourceFor,

package/src/sources/SourceManager.res.mjs

@@ -429,7 +429,7 @@ async function waitForNewBlock(sourceManager, knownHeight, isRealtime, reducedPo
   ]).concat([Utils.delay(stallTimeout).then(() => {
       let fallbackSources = [];
       sourcesState.forEach(sourceState => {
-        if (!mainSources.includes(sourceState) && Stdlib_Option.isSome(getSourceRole(sourceState.source.sourceFor, isRealtime, sourceManager.hasRealtime))) {
+        if (!sourceState.disabled && !mainSources.includes(sourceState) && Stdlib_Option.isSome(getSourceRole(sourceState.source.sourceFor, isRealtime, sourceManager.hasRealtime))) {
           fallbackSources.push(sourceState);
           return;
         }

package/src/sources/Svm.res

@@ -1,7 +1,3 @@
-@get external getNumber: Internal.eventBlock => int = "height"
-@get external getTimestamp: Internal.eventBlock => int = "time"
-@get external getId: Internal.eventBlock => string = "hash"
-
 let cleanUpRawEventFieldsInPlace: JSON.t => unit = %raw(`fields => {
     delete fields.hash
     delete fields.height
@@ -15,9 +11,6 @@ let ecosystem: Ecosystem.t = {
   blockNumberName: "height",
   blockTimestampName: "time",
   blockHashName: "hash",
-  getNumber,
-  getTimestamp,
-  getId,
   cleanUpRawEventFieldsInPlace,
   onBlockMethodName: "onSlot",
   // SVM filter shape: `{slot: {_gte?, _lte?, _every?}}`.
@@ -39,14 +32,14 @@ module GetFinalizedSlot = {
   )
 }
 
-let makeRPCSource = (~chain, ~rpc: string): Source.t => {
+let makeRPCSource = (~chain, ~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->Belt.Int.toString} is in incorrect format. The RPC url needs to start with either http:// or https://`,
+      `The RPC url for chain ${chainId->Int.toString} is in incorrect format. The RPC url needs to start with either http:// or https://`,
     )
   | Some(host) => host
   }
@@ -54,7 +47,7 @@ let makeRPCSource = (~chain, ~rpc: string): Source.t => {
 
   {
     name,
-    sourceFor: Sync,
+    sourceFor,
     chain,
     poweredByHyperSync: false,
     pollingInterval: 10_000,

package/src/sources/Svm.res.mjs

@@ -18,18 +18,6 @@ let ecosystem_blockFields = ["slot"];
 
 let ecosystem_transactionFields = [];
 
-function ecosystem_getNumber(prim) {
-  return prim.height;
-}
-
-function ecosystem_getTimestamp(prim) {
-  return prim.time;
-}
-
-function ecosystem_getId(prim) {
-  return prim.hash;
-}
-
 let ecosystem_onBlockFilterSchema = S$RescriptSchema.object(s => s.f("slot", S$RescriptSchema.option(S$RescriptSchema.unknown)));
 
 let ecosystem_onEventBlockFilterSchema = S$RescriptSchema.object(param => {});
@@ -41,9 +29,6 @@ let ecosystem = {
   blockNumberName: "height",
   blockTimestampName: "time",
   blockHashName: "hash",
-  getNumber: ecosystem_getNumber,
-  getTimestamp: ecosystem_getTimestamp,
-  getId: ecosystem_getId,
   cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace,
   onBlockMethodName: "onSlot",
   onBlockFilterSchema: ecosystem_onBlockFilterSchema,
@@ -60,14 +45,15 @@ let GetFinalizedSlot = {
   route: route
 };
 
-function makeRPCSource(chain, rpc) {
+function makeRPCSource(chain, rpc, sourceForOpt) {
+  let sourceFor = sourceForOpt !== undefined ? sourceForOpt : "Sync";
   let client = Rest.client(rpc, undefined);
   let host = Utils.Url.getHostFromUrl(rpc);
-  let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + String(chain) + ` 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 ` + chain.toString() + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
   let name = `RPC (` + urlHost + `)`;
   return {
     name: name,
-    sourceFor: "Sync",
+    sourceFor: sourceFor,
     chain: chain,
     poweredByHyperSync: false,
     pollingInterval: 10000,