envio 3.0.0-alpha.2 → 3.0.0-alpha.21

package/package.json

@@ -1,62 +1,78 @@
 {
   "name": "envio",
-  "version": "v3.0.0-alpha.2",
+  "version": "3.0.0-alpha.21",
   "type": "module",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
-  "bin": "./bin.js",
+  "bin": "./bin.mjs",
   "main": "./index.js",
   "types": "./index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/enviodev/hyperindex.git"
   },
+  "author": "envio contributors <about@envio.dev>",
+  "license": "GPL-3.0",
+  "bugs": {
+    "url": "https://github.com/enviodev/hyperindex/issues"
+  },
+  "homepage": "https://envio.dev",
   "keywords": [
     "blockchain",
     "indexer",
     "ethereum",
     "evm",
     "fuel",
+    "solana",
     "data",
     "dapp"
   ],
-  "author": "envio contributors <about@envio.dev>",
-  "license": "GPL-3.0",
-  "bugs": {
-    "url": "https://github.com/enviodev/hyperindex/issues"
-  },
-  "homepage": "https://envio.dev",
   "engines": {
     "node": ">=22.0.0"
   },
-  "optionalDependencies": {
-    "envio-linux-x64": "v3.0.0-alpha.2",
-    "envio-linux-arm64": "v3.0.0-alpha.2",
-    "envio-darwin-x64": "v3.0.0-alpha.2",
-    "envio-darwin-arm64": "v3.0.0-alpha.2"
-  },
+  "files": [
+    "bin.mjs",
+    "evm.schema.json",
+    "fuel.schema.json",
+    "svm.schema.json",
+    "rescript.json",
+    "index.d.ts",
+    "index.js",
+    "src"
+  ],
   "dependencies": {
-    "@clickhouse/client": "1.12.1",
+    "@clickhouse/client": "1.17.0",
     "@elastic/ecs-pino-format": "1.4.0",
     "@envio-dev/hyperfuel-client": "1.2.2",
-    "@envio-dev/hypersync-client": "0.7.0",
-    "bignumber.js": "9.1.2",
+    "@envio-dev/hypersync-client": "1.3.0",
+    "@fuel-ts/crypto": "0.96.1",
+    "@fuel-ts/errors": "0.96.1",
+    "@fuel-ts/hasher": "0.96.1",
+    "@fuel-ts/math": "0.96.1",
+    "@fuel-ts/utils": "0.96.1",
+    "bignumber.js": "9.3.1",
     "eventsource": "4.1.0",
-    "pino": "8.16.1",
-    "pino-pretty": "10.2.3",
-    "prom-client": "15.0.0",
+    "express": "4.19.2",
+    "pino": "10.3.1",
+    "pino-pretty": "13.1.3",
+    "prom-client": "15.1.3",
+    "yargs": "17.7.2",
     "rescript": "11.1.3",
     "rescript-schema": "9.3.4",
-    "viem": "2.21.0",
+    "viem": "2.46.2",
     "rescript-envsafe": "5.0.0",
-    "dotenv": "16.4.5"
+    "dotenv": "16.4.5",
+    "date-fns": "3.3.1",
+    "@rescript/react": "0.14.1",
+    "ink": "6.8.0",
+    "ink-big-text": "2.0.0",
+    "ink-spinner": "5.0.0",
+    "postgres": "3.4.8",
+    "tsx": "4.21.0"
   },
-  "files": [
-    "bin.js",
-    "evm.schema.json",
-    "fuel.schema.json",
-    "rescript.json",
-    "index.d.ts",
-    "index.js",
-    "src"
-  ]
+  "optionalDependencies": {
+    "envio-linux-x64": "3.0.0-alpha.21",
+    "envio-linux-arm64": "3.0.0-alpha.21",
+    "envio-darwin-x64": "3.0.0-alpha.21",
+    "envio-darwin-arm64": "3.0.0-alpha.21"
+  }
 }

package/rescript.json

@@ -19,6 +19,9 @@
     "generatedFileExtension": ".gen.ts",
     "moduleResolution": "node16"
   },
-  "bs-dependencies": ["rescript-schema", "rescript-envsafe"],
+  "jsx": {
+    "version": 4
+  },
+  "bs-dependencies": ["rescript-schema", "@rescript/react", "rescript-envsafe"],
   "bsc-flags": ["-open RescriptSchema"]
 }

package/src/Batch.res

@@ -6,7 +6,8 @@ open Utils.UnsafeIntOperators
 type chainAfterBatch = {
   batchSize: int,
   progressBlockNumber: int,
-  totalEventsProcessed: int,
+  sourceBlockNumber: int,
+  totalEventsProcessed: float,
   fetchState: FetchState.t,
   isProgressAtHeadWhenBatchCreated: bool,
 }
@@ -16,7 +17,8 @@ type chainBeforeBatch = {
   reorgDetection: ReorgDetection.t,
   progressBlockNumber: int,
   sourceBlockNumber: int,
-  totalEventsProcessed: int,
+  totalEventsProcessed: float,
+  chainConfig: Config.chain,
 }
 
 type t = {
@@ -24,7 +26,7 @@ type t = {
   items: array<Internal.item>,
   progressedChainsById: dict<chainAfterBatch>,
   // Unnest-like checkpoint fields:
-  checkpointIds: array<float>,
+  checkpointIds: array<bigint>,
   checkpointChainIds: array<int>,
   checkpointBlockNumbers: array<int>,
   checkpointBlockHashes: array<Js.Null.t<string>>,
@@ -108,10 +110,11 @@ let getProgressedChainsById = {
           {
             batchSize,
             progressBlockNumber: progressBlockNumberAfterBatch,
-            totalEventsProcessed: chainBeforeBatch.totalEventsProcessed + batchSize,
+            sourceBlockNumber: chainBeforeBatch.sourceBlockNumber,
+            totalEventsProcessed: chainBeforeBatch.totalEventsProcessed +. batchSize->Int.toFloat,
             fetchState: fetchStateAfterBatch,
             isProgressAtHeadWhenBatchCreated: progressBlockNumberAfterBatch >=
-            chainBeforeBatch.sourceBlockNumber,
+            chainBeforeBatch.sourceBlockNumber - chainBeforeBatch.chainConfig.blockLag,
           }: chainAfterBatch
         ),
       )
@@ -196,7 +199,7 @@ let addReorgCheckpoints = (
     for blockNumber in fromBlockExclusive + 1 to toBlockExclusive - 1 {
       switch reorgDetection->ReorgDetection.getHashByBlockNumber(~blockNumber) {
       | Js.Null.Value(hash) =>
-        let checkpointId = prevCheckpointId.contents +. 1.
+        let checkpointId = prevCheckpointId.contents->BigInt.add(1n)
         prevCheckpointId := checkpointId
 
         mutCheckpointIds->Js.Array2.push(checkpointId)->ignore
@@ -277,7 +280,7 @@ let prepareOrderedBatch = (
               ~mutCheckpointEventsProcessed=checkpointEventsProcessed,
             )
 
-          let checkpointId = prevCheckpointId.contents +. 1.
+          let checkpointId = prevCheckpointId.contents->BigInt.add(1n)
 
           items
           ->Js.Array2.push(item0)
@@ -421,7 +424,7 @@ let prepareUnorderedBatch = (
               ~mutCheckpointEventsProcessed=checkpointEventsProcessed,
             )
 
-          let checkpointId = prevCheckpointId.contents +. 1.
+          let checkpointId = prevCheckpointId.contents->BigInt.add(1n)
 
           checkpointIds->Js.Array2.push(checkpointId)->ignore
           checkpointChainIds->Js.Array2.push(fetchState.chainId)->ignore

package/src/Batch.res.mjs

@@ -1,6 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Utils from "./Utils.res.mjs";
+import * as $$BigInt from "./bindings/BigInt.res.mjs";
 import * as ChainMap from "./ChainMap.res.mjs";
 import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
 import * as FetchState from "./FetchState.res.mjs";
@@ -62,9 +63,10 @@ function getChainAfterBatchIfProgressed(chainBeforeBatch, progressBlockNumberAft
     return {
             batchSize: batchSize,
             progressBlockNumber: progressBlockNumberAfterBatch,
+            sourceBlockNumber: chainBeforeBatch.sourceBlockNumber,
             totalEventsProcessed: chainBeforeBatch.totalEventsProcessed + batchSize,
             fetchState: fetchStateAfterBatch,
-            isProgressAtHeadWhenBatchCreated: progressBlockNumberAfterBatch >= chainBeforeBatch.sourceBlockNumber
+            isProgressAtHeadWhenBatchCreated: progressBlockNumberAfterBatch >= chainBeforeBatch.sourceBlockNumber - chainBeforeBatch.chainConfig.blockLag
           };
   }
   
@@ -80,7 +82,7 @@ function getProgressedChainsById(chainsBeforeBatch, batchSizePerChain, progressB
           var progressedChain;
           if (batchSize !== undefined) {
             var leftItems = fetchState.buffer.slice(batchSize);
-            progressedChain = getChainAfterBatchIfProgressed(chainBeforeBatch, progressBlockNumberAfterBatch, FetchState.updateInternal(fetchState, undefined, undefined, undefined, leftItems, undefined), batchSize);
+            progressedChain = getChainAfterBatchIfProgressed(chainBeforeBatch, progressBlockNumberAfterBatch, FetchState.updateInternal(fetchState, undefined, undefined, leftItems, undefined, undefined), batchSize);
           } else {
             progressedChain = getChainAfterBatchIfProgressed(chainBeforeBatch, progressBlockNumberAfterBatch, chainBeforeBatch.fetchState, 0);
           }
@@ -101,7 +103,7 @@ function addReorgCheckpoints(prevCheckpointId, reorgDetection, fromBlockExclusiv
   for(var blockNumber = fromBlockExclusive + 1 ,blockNumber_finish = toBlockExclusive - 1; blockNumber <= blockNumber_finish; ++blockNumber){
     var hash = ReorgDetection.getHashByBlockNumber(reorgDetection, blockNumber);
     if (hash !== null) {
-      var checkpointId = prevCheckpointId$1 + 1;
+      var checkpointId = $$BigInt.add(prevCheckpointId$1, 1n);
       prevCheckpointId$1 = checkpointId;
       mutCheckpointIds.push(checkpointId);
       mutCheckpointChainIds.push(chainId);
@@ -150,7 +152,7 @@ function prepareOrderedBatch(checkpointIdBeforeBatch, chainsBeforeBatch, batchSi
           for(var blockNumber$1 = prevBlockNumber + 1 ,blockNumber_finish = blockNumber - 1; blockNumber$1 <= blockNumber_finish; ++blockNumber$1){
             var hash = ReorgDetection.getHashByBlockNumber(reorgDetection, blockNumber$1);
             if (hash !== null) {
-              var checkpointId = prevCheckpointId$2 + 1;
+              var checkpointId = $$BigInt.add(prevCheckpointId$2, 1n);
               prevCheckpointId$2 = checkpointId;
               checkpointIds.push(checkpointId);
               checkpointChainIds.push(chainId);
@@ -165,7 +167,7 @@ function prepareOrderedBatch(checkpointIdBeforeBatch, chainsBeforeBatch, batchSi
           tmp = prevCheckpointId$1;
         }
         prevCheckpointId = tmp;
-        var checkpointId$1 = prevCheckpointId + 1;
+        var checkpointId$1 = $$BigInt.add(prevCheckpointId, 1n);
         items.push(item0);
         for(var idx = 1 ,idx_finish = newItemsCount - 1; idx <= idx_finish; ++idx){
           items.push(fetchState.buffer[itemsCountBefore + idx]);
@@ -191,7 +193,7 @@ function prepareOrderedBatch(checkpointIdBeforeBatch, chainsBeforeBatch, batchSi
           for(var blockNumber$2 = prevBlockNumber + 1 ,blockNumber_finish$1 = toBlockExclusive - 1; blockNumber$2 <= blockNumber_finish$1; ++blockNumber$2){
             var hash$1 = ReorgDetection.getHashByBlockNumber(reorgDetection$1, blockNumber$2);
             if (hash$1 !== null) {
-              var checkpointId$2 = prevCheckpointId$4 + 1;
+              var checkpointId$2 = $$BigInt.add(prevCheckpointId$4, 1n);
               prevCheckpointId$4 = checkpointId$2;
               checkpointIds.push(checkpointId$2);
               checkpointChainIds.push(chainId$1);
@@ -261,7 +263,7 @@ function prepareUnorderedBatch(checkpointIdBeforeBatch, chainsBeforeBatch, batch
             for(var blockNumber$1 = fromBlockExclusive + 1 ,blockNumber_finish = blockNumber - 1; blockNumber$1 <= blockNumber_finish; ++blockNumber$1){
               var hash = ReorgDetection.getHashByBlockNumber(reorgDetection, blockNumber$1);
               if (hash !== null) {
-                var checkpointId = prevCheckpointId$2 + 1;
+                var checkpointId = $$BigInt.add(prevCheckpointId$2, 1n);
                 prevCheckpointId$2 = checkpointId;
                 checkpointIds.push(checkpointId);
                 checkpointChainIds.push(chainId);
@@ -276,7 +278,7 @@ function prepareUnorderedBatch(checkpointIdBeforeBatch, chainsBeforeBatch, batch
             tmp = prevCheckpointId$1;
           }
           prevCheckpointId = tmp;
-          var checkpointId$1 = prevCheckpointId + 1;
+          var checkpointId$1 = $$BigInt.add(prevCheckpointId, 1n);
           checkpointIds.push(checkpointId$1);
           checkpointChainIds.push(fetchState.chainId);
           checkpointBlockNumbers.push(blockNumber);
@@ -305,7 +307,7 @@ function prepareUnorderedBatch(checkpointIdBeforeBatch, chainsBeforeBatch, batch
       for(var blockNumber$2 = fromBlockExclusive$1 + 1 ,blockNumber_finish$1 = toBlockExclusive - 1; blockNumber$2 <= blockNumber_finish$1; ++blockNumber$2){
         var hash$1 = ReorgDetection.getHashByBlockNumber(reorgDetection$1, blockNumber$2);
         if (hash$1 !== null) {
-          var checkpointId$2 = prevCheckpointId$4 + 1;
+          var checkpointId$2 = $$BigInt.add(prevCheckpointId$4, 1n);
           prevCheckpointId$4 = checkpointId$2;
           checkpointIds.push(checkpointId$2);
           checkpointChainIds.push(chainId$1);