envio 2.29.1 → 2.29.2

package/package.json

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

package/src/FetchState.res

@@ -1161,11 +1161,18 @@ let rollbackPartition = (
   ~firstChangeEvent: blockNumberAndLogIndex,
   ~addressesToRemove,
 ) => {
+  let shouldRollbackFetched = p.latestFetchedBlock.blockNumber >= firstChangeEvent.blockNumber
+  let latestFetchedBlock = shouldRollbackFetched
+    ? {
+        blockNumber: firstChangeEvent.blockNumber - 1,
+        blockTimestamp: 0,
+      }
+    : p.latestFetchedBlock
   switch p {
   | {selection: {dependsOnAddresses: false}} =>
     Some({
       ...p,
-      // FIXME: Should rollback latestFetchedBlock???
+      latestFetchedBlock,
       status: {
         fetchingStateId: None,
       },
@@ -1183,8 +1190,6 @@ let rollbackPartition = (
     if rollbackedAddressesByContractName->Js.Dict.keys->Array.length === 0 {
       None
     } else {
-      let shouldRollbackFetched = p.latestFetchedBlock.blockNumber >= firstChangeEvent.blockNumber
-
       Some({
         id: p.id,
         selection: p.selection,
@@ -1192,12 +1197,7 @@ let rollbackPartition = (
           fetchingStateId: None,
         },
         addressesByContractName: rollbackedAddressesByContractName,
-        latestFetchedBlock: shouldRollbackFetched
-          ? {
-              blockNumber: firstChangeEvent.blockNumber - 1,
-              blockTimestamp: 0,
-            }
-          : p.latestFetchedBlock,
+        latestFetchedBlock,
       })
     }
   }

package/src/FetchState.res.js

@@ -890,13 +890,18 @@ function pruneQueueFromFirstChangeEvent(queue, firstChangeEvent) {
 }
 
 function rollbackPartition(p, firstChangeEvent, addressesToRemove) {
+  var shouldRollbackFetched = p.latestFetchedBlock.blockNumber >= firstChangeEvent.blockNumber;
+  var latestFetchedBlock = shouldRollbackFetched ? ({
+        blockNumber: firstChangeEvent.blockNumber - 1 | 0,
+        blockTimestamp: 0
+      }) : p.latestFetchedBlock;
   if (!p.selection.dependsOnAddresses) {
     return {
             id: p.id,
             status: {
               fetchingStateId: undefined
             },
-            latestFetchedBlock: p.latestFetchedBlock,
+            latestFetchedBlock: latestFetchedBlock,
             selection: p.selection,
             addressesByContractName: p.addressesByContractName
           };
@@ -914,20 +919,17 @@ function rollbackPartition(p, firstChangeEvent, addressesToRemove) {
         }));
   if (Object.keys(rollbackedAddressesByContractName).length === 0) {
     return ;
+  } else {
+    return {
+            id: p.id,
+            status: {
+              fetchingStateId: undefined
+            },
+            latestFetchedBlock: latestFetchedBlock,
+            selection: p.selection,
+            addressesByContractName: rollbackedAddressesByContractName
+          };
   }
-  var shouldRollbackFetched = p.latestFetchedBlock.blockNumber >= firstChangeEvent.blockNumber;
-  return {
-          id: p.id,
-          status: {
-            fetchingStateId: undefined
-          },
-          latestFetchedBlock: shouldRollbackFetched ? ({
-                blockNumber: firstChangeEvent.blockNumber - 1 | 0,
-                blockTimestamp: 0
-              }) : p.latestFetchedBlock,
-          selection: p.selection,
-          addressesByContractName: rollbackedAddressesByContractName
-        };
 }
 
 function rollback(fetchState, firstChangeEvent) {