envio 2.27.2 → 2.27.3

package/package.json

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

package/src/FetchState.res

@@ -258,12 +258,12 @@ let updateInternal = (
     }
   }
 
-  let queueSize = queue->Array.length
+  let bufferSize = queue->Array.length
   Prometheus.IndexingPartitions.set(
     ~partitionsCount=partitions->Array.length,
     ~chainId=fetchState.chainId,
   )
-  Prometheus.IndexingBufferSize.set(~bufferSize=queueSize, ~chainId=fetchState.chainId)
+  Prometheus.IndexingBufferSize.set(~bufferSize, ~chainId=fetchState.chainId)
   Prometheus.IndexingBufferBlockNumber.set(
     ~blockNumber=latestFullyFetchedBlock.blockNumber,
     ~chainId=fetchState.chainId,
@@ -1086,7 +1086,7 @@ let make = (
   }
 }
 
-let queueSize = ({queue}: t) => queue->Array.length
+let bufferSize = ({queue}: t) => queue->Array.length
 
 /**
 * Returns the latest block number fetched for the lowest fetcher queue (ie the earliest un-fetched dynamic contract)
@@ -1207,7 +1207,7 @@ let isActivelyIndexing = ({latestFullyFetchedBlock, endBlock} as fetchState: t)
   | Some(endBlock) =>
     let isPastEndblock = latestFullyFetchedBlock.blockNumber >= endBlock
     if isPastEndblock {
-      fetchState->queueSize > 0
+      fetchState->bufferSize > 0
     } else {
       true
     }
@@ -1226,3 +1226,23 @@ let isReadyToEnterReorgThreshold = (
   } &&
   queue->Utils.Array.isEmpty
 }
+
+let filterAndSortForUnorderedBatch = {
+  let hasBatchItem = ({queue, latestFullyFetchedBlock}: t) => {
+    switch queue->Utils.Array.last {
+    | Some(item) => item.blockNumber <= latestFullyFetchedBlock.blockNumber
+    | None => false
+    }
+  }
+
+  let compareUnorderedBatchChainPriority = (a: t, b: t) => {
+    // Use unsafe since we filtered out all queues without batch items
+    (a.queue->Utils.Array.lastUnsafe).timestamp - (b.queue->Utils.Array.lastUnsafe).timestamp
+  }
+
+  (fetchStates: array<t>) => {
+    fetchStates
+    ->Array.keepU(hasBatchItem)
+    ->Js.Array2.sortInPlaceWith(compareUnorderedBatchChainPriority)
+  }
+}

package/src/FetchState.res.js

@@ -147,9 +147,9 @@ function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexi
   var isFetchingAtHead = currentBlockHeight !== undefined ? (
       latestFullyFetchedBlock$1.blockNumber >= currentBlockHeight ? true : fetchState.isFetchingAtHead && checkIsWithinSyncRange(latestFullyFetchedBlock$1, currentBlockHeight)
     ) : fetchState.isFetchingAtHead;
-  var queueSize = queue.length;
+  var bufferSize = queue.length;
   Prometheus.IndexingPartitions.set(partitions.length, fetchState.chainId);
-  Prometheus.IndexingBufferSize.set(queueSize, fetchState.chainId);
+  Prometheus.IndexingBufferSize.set(bufferSize, fetchState.chainId);
   Prometheus.IndexingBufferBlockNumber.set(latestFullyFetchedBlock$1.blockNumber, fetchState.chainId);
   var item = Utils.$$Array.last(queue);
   return {
@@ -804,7 +804,7 @@ function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition,
         };
 }
 
-function queueSize(param) {
+function bufferSize(param) {
   return param.queue.length;
 }
 
@@ -902,7 +902,7 @@ function isActivelyIndexing(fetchState) {
   }
   var isPastEndblock = fetchState.latestFullyFetchedBlock.blockNumber >= endBlock;
   if (isPastEndblock) {
-    return queueSize(fetchState) > 0;
+    return bufferSize(fetchState) > 0;
   } else {
     return true;
   }
@@ -921,6 +921,23 @@ function isReadyToEnterReorgThreshold(param, currentBlockHeight) {
   }
 }
 
+function hasBatchItem(param) {
+  var item = Utils.$$Array.last(param.queue);
+  if (item !== undefined) {
+    return item.blockNumber <= param.latestFullyFetchedBlock.blockNumber;
+  } else {
+    return false;
+  }
+}
+
+function compareUnorderedBatchChainPriority(a, b) {
+  return Utils.$$Array.lastUnsafe(a.queue).timestamp - Utils.$$Array.lastUnsafe(b.queue).timestamp | 0;
+}
+
+function filterAndSortForUnorderedBatch(fetchStates) {
+  return Belt_Array.keepU(fetchStates, hasBatchItem).sort(compareUnorderedBatchChainPriority);
+}
+
 exports.copy = copy;
 exports.eventItemGt = eventItemGt;
 exports.mergeSortedEventList = mergeSortedEventList;
@@ -944,11 +961,12 @@ exports.makeNoItem = makeNoItem;
 exports.qItemLt = qItemLt;
 exports.getEarliestEvent = getEarliestEvent;
 exports.make = make;
-exports.queueSize = queueSize;
+exports.bufferSize = bufferSize;
 exports.getLatestFullyFetchedBlock = getLatestFullyFetchedBlock;
 exports.pruneQueueFromFirstChangeEvent = pruneQueueFromFirstChangeEvent;
 exports.rollbackPartition = rollbackPartition;
 exports.rollback = rollback;
 exports.isActivelyIndexing = isActivelyIndexing;
 exports.isReadyToEnterReorgThreshold = isReadyToEnterReorgThreshold;
+exports.filterAndSortForUnorderedBatch = filterAndSortForUnorderedBatch;
 /* Utils Not a pure module */

package/src/Utils.res

@@ -250,6 +250,8 @@ Helper to check if a value exists in an array
 
   let last = (arr: array<'a>): option<'a> => arr->Belt.Array.get(arr->Array.length - 1)
 
+  let lastUnsafe = (arr: array<'a>): 'a => arr->Belt.Array.getUnsafe(arr->Array.length - 1)
+
   let findReverseWithIndex = (arr: array<'a>, fn: 'a => bool): option<('a, int)> => {
     let rec loop = (index: int) => {
       if index < 0 {

package/src/Utils.res.js

@@ -268,6 +268,10 @@ function last(arr) {
   return Belt_Array.get(arr, arr.length - 1 | 0);
 }
 
+function lastUnsafe(arr) {
+  return arr[arr.length - 1 | 0];
+}
+
 function findReverseWithIndex(arr, fn) {
   var _index = arr.length - 1 | 0;
   while(true) {
@@ -310,6 +314,7 @@ var $$Array$1 = {
   awaitEach: awaitEach,
   removeAtIndex: removeAtIndex,
   last: last,
+  lastUnsafe: lastUnsafe,
   findReverseWithIndex: findReverseWithIndex,
   interleave: interleave
 };