envio 2.31.1-rc.0 → 2.31.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v2.31.1-rc.0",
+  "version": "v2.31.1",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.js",
   "main": "./index.js",
@@ -25,10 +25,10 @@
   },
   "homepage": "https://envio.dev",
   "optionalDependencies": {
-    "envio-linux-x64": "v2.31.1-rc.0",
-    "envio-linux-arm64": "v2.31.1-rc.0",
-    "envio-darwin-x64": "v2.31.1-rc.0",
-    "envio-darwin-arm64": "v2.31.1-rc.0"
+    "envio-linux-x64": "v2.31.1",
+    "envio-linux-arm64": "v2.31.1",
+    "envio-darwin-x64": "v2.31.1",
+    "envio-darwin-arm64": "v2.31.1"
   },
   "dependencies": {
     "@envio-dev/hypersync-client": "0.6.6",

package/src/ReorgDetection.res

@@ -51,18 +51,12 @@ type t = {
   // A hash map of recent blockdata by block number to make comparison checks
   // for reorgs.
   dataByBlockNumber: dict<blockData>,
-  // The latest block which detected a reorg
-  // and should never be valid.
-  // We keep track of this to avoid responses
-  // with the stale data from other data-source instances.
-  detectedReorgBlock: option<blockData>,
 }
 
 let make = (
   ~chainReorgCheckpoints: array<Internal.reorgCheckpoint>,
   ~maxReorgDepth,
   ~shouldRollbackOnReorg,
-  ~detectedReorgBlock=?,
 ) => {
   let dataByBlockNumber = Js.Dict.empty()
 
@@ -80,7 +74,6 @@ let make = (
     shouldRollbackOnReorg,
     maxReorgDepth,
     dataByBlockNumber,
-    detectedReorgBlock,
   }
 }
 
@@ -149,10 +142,7 @@ let registerReorgGuard = (
   switch maybeReorgDetected {
   | Some(reorgDetected) => (
       shouldRollbackOnReorg
-        ? {
-            ...self,
-            detectedReorgBlock: Some(reorgDetected.scannedBlock),
-          }
+        ? self
         : make(~chainReorgCheckpoints=[], ~maxReorgDepth, ~shouldRollbackOnReorg),
       ReorgDetected(reorgDetected),
     )
@@ -174,7 +164,6 @@ let registerReorgGuard = (
         {
           maxReorgDepth,
           dataByBlockNumber: dataByBlockNumberCopyInThreshold,
-          detectedReorgBlock: None,
           shouldRollbackOnReorg,
         },
         NoReorg,
@@ -188,43 +177,33 @@ Returns the latest block number which matches block number and hashes in the pro
 If it doesn't exist in the reorg threshold it returns NotFound
 */
 let getLatestValidScannedBlock = (
-  self: t,
+  reorgDetection: t,
   ~blockNumbersAndHashes: array<blockDataWithTimestamp>,
-  ~currentBlockHeight,
 ) => {
   let verifiedDataByBlockNumber = Js.Dict.empty()
   for idx in 0 to blockNumbersAndHashes->Array.length - 1 {
     let blockData = blockNumbersAndHashes->Array.getUnsafe(idx)
     verifiedDataByBlockNumber->Js.Dict.set(blockData.blockNumber->Int.toString, blockData)
   }
-
-  let dataByBlockNumber = self->getDataByBlockNumberCopyInThreshold(~currentBlockHeight)
   // Js engine automatically orders numeric object keys
-  let ascBlockNumberKeys = dataByBlockNumber->Js.Dict.keys
+  let ascBlockNumberKeys = verifiedDataByBlockNumber->Js.Dict.keys
 
   let getPrevScannedBlockNumber = idx =>
     ascBlockNumberKeys
     ->Belt.Array.get(idx - 1)
-    ->Option.flatMap(key => {
-      // We should already validate that the block number is verified at the point
-      switch verifiedDataByBlockNumber->Utils.Dict.dangerouslyGetNonOption(key) {
-      | Some(v) => Some(v.blockNumber)
-      | None => None
-      }
+    ->Option.map(key => {
+      (verifiedDataByBlockNumber->Js.Dict.unsafeGet(key)).blockNumber
     })
 
   let rec loop = idx => {
     switch ascBlockNumberKeys->Belt.Array.get(idx) {
     | Some(blockNumberKey) =>
-      let scannedBlock = dataByBlockNumber->Js.Dict.unsafeGet(blockNumberKey)
-      switch verifiedDataByBlockNumber->Utils.Dict.dangerouslyGetNonOption(blockNumberKey) {
-      | None =>
-        Js.Exn.raiseError(
-          `Unexpected case. Couldn't find verified hash for block number ${blockNumberKey}`,
-        )
-      | Some(verifiedBlockData) if verifiedBlockData.blockHash === scannedBlock.blockHash =>
+      switch reorgDetection.dataByBlockNumber->Utils.Dict.dangerouslyGetNonOption(blockNumberKey) {
+      | Some(scannedBlock)
+        if (verifiedDataByBlockNumber->Js.Dict.unsafeGet(blockNumberKey)).blockHash ===
+          scannedBlock.blockHash =>
         loop(idx + 1)
-      | Some(_) => getPrevScannedBlockNumber(idx)
+      | _ => getPrevScannedBlockNumber(idx)
       }
     | None => getPrevScannedBlockNumber(idx)
     }
@@ -265,7 +244,6 @@ let rollbackToValidBlockNumber = (
   {
     maxReorgDepth,
     dataByBlockNumber: newDataByBlockNumber,
-    detectedReorgBlock: None,
     shouldRollbackOnReorg,
   }
 }

package/src/ReorgDetection.res.js

@@ -1,7 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var Js_exn = require("rescript/lib/js/js_exn.js");
 var Belt_Array = require("rescript/lib/js/belt_Array.js");
 var Belt_Option = require("rescript/lib/js/belt_Option.js");
 
@@ -17,7 +16,7 @@ function reorgDetectedToLogParams(reorgDetected, shouldRollbackOnReorg) {
         };
 }
 
-function make(chainReorgCheckpoints, maxReorgDepth, shouldRollbackOnReorg, detectedReorgBlock) {
+function make(chainReorgCheckpoints, maxReorgDepth, shouldRollbackOnReorg) {
   var dataByBlockNumber = {};
   Belt_Array.forEach(chainReorgCheckpoints, (function (block) {
           dataByBlockNumber[block.block_number] = {
@@ -28,8 +27,7 @@ function make(chainReorgCheckpoints, maxReorgDepth, shouldRollbackOnReorg, detec
   return {
           shouldRollbackOnReorg: shouldRollbackOnReorg,
           maxReorgDepth: maxReorgDepth,
-          dataByBlockNumber: dataByBlockNumber,
-          detectedReorgBlock: detectedReorgBlock
+          dataByBlockNumber: dataByBlockNumber
         };
 }
 
@@ -80,12 +78,7 @@ function registerReorgGuard(self, reorgGuard, currentBlockHeight) {
   }
   if (maybeReorgDetected !== undefined) {
     return [
-            shouldRollbackOnReorg ? ({
-                  shouldRollbackOnReorg: self.shouldRollbackOnReorg,
-                  maxReorgDepth: self.maxReorgDepth,
-                  dataByBlockNumber: self.dataByBlockNumber,
-                  detectedReorgBlock: maybeReorgDetected.scannedBlock
-                }) : make([], maxReorgDepth, shouldRollbackOnReorg, undefined),
+            shouldRollbackOnReorg ? self : make([], maxReorgDepth, shouldRollbackOnReorg),
             {
               TAG: "ReorgDetected",
               _0: maybeReorgDetected
@@ -100,29 +93,23 @@ function registerReorgGuard(self, reorgGuard, currentBlockHeight) {
             {
               shouldRollbackOnReorg: shouldRollbackOnReorg,
               maxReorgDepth: maxReorgDepth,
-              dataByBlockNumber: dataByBlockNumberCopyInThreshold,
-              detectedReorgBlock: undefined
+              dataByBlockNumber: dataByBlockNumberCopyInThreshold
             },
             "NoReorg"
           ];
   }
 }
 
-function getLatestValidScannedBlock(self, blockNumbersAndHashes, currentBlockHeight) {
+function getLatestValidScannedBlock(reorgDetection, blockNumbersAndHashes) {
   var verifiedDataByBlockNumber = {};
   for(var idx = 0 ,idx_finish = blockNumbersAndHashes.length; idx < idx_finish; ++idx){
     var blockData = blockNumbersAndHashes[idx];
     verifiedDataByBlockNumber[String(blockData.blockNumber)] = blockData;
   }
-  var dataByBlockNumber = getDataByBlockNumberCopyInThreshold(self, currentBlockHeight);
-  var ascBlockNumberKeys = Object.keys(dataByBlockNumber);
+  var ascBlockNumberKeys = Object.keys(verifiedDataByBlockNumber);
   var getPrevScannedBlockNumber = function (idx) {
-    return Belt_Option.flatMap(Belt_Array.get(ascBlockNumberKeys, idx - 1 | 0), (function (key) {
-                  var v = verifiedDataByBlockNumber[key];
-                  if (v !== undefined) {
-                    return v.blockNumber;
-                  }
-                  
+    return Belt_Option.map(Belt_Array.get(ascBlockNumberKeys, idx - 1 | 0), (function (key) {
+                  return verifiedDataByBlockNumber[key].blockNumber;
                 }));
   };
   var _idx = 0;
@@ -132,12 +119,11 @@ function getLatestValidScannedBlock(self, blockNumbersAndHashes, currentBlockHei
     if (blockNumberKey === undefined) {
       return getPrevScannedBlockNumber(idx$1);
     }
-    var scannedBlock = dataByBlockNumber[blockNumberKey];
-    var verifiedBlockData = verifiedDataByBlockNumber[blockNumberKey];
-    if (verifiedBlockData === undefined) {
-      return Js_exn.raiseError("Unexpected case. Couldn't find verified hash for block number " + blockNumberKey);
+    var scannedBlock = reorgDetection.dataByBlockNumber[blockNumberKey];
+    if (scannedBlock === undefined) {
+      return getPrevScannedBlockNumber(idx$1);
     }
-    if (verifiedBlockData.blockHash !== scannedBlock.blockHash) {
+    if (verifiedDataByBlockNumber[blockNumberKey].blockHash !== scannedBlock.blockHash) {
       return getPrevScannedBlockNumber(idx$1);
     }
     _idx = idx$1 + 1 | 0;
@@ -170,8 +156,7 @@ function rollbackToValidBlockNumber(param, blockNumber) {
   return {
           shouldRollbackOnReorg: param.shouldRollbackOnReorg,
           maxReorgDepth: param.maxReorgDepth,
-          dataByBlockNumber: newDataByBlockNumber,
-          detectedReorgBlock: undefined
+          dataByBlockNumber: newDataByBlockNumber
         };
 }
 

package/src/sources/HyperFuelSource.res

@@ -258,14 +258,10 @@ let make = ({chain, endpointUrl}: options): t => {
                 backoffMillis,
               })
             | UnexpectedMissingParams({missingParams}) =>
-              WithBackoff({
-                message: `Received page response with invalid data. Attempt a retry. Missing params: ${missingParams->Js.Array2.joinWith(
-                    ",",
+              ImpossibleForTheQuery({
+                message: `Source returned invalid data with missing required fields: ${missingParams->Js.Array2.joinWith(
+                    ", ",
                   )}`,
-                backoffMillis: switch retry {
-                | 0 => 1000
-                | _ => 4000 * retry
-                },
               })
             },
           }),

package/src/sources/HyperFuelSource.res.js

@@ -213,9 +213,8 @@ function make(param) {
           };
         } else {
           tmp = {
-            TAG: "WithBackoff",
-            message: "Received page response with invalid data. Attempt a retry. Missing params: " + error$1.missingParams.join(","),
-            backoffMillis: retry !== 0 ? Math.imul(4000, retry) : 1000
+            TAG: "ImpossibleForTheQuery",
+            message: "Source returned invalid data with missing required fields: " + error$1.missingParams.join(", ")
           };
         }
         throw {

package/src/sources/HyperSyncSource.res

@@ -288,14 +288,10 @@ let make = (
                 backoffMillis,
               })
             | UnexpectedMissingParams({missingParams}) =>
-              WithBackoff({
-                message: `Received page response with invalid data. Attempt a retry. Missing params: ${missingParams->Js.Array2.joinWith(
-                    ",",
+              ImpossibleForTheQuery({
+                message: `Source returned invalid data with missing required fields: ${missingParams->Js.Array2.joinWith(
+                    ", ",
                   )}`,
-                backoffMillis: switch retry {
-                | 0 => 1000
-                | _ => 4000 * retry
-                },
               })
             },
           }),

package/src/sources/HyperSyncSource.res.js

@@ -214,9 +214,8 @@ function make(param) {
           };
         } else {
           tmp = {
-            TAG: "WithBackoff",
-            message: "Received page response with invalid data. Attempt a retry. Missing params: " + error$1.missingParams.join(","),
-            backoffMillis: retry !== 0 ? Math.imul(4000, retry) : 1000
+            TAG: "ImpossibleForTheQuery",
+            message: "Source returned invalid data with missing required fields: " + error$1.missingParams.join(", ")
           };
         }
         throw {

package/src/sources/RpcSource.res

@@ -503,24 +503,26 @@ let make = (
 
   let mutSuggestedBlockIntervals = Js.Dict.empty()
 
-  let transactionLoader = LazyLoader.make(
-    ~loaderFn=transactionHash => provider->Ethers.JsonRpcProvider.getTransaction(~transactionHash),
-    ~onError=(am, ~exn) => {
-      Logging.error({
-        "err": exn->Utils.prettifyExn,
-        "msg": `EE1100: 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`,
-        "source": name,
-        "chainId": chain->ChainMap.Chain.toChainId,
-        "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.",
-          }
-        },
-      })
-    },
-  )
+  let makeTransactionLoader = () =>
+    LazyLoader.make(
+      ~loaderFn=transactionHash =>
+        provider->Ethers.JsonRpcProvider.getTransaction(~transactionHash),
+      ~onError=(am, ~exn) => {
+        Logging.error({
+          "err": exn->Utils.prettifyExn,
+          "msg": `EE1100: 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`,
+          "source": name,
+          "chainId": chain->ChainMap.Chain.toChainId,
+          "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.",
+            }
+          },
+        })
+      },
+    )
 
   let makeBlockLoader = () =>
     LazyLoader.make(
@@ -551,13 +553,14 @@ let make = (
     )
 
   let blockLoader = ref(makeBlockLoader())
+  let transactionLoader = ref(makeTransactionLoader())
 
   let getEventBlockOrThrow = makeThrowingGetEventBlock(~getBlock=blockNumber =>
     blockLoader.contents->LazyLoader.get(blockNumber)
   )
   let getEventTransactionOrThrow = makeThrowingGetEventTransaction(
     ~getTransactionFields=Ethers.JsonRpcProvider.makeGetTransactionFields(
-      ~getTransactionByHash=LazyLoader.get(transactionLoader, _),
+      ~getTransactionByHash=LazyLoader.get(transactionLoader.contents, _),
       ~lowercaseAddresses,
     ),
   )
@@ -675,11 +678,12 @@ let make = (
       | exn =>
         raise(
           Source.GetItemsError(
-            FailedParsingItems({
-              message: "Failed to parse events using hypersync client decoder. Please double-check your ABI.",
+            FailedGettingItems({
               exn,
-              blockNumber: fromBlock,
-              logIndex: 0,
+              attemptedToBlock: toBlock,
+              retry: ImpossibleForTheQuery({
+                message: "Failed to parse events using hypersync client decoder. Please double-check your ABI.",
+              }),
             }),
           ),
         )
@@ -809,11 +813,12 @@ let make = (
                 | exn =>
                   raise(
                     Source.GetItemsError(
-                      FailedParsingItems({
-                        message: "Failed to parse event with viem, please double-check your ABI.",
+                      FailedGettingItems({
                         exn,
-                        blockNumber,
-                        logIndex,
+                        attemptedToBlock: toBlock,
+                        retry: ImpossibleForTheQuery({
+                          message: `Failed to parse event with viem, please double-check your ABI. Block number: ${blockNumber->Int.toString}, log index: ${logIndex->Int.toString}`,
+                        }),
                       }),
                     ),
                   )
@@ -880,6 +885,7 @@ let make = (
     // This is important, since we call this
     // function when a reorg is detected
     blockLoader := makeBlockLoader()
+    transactionLoader := makeTransactionLoader()
 
     blockNumbers
     ->Array.map(blockNum => blockLoader.contents->LazyLoader.get(blockNum))

package/src/sources/RpcSource.res.js

@@ -519,20 +519,22 @@ function make(param) {
   var provider = Ethers.JsonRpcProvider.make(url, chain);
   var getSelectionConfig = memoGetSelectionConfig(chain);
   var mutSuggestedBlockIntervals = {};
-  var transactionLoader = LazyLoader.make((function (transactionHash) {
-          return provider.getTransaction(transactionHash);
-        }), (function (am, exn) {
-          Logging.error({
-                err: Utils.prettifyExn(exn),
-                msg: "EE1100: 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",
-                source: name,
-                chainId: chain,
-                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);
+  var makeTransactionLoader = function () {
+    return LazyLoader.make((function (transactionHash) {
+                  return provider.getTransaction(transactionHash);
+                }), (function (am, exn) {
+                  Logging.error({
+                        err: Utils.prettifyExn(exn),
+                        msg: "EE1100: 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",
+                        source: name,
+                        chainId: chain,
+                        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);
+  };
   var makeBlockLoader = function () {
     return LazyLoader.make((function (blockNumber) {
                   return getKnownBlockWithBackoff(provider, name, chain, blockNumber, 1000, lowercaseAddresses);
@@ -552,11 +554,14 @@ function make(param) {
   var blockLoader = {
     contents: makeBlockLoader()
   };
+  var transactionLoader = {
+    contents: makeTransactionLoader()
+  };
   var getEventBlockOrThrow = makeThrowingGetEventBlock(function (blockNumber) {
         return LazyLoader.get(blockLoader.contents, blockNumber);
       });
   var getEventTransactionOrThrow = makeThrowingGetEventTransaction(Ethers.JsonRpcProvider.makeGetTransactionFields((function (__x) {
-              return LazyLoader.get(transactionLoader, __x);
+              return LazyLoader.get(transactionLoader.contents, __x);
             }), lowercaseAddresses));
   var contractNameAbiMapping = {};
   Belt_Array.forEach(param.contracts, (function (contract) {
@@ -632,11 +637,13 @@ function make(param) {
         throw {
               RE_EXN_ID: Source.GetItemsError,
               _1: {
-                TAG: "FailedParsingItems",
+                TAG: "FailedGettingItems",
                 exn: exn,
-                blockNumber: fromBlock,
-                logIndex: 0,
-                message: "Failed to parse events using hypersync client decoder. Please double-check your ABI."
+                attemptedToBlock: toBlock$1,
+                retry: {
+                  TAG: "ImpossibleForTheQuery",
+                  message: "Failed to parse events using hypersync client decoder. Please double-check your ABI."
+                }
               },
               Error: new Error()
             };
@@ -732,11 +739,13 @@ function make(param) {
                                     throw {
                                           RE_EXN_ID: Source.GetItemsError,
                                           _1: {
-                                            TAG: "FailedParsingItems",
+                                            TAG: "FailedGettingItems",
                                             exn: exn$1,
-                                            blockNumber: blockNumber,
-                                            logIndex: logIndex,
-                                            message: "Failed to parse event with viem, please double-check your ABI."
+                                            attemptedToBlock: toBlock$1,
+                                            retry: {
+                                              TAG: "ImpossibleForTheQuery",
+                                              message: "Failed to parse event with viem, please double-check your ABI. Block number: " + String(blockNumber) + ", log index: " + String(logIndex)
+                                            }
                                           },
                                           Error: new Error()
                                         };
@@ -790,6 +799,7 @@ function make(param) {
   };
   var getBlockHashes = function (blockNumbers, _currentlyUnusedLogger) {
     blockLoader.contents = makeBlockLoader();
+    transactionLoader.contents = makeTransactionLoader();
     return $$Promise.$$catch(Promise.all(Belt_Array.map(blockNumbers, (function (blockNum) {
                             return LazyLoader.get(blockLoader.contents, blockNum);
                           }))).then(function (blocks) {

package/src/sources/Source.res

@@ -23,11 +23,11 @@ type blockRangeFetchResponse = {
 type getItemsRetry =
   | WithSuggestedToBlock({toBlock: int})
   | WithBackoff({message: string, backoffMillis: int})
+  | ImpossibleForTheQuery({message: string})
 
 type getItemsError =
   | UnsupportedSelection({message: string})
   | FailedGettingFieldSelection({exn: exn, blockNumber: int, logIndex: int, message: string})
-  | FailedParsingItems({exn: exn, blockNumber: int, logIndex: int, message: string})
   | FailedGettingItems({exn: exn, attemptedToBlock: int, retry: getItemsRetry})
 
 exception GetItemsError(getItemsError)

package/src/sources/SourceManager.res

@@ -304,6 +304,7 @@ let getNextSyncSource = (
   sourceManager,
   // This is needed to include the Fallback source to rotation
   ~initialSource,
+  ~currentSource,
   // After multiple failures start returning fallback sources as well
   // But don't try it when main sync sources fail because of invalid configuration
   // note: The logic might be changed in the future
@@ -315,7 +316,7 @@ let getNextSyncSource = (
   let hasActive = ref(false)
 
   sourceManager.sources->Utils.Set.forEach(source => {
-    if source === sourceManager.activeSource {
+    if source === currentSource {
       hasActive := true
     } else if (
       switch source.sourceFor {
@@ -332,7 +333,7 @@ let getNextSyncSource = (
   | None =>
     switch before->Array.get(0) {
     | Some(s) => s
-    | None => sourceManager.activeSource
+    | None => currentSource
     }
   }
 }
@@ -349,9 +350,11 @@ let executeQuery = async (sourceManager: t, ~query: FetchState.query, ~currentBl
   let responseRef = ref(None)
   let retryRef = ref(0)
   let initialSource = sourceManager.activeSource
+  let sourceRef = ref(initialSource)
+  let shouldUpdateActiveSource = ref(false)
 
   while responseRef.contents->Option.isNone {
-    let source = sourceManager.activeSource
+    let source = sourceRef.contents
     let toBlock = toBlockRef.contents
     let retry = retryRef.contents
 
@@ -391,9 +394,8 @@ let executeQuery = async (sourceManager: t, ~query: FetchState.query, ~currentBl
     | Source.GetItemsError(error) =>
       switch error {
       | UnsupportedSelection(_)
-      | FailedGettingFieldSelection(_)
-      | FailedParsingItems(_) => {
-          let nextSource = sourceManager->getNextSyncSource(~initialSource)
+      | FailedGettingFieldSelection(_) => {
+          let nextSource = sourceManager->getNextSyncSource(~initialSource, ~currentSource=source)
 
           // These errors are impossible to recover, so we delete the source
           // from sourceManager so it's not attempted anymore
@@ -404,8 +406,7 @@ let executeQuery = async (sourceManager: t, ~query: FetchState.query, ~currentBl
           if notAlreadyDeleted {
             switch error {
             | UnsupportedSelection({message}) => logger->Logging.childError(message)
-            | FailedGettingFieldSelection({exn, message, blockNumber, logIndex})
-            | FailedParsingItems({exn, message, blockNumber, logIndex}) =>
+            | FailedGettingFieldSelection({exn, message, blockNumber, logIndex}) =>
               logger->Logging.childError({
                 "msg": message,
                 "err": exn->Utils.prettifyExn,
@@ -426,7 +427,8 @@ let executeQuery = async (sourceManager: t, ~query: FetchState.query, ~currentBl
               "msg": "Switching to another data-source",
               "source": nextSource.name,
             })
-            sourceManager.activeSource = nextSource
+            sourceRef := nextSource
+            shouldUpdateActiveSource := true
             retryRef := 0
           }
         }
@@ -438,6 +440,33 @@ let executeQuery = async (sourceManager: t, ~query: FetchState.query, ~currentBl
         })
         toBlockRef := Some(toBlock)
         retryRef := 0
+      | FailedGettingItems({exn, attemptedToBlock, retry: ImpossibleForTheQuery({message})}) =>
+        let nextSource =
+          sourceManager->getNextSyncSource(
+            ~initialSource,
+            ~currentSource=source,
+            ~attemptFallbacks=true,
+          )
+
+        let hasAnotherSource = nextSource !== initialSource
+
+        logger->Logging.childWarn({
+          "msg": message ++ (hasAnotherSource ? " - Attempting to another source" : ""),
+          "toBlock": attemptedToBlock,
+          "err": exn->Utils.prettifyExn,
+        })
+
+        if !hasAnotherSource {
+          %raw(`null`)->ErrorHandling.mkLogAndRaise(
+            ~logger,
+            ~msg="The indexer doesn't have data-sources which can continue fetching. Please, check the error logs or reach out to the Envio team.",
+          )
+        } else {
+          sourceRef := nextSource
+          shouldUpdateActiveSource := false
+          retryRef := 0
+        }
+
       | FailedGettingItems({exn, attemptedToBlock, retry: WithBackoff({message, backoffMillis})}) =>
         // Starting from the 11th failure (retry=10)
         // include fallback sources for switch
@@ -454,7 +483,11 @@ let executeQuery = async (sourceManager: t, ~query: FetchState.query, ~currentBl
         | _ =>
           // Then try to switch every second failure
           if retry->mod(2) === 0 {
-            sourceManager->getNextSyncSource(~initialSource, ~attemptFallbacks)
+            sourceManager->getNextSyncSource(
+              ~initialSource,
+              ~attemptFallbacks,
+              ~currentSource=source,
+            )
           } else {
             source
           }
@@ -476,16 +509,22 @@ let executeQuery = async (sourceManager: t, ~query: FetchState.query, ~currentBl
             "msg": "Switching to another data-source",
             "source": nextSource.name,
           })
-          sourceManager.activeSource = nextSource
+          sourceRef := nextSource
+          shouldUpdateActiveSource := true
         } else {
           await Utils.delay(Pervasives.min(backoffMillis, 60_000))
         }
         retryRef := retryRef.contents + 1
       }
+
     // TODO: Handle more error cases and hang/retry instead of throwing
     | exn => exn->ErrorHandling.mkLogAndRaise(~logger, ~msg="Failed to fetch block Range")
     }
   }
 
+  if shouldUpdateActiveSource.contents {
+    sourceManager.activeSource = sourceRef.contents
+  }
+
   responseRef.contents->Option.getUnsafe
 }

package/src/sources/SourceManager.res.js

@@ -203,7 +203,7 @@ async function waitForNewBlock(sourceManager, currentBlockHeight) {
   return newBlockHeight;
 }
 
-function getNextSyncSource(sourceManager, initialSource, attemptFallbacksOpt) {
+function getNextSyncSource(sourceManager, initialSource, currentSource, attemptFallbacksOpt) {
   var attemptFallbacks = attemptFallbacksOpt !== undefined ? attemptFallbacksOpt : false;
   var before = [];
   var after = [];
@@ -211,7 +211,7 @@ function getNextSyncSource(sourceManager, initialSource, attemptFallbacksOpt) {
     contents: false
   };
   sourceManager.sources.forEach(function (source) {
-        if (source === sourceManager.activeSource) {
+        if (source === currentSource) {
           hasActive.contents = true;
           return ;
         }
@@ -234,7 +234,7 @@ function getNextSyncSource(sourceManager, initialSource, attemptFallbacksOpt) {
   if (s$1 !== undefined) {
     return s$1;
   } else {
-    return sourceManager.activeSource;
+    return currentSource;
   }
 }
 
@@ -247,8 +247,10 @@ async function executeQuery(sourceManager, query, currentBlockHeight) {
   var responseRef;
   var retryRef = 0;
   var initialSource = sourceManager.activeSource;
+  var sourceRef = initialSource;
+  var shouldUpdateActiveSource = false;
   while(Belt_Option.isNone(responseRef)) {
-    var source = sourceManager.activeSource;
+    var source = sourceRef;
     var toBlock = toBlockRef;
     var retry = retryRef;
     var logger = Logging.createChild({
@@ -275,85 +277,117 @@ async function executeQuery(sourceManager, query, currentBlockHeight) {
       var error = Caml_js_exceptions.internalToOCamlException(raw_error);
       if (error.RE_EXN_ID === Source.GetItemsError) {
         var error$1 = error._1;
-        if (error$1.TAG === "FailedGettingItems") {
-          var match$1 = error$1.retry;
-          var attemptedToBlock = error$1.attemptedToBlock;
-          if (match$1.TAG === "WithSuggestedToBlock") {
-            var toBlock$1 = match$1.toBlock;
-            Logging.childTrace(logger, {
-                  msg: "Failed getting data for the block range. Immediately retrying with the suggested block range from response.",
-                  toBlock: attemptedToBlock,
-                  suggestedToBlock: toBlock$1
-                });
-            toBlockRef = toBlock$1;
-            retryRef = 0;
-          } else {
-            var backoffMillis = match$1.backoffMillis;
-            var attemptFallbacks = retry >= 10;
-            var nextSource = !(retry === 0 || retry === 1) && retry % 2 === 0 ? getNextSyncSource(sourceManager, initialSource, attemptFallbacks) : source;
-            var log = retry >= 4 ? Logging.childWarn : Logging.childTrace;
-            log(logger, {
-                  msg: match$1.message,
-                  toBlock: attemptedToBlock,
-                  backOffMilliseconds: backoffMillis,
-                  retry: retry,
-                  err: Utils.prettifyExn(error$1.exn)
-                });
-            var shouldSwitch = nextSource !== source;
-            if (shouldSwitch) {
-              Logging.childInfo(logger, {
-                    msg: "Switching to another data-source",
-                    source: nextSource.name
-                  });
-              sourceManager.activeSource = nextSource;
-            } else {
-              await Utils.delay(backoffMillis < 60000 ? backoffMillis : 60000);
-            }
-            retryRef = retryRef + 1 | 0;
-          }
-        } else {
-          var nextSource$1 = getNextSyncSource(sourceManager, initialSource, undefined);
+        var exit = 0;
+        switch (error$1.TAG) {
+          case "UnsupportedSelection" :
+          case "FailedGettingFieldSelection" :
+              exit = 1;
+              break;
+          case "FailedGettingItems" :
+              var match$1 = error$1.retry;
+              var attemptedToBlock = error$1.attemptedToBlock;
+              var exn = error$1.exn;
+              switch (match$1.TAG) {
+                case "WithSuggestedToBlock" :
+                    var toBlock$1 = match$1.toBlock;
+                    Logging.childTrace(logger, {
+                          msg: "Failed getting data for the block range. Immediately retrying with the suggested block range from response.",
+                          toBlock: attemptedToBlock,
+                          suggestedToBlock: toBlock$1
+                        });
+                    toBlockRef = toBlock$1;
+                    retryRef = 0;
+                    break;
+                case "WithBackoff" :
+                    var backoffMillis = match$1.backoffMillis;
+                    var attemptFallbacks = retry >= 10;
+                    var nextSource = !(retry === 0 || retry === 1) && retry % 2 === 0 ? getNextSyncSource(sourceManager, initialSource, source, attemptFallbacks) : source;
+                    var log = retry >= 4 ? Logging.childWarn : Logging.childTrace;
+                    log(logger, {
+                          msg: match$1.message,
+                          toBlock: attemptedToBlock,
+                          backOffMilliseconds: backoffMillis,
+                          retry: retry,
+                          err: Utils.prettifyExn(exn)
+                        });
+                    var shouldSwitch = nextSource !== source;
+                    if (shouldSwitch) {
+                      Logging.childInfo(logger, {
+                            msg: "Switching to another data-source",
+                            source: nextSource.name
+                          });
+                      sourceRef = nextSource;
+                      shouldUpdateActiveSource = true;
+                    } else {
+                      await Utils.delay(backoffMillis < 60000 ? backoffMillis : 60000);
+                    }
+                    retryRef = retryRef + 1 | 0;
+                    break;
+                case "ImpossibleForTheQuery" :
+                    var nextSource$1 = getNextSyncSource(sourceManager, initialSource, source, true);
+                    var hasAnotherSource = nextSource$1 !== initialSource;
+                    Logging.childWarn(logger, {
+                          msg: match$1.message + (
+                            hasAnotherSource ? " - Attempting to another source" : ""
+                          ),
+                          toBlock: attemptedToBlock,
+                          err: Utils.prettifyExn(exn)
+                        });
+                    if (hasAnotherSource) {
+                      sourceRef = nextSource$1;
+                      shouldUpdateActiveSource = false;
+                      retryRef = 0;
+                    } else {
+                      ErrorHandling.mkLogAndRaise(logger, "The indexer doesn't have data-sources which can continue fetching. Please, check the error logs or reach out to the Envio team.", null);
+                    }
+                    break;
+                
+              }
+              break;
+          
+        }
+        if (exit === 1) {
+          var nextSource$2 = getNextSyncSource(sourceManager, initialSource, source, undefined);
           var notAlreadyDeleted = sourceManager.sources.delete(source);
           if (notAlreadyDeleted) {
-            var exit = 0;
             switch (error$1.TAG) {
               case "UnsupportedSelection" :
                   Logging.childError(logger, error$1.message);
                   break;
               case "FailedGettingFieldSelection" :
-              case "FailedParsingItems" :
-                  exit = 1;
+                  Logging.childError(logger, {
+                        msg: error$1.message,
+                        err: Utils.prettifyExn(error$1.exn),
+                        blockNumber: error$1.blockNumber,
+                        logIndex: error$1.logIndex
+                      });
                   break;
               case "FailedGettingItems" :
                   break;
               
             }
-            if (exit === 1) {
-              Logging.childError(logger, {
-                    msg: error$1.message,
-                    err: Utils.prettifyExn(error$1.exn),
-                    blockNumber: error$1.blockNumber,
-                    logIndex: error$1.logIndex
-                  });
-            }
-            
           }
-          if (nextSource$1 === source) {
+          if (nextSource$2 === source) {
             ErrorHandling.mkLogAndRaise(logger, "The indexer doesn't have data-sources which can continue fetching. Please, check the error logs or reach out to the Envio team.", null);
           } else {
             Logging.childInfo(logger, {
                   msg: "Switching to another data-source",
-                  source: nextSource$1.name
+                  source: nextSource$2.name
                 });
-            sourceManager.activeSource = nextSource$1;
+            sourceRef = nextSource$2;
+            shouldUpdateActiveSource = true;
             retryRef = 0;
           }
         }
+        
       } else {
         ErrorHandling.mkLogAndRaise(logger, "Failed to fetch block Range", error);
       }
     }
   };
+  if (shouldUpdateActiveSource) {
+    sourceManager.activeSource = sourceRef;
+  }
   return responseRef;
 }