envio 2.32.0-alpha.0 → 2.32.1

package/src/db/InternalTable.res

@@ -165,7 +165,7 @@ module Chains = {
     ],
   )
 
-  let initialFromConfig = (chainConfig: InternalConfig.chain) => {
+  let initialFromConfig = (chainConfig: Config.chain) => {
     {
       id: chainConfig.id,
       startBlock: chainConfig.startBlock,
@@ -182,7 +182,7 @@ module Chains = {
     }
   }
 
-  let makeInitialValuesQuery = (~pgSchema, ~chainConfigs: array<InternalConfig.chain>) => {
+  let makeInitialValuesQuery = (~pgSchema, ~chainConfigs: array<Config.chain>) => {
     if chainConfigs->Array.length === 0 {
       None
     } else {

package/src/sources/RpcSource.res

@@ -218,7 +218,7 @@ let getNextPage = (
   ~addresses,
   ~topicQuery,
   ~loadBlock,
-  ~syncConfig as sc: InternalConfig.sourceSync,
+  ~syncConfig as sc: Config.sourceSync,
   ~provider,
   ~mutSuggestedBlockIntervals,
   ~partitionId,
@@ -465,7 +465,7 @@ let sanitizeUrl = (url: string) => {
 
 type options = {
   sourceFor: Source.sourceFor,
-  syncConfig: InternalConfig.sourceSync,
+  syncConfig: Config.sourceSync,
   url: string,
   chain: ChainMap.Chain.t,
   contracts: array<Internal.evmContractConfig>,
@@ -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,
     ),
   )
@@ -882,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) {
@@ -794,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/InternalConfig.res

@@ -1,48 +0,0 @@
-// TODO: rename the file to Config.res after finishing the migration from codegen
-// And turn it into PublicConfig instead
-// For internal use we should create Indexer.res with a stateful type
-
-type ecosystem = | @as("evm") Evm | @as("fuel") Fuel
-
-type sourceSyncOptions = {
-  initialBlockInterval?: int,
-  backoffMultiplicative?: float,
-  accelerationAdditive?: int,
-  intervalCeiling?: int,
-  backoffMillis?: int,
-  queryTimeoutMillis?: int,
-  fallbackStallTimeout?: int,
-}
-
-type historyFlag = FullHistory | MinHistory
-type rollbackFlag = RollbackOnReorg | NoRollback
-type historyConfig = {rollbackFlag: rollbackFlag, historyFlag: historyFlag}
-
-type contract = {
-  name: string,
-  abi: EvmTypes.Abi.t,
-  addresses: array<Address.t>,
-  events: array<Internal.eventConfig>,
-  startBlock: option<int>,
-}
-
-type chain = {
-  id: int,
-  startBlock: int,
-  endBlock?: int,
-  maxReorgDepth: int,
-  contracts: array<contract>,
-  sources: array<Source.t>,
-}
-
-type sourceSync = {
-  initialBlockInterval: int,
-  backoffMultiplicative: float,
-  accelerationAdditive: int,
-  intervalCeiling: int,
-  backoffMillis: int,
-  queryTimeoutMillis: int,
-  fallbackStallTimeout: int,
-}
-
-type multichain = | @as("ordered") Ordered | @as("unordered") Unordered