envio 2.31.1-rc.0 → 2.31.1-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v2.31.1-rc.0",
+  "version": "v2.31.1-rc.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-rc.1",
+    "envio-linux-arm64": "v2.31.1-rc.1",
+    "envio-darwin-x64": "v2.31.1-rc.1",
+    "envio-darwin-arm64": "v2.31.1-rc.1"
   },
   "dependencies": {
     "@envio-dev/hypersync-client": "0.6.6",

package/src/ReorgDetection.res

@@ -188,19 +188,16 @@ 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
@@ -216,15 +213,10 @@ let getLatestValidScannedBlock = (
   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 =>
-        loop(idx + 1)
-      | Some(_) => getPrevScannedBlockNumber(idx)
+      let scannedBlock = reorgDetection.dataByBlockNumber->Js.Dict.unsafeGet(blockNumberKey)
+      switch verifiedDataByBlockNumber->Js.Dict.unsafeGet(blockNumberKey) {
+      | verifiedBlockData if verifiedBlockData.blockHash === scannedBlock.blockHash => loop(idx + 1)
+      | _ => getPrevScannedBlockNumber(idx)
       }
     | None => getPrevScannedBlockNumber(idx)
     }

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");
 
@@ -108,14 +107,13 @@ function registerReorgGuard(self, reorgGuard, currentBlockHeight) {
   }
 }
 
-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];
@@ -132,11 +130,8 @@ function getLatestValidScannedBlock(self, blockNumbersAndHashes, currentBlockHei
     if (blockNumberKey === undefined) {
       return getPrevScannedBlockNumber(idx$1);
     }
-    var scannedBlock = dataByBlockNumber[blockNumberKey];
+    var scannedBlock = reorgDetection.dataByBlockNumber[blockNumberKey];
     var verifiedBlockData = verifiedDataByBlockNumber[blockNumberKey];
-    if (verifiedBlockData === undefined) {
-      return Js_exn.raiseError("Unexpected case. Couldn't find verified hash for block number " + blockNumberKey);
-    }
     if (verifiedBlockData.blockHash !== scannedBlock.blockHash) {
       return getPrevScannedBlockNumber(idx$1);
     }