envio 2.29.0-alpha.2 → 2.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v2.29.0-alpha.2",
+  "version": "v2.29.0",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.js",
   "main": "./index.js",
@@ -25,19 +25,21 @@
   },
   "homepage": "https://envio.dev",
   "optionalDependencies": {
-    "envio-linux-x64": "v2.29.0-alpha.2",
-    "envio-linux-arm64": "v2.29.0-alpha.2",
-    "envio-darwin-x64": "v2.29.0-alpha.2",
-    "envio-darwin-arm64": "v2.29.0-alpha.2"
+    "envio-linux-x64": "v2.29.0",
+    "envio-linux-arm64": "v2.29.0",
+    "envio-darwin-x64": "v2.29.0",
+    "envio-darwin-arm64": "v2.29.0"
   },
   "dependencies": {
     "@envio-dev/hypersync-client": "0.6.6",
+    "@envio-dev/hyperfuel-client": "1.2.2",
     "rescript": "11.1.3",
     "rescript-schema": "9.3.0",
     "viem": "2.21.0",
     "bignumber.js": "9.1.2",
     "pino": "8.16.1",
     "pino-pretty": "10.2.3",
+    "@elastic/ecs-pino-format": "1.4.0",
     "prom-client": "15.0.0"
   },
   "files": [

package/src/Batch.res

@@ -58,6 +58,18 @@ let getOrderedNextItem = (fetchStates: ChainMap.t<FetchState.t>): option<
   })
 }
 
+let hasUnorderedNextItem = (fetchStates: ChainMap.t<FetchState.t>) => {
+  fetchStates
+  ->ChainMap.values
+  ->Js.Array2.some(fetchState => {
+    fetchState->FetchState.isActivelyIndexing &&
+      switch fetchState->FetchState.getEarliestEvent {
+      | Item(_) => true
+      | NoItem(_) => false
+      }
+  })
+}
+
 let popOrderedBatchItems = (
   ~maxBatchSize,
   ~fetchStates: ChainMap.t<FetchState.t>,

package/src/Batch.res.js

@@ -45,6 +45,20 @@ function getOrderedNextItem(fetchStates) {
               }));
 }
 
+function hasUnorderedNextItem(fetchStates) {
+  return ChainMap.values(fetchStates).some(function (fetchState) {
+              if (!FetchState.isActivelyIndexing(fetchState)) {
+                return false;
+              }
+              var match = FetchState.getEarliestEvent(fetchState);
+              if (match.TAG === "Item") {
+                return true;
+              } else {
+                return false;
+              }
+            });
+}
+
 function popOrderedBatchItems(maxBatchSize, fetchStates, sizePerChain) {
   var items = [];
   var loop = function () {
@@ -113,6 +127,7 @@ function popUnorderedBatchItems(maxBatchSize, fetchStates, sizePerChain) {
 exports.getQueueItemComparitor = getQueueItemComparitor;
 exports.isQueueItemEarlier = isQueueItemEarlier;
 exports.getOrderedNextItem = getOrderedNextItem;
+exports.hasUnorderedNextItem = hasUnorderedNextItem;
 exports.popOrderedBatchItems = popOrderedBatchItems;
 exports.popUnorderedBatchItems = popUnorderedBatchItems;
 /* Utils Not a pure module */

package/src/EventRegister.res

@@ -131,7 +131,20 @@ let onBlock = (rawOptions: unknown, handler: Internal.onBlockArgs => promise<uni
           ),
         ],
       )
-    | Some(_) => Js.Exn.raiseError("Currently only one onBlock handler per chain is supported")
+    | Some(onBlockConfigs) =>
+      onBlockConfigs->Belt.Array.push(
+        (
+          {
+            index: onBlockConfigs->Belt.Array.length,
+            name: options["name"],
+            startBlock: options["startBlock"],
+            endBlock: options["endBlock"],
+            interval: options["interval"],
+            chainId,
+            handler,
+          }: Internal.onBlockConfig
+        ),
+      )
     }
   })
 }

package/src/EventRegister.res.js

@@ -86,9 +86,17 @@ function onBlock(rawOptions, handler) {
         var options = S$RescriptSchema.parseOrThrow(rawOptions, onBlockOptionsSchema);
         var chainId = options.chain;
         var onBlockByChainId = registration.registrations.onBlockByChainId;
-        var match$2 = onBlockByChainId[String(chainId)];
-        if (match$2 !== undefined) {
-          return Js_exn.raiseError("Currently only one onBlock handler per chain is supported");
+        var onBlockConfigs = onBlockByChainId[String(chainId)];
+        if (onBlockConfigs !== undefined) {
+          onBlockConfigs.push({
+                index: onBlockConfigs.length,
+                name: options.name,
+                chainId: chainId,
+                startBlock: options.startBlock,
+                endBlock: options.endBlock,
+                interval: options.interval,
+                handler: handler
+              });
         } else {
           onBlockByChainId[chainId] = [{
               index: 0,
@@ -99,7 +107,6 @@ function onBlock(rawOptions, handler) {
               interval: options.interval,
               handler: handler
             }];
-          return ;
         }
       });
 }

package/src/EventUtils.res

@@ -16,6 +16,10 @@ let isEarlier = (item1: (int, int, int, int), item2: (int, int, int, int)) => {
   item1 < item2
 }
 
+let isEarlierUnordered = (item1: (int, int, int), item2: (int, int, int)) => {
+  item1 < item2
+}
+
 // type eventIndex = {
 //   blockNumber: int,
 //   logIndex: int,

package/src/EventUtils.res.js

@@ -20,6 +20,8 @@ function getOrderedBatchItemComparator(item) {
 
 var isEarlier = Caml_obj.lessthan;
 
+var isEarlierUnordered = Caml_obj.lessthan;
+
 function packEventIndex(blockNumber, logIndex) {
   var blockNumber$1 = BigInt(blockNumber);
   var logIndex$1 = BigInt(logIndex);
@@ -34,6 +36,7 @@ function getEventIdKeyString(chainId, eventId) {
 
 exports.getOrderedBatchItemComparator = getOrderedBatchItemComparator;
 exports.isEarlier = isEarlier;
+exports.isEarlierUnordered = isEarlierUnordered;
 exports.packEventIndex = packEventIndex;
 exports.getEventIdKeyString = getEventIdKeyString;
 /* BigInt Not a pure module */