envio 3.0.0-alpha.21 → 3.0.0-alpha.22

package/index.js

@@ -3,11 +3,13 @@
 // on the JS side, so we need to do it here
 
 import * as Sury from "rescript-schema";
-import { schema as bigintSchema } from "./src/bindings/BigInt.res.mjs";
+import { $$BigInt as UtilsBigInt } from "./src/Utils.res.mjs";
+const bigintSchema = UtilsBigInt.schema;
 import { schema as bigDecimalSchema } from "./src/bindings/BigDecimal.res.mjs";
 
-// Re-export everything from envioGen
 export * from "./src/Envio.res.mjs";
+export { indexer, createTestIndexer } from "./src/Api.res.mjs";
+export { default as BigDecimal } from "bignumber.js";
 
 // Important! Should match the index.d.ts file
 export const S = {
@@ -37,7 +39,7 @@ export const S = {
   tuple: Sury.tuple,
   merge: Sury.merge,
   optional: Sury.optional,
-  nullable: Sury.nullable,
+  nullable: (schema) => Sury.union([schema, null]),
   bigDecimal: bigDecimalSchema,
   // Nullish type will change in "sury@10"
   // nullish: Sury.nullish,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "3.0.0-alpha.21",
+  "version": "3.0.0-alpha.22",
   "type": "module",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.mjs",
@@ -51,18 +51,19 @@
     "@fuel-ts/utils": "0.96.1",
     "bignumber.js": "9.3.1",
     "eventsource": "4.1.0",
+    "js-sdsl": "4.4.2",
     "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",
+    "@rescript/runtime": "12.2.0",
+    "rescript-schema": "9.5.1",
     "viem": "2.46.2",
-    "rescript-envsafe": "5.0.0",
     "dotenv": "16.4.5",
     "date-fns": "3.3.1",
     "@rescript/react": "0.14.1",
+    "react": "19.2.5",
     "ink": "6.8.0",
     "ink-big-text": "2.0.0",
     "ink-spinner": "5.0.0",
@@ -70,9 +71,10 @@
     "tsx": "4.21.0"
   },
   "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"
+    "envio-linux-x64": "3.0.0-alpha.22",
+    "envio-linux-x64-musl": "3.0.0-alpha.22",
+    "envio-linux-arm64": "3.0.0-alpha.22",
+    "envio-darwin-x64": "3.0.0-alpha.22",
+    "envio-darwin-arm64": "3.0.0-alpha.22"
   }
 }

package/rescript.json

@@ -12,16 +12,12 @@
     "module": "esmodule",
     "in-source": true
   },
-  "gentypeconfig": {
-    "shims": {
-      "Js": "Js"
-    },
-    "generatedFileExtension": ".gen.ts",
-    "moduleResolution": "node16"
-  },
   "jsx": {
     "version": 4
   },
-  "bs-dependencies": ["rescript-schema", "@rescript/react", "rescript-envsafe"],
-  "bsc-flags": ["-open RescriptSchema"]
+  "dependencies": ["rescript-schema", "@rescript/react"],
+  "compiler-flags": ["-open RescriptSchema"],
+  "warnings": {
+    "error": "+3"
+  }
 }

package/src/Address.res

@@ -1,4 +1,3 @@
-@genType.import(("./Types.ts", "Address"))
 type t
 
 let schema = S.string->S.setName("Address")->(Utils.magic: S.t<string> => S.t<t>)
@@ -22,16 +21,16 @@ module Evm = {
   // Validate that the string is a proper address but return a lowercased value
   let fromStringLowercaseOrThrow = string => {
     if fromStringLowercaseOrThrow(string) {
-      unsafeFromString(string->Js.String2.toLowerCase)
+      unsafeFromString(string->String.toLowerCase)
     } else {
-      Js.Exn.raiseError(
+      JsError.throwWithMessage(
         `Address "${string}" is invalid. Expected a 20-byte hex string starting with 0x.`,
       )
     }
   }
 
   let fromAddressLowercaseOrThrow = address =>
-    address->toString->Js.String2.toLowerCase->(Utils.magic: string => t)
+    address->toString->String.toLowerCase->(Utils.magic: string => t)
 
   // Reassign since the function might be used in the handler code
   // and we don't want to have a "viem" import there. It's needed to keep "viem" a dependency
@@ -42,7 +41,7 @@ module Evm = {
       fromStringOrThrow(string)
     } catch {
     | _ =>
-      Js.Exn.raiseError(
+      JsError.throwWithMessage(
         `Address "${string}" is invalid. Expected a 20-byte hex string starting with 0x.`,
       )
     }

package/src/Address.res.mjs

@@ -1,16 +1,16 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Viem from "viem";
-import * as Js_exn from "rescript/lib/es6/js_exn.js";
+import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 
-var schema = S$RescriptSchema.setName(S$RescriptSchema.string, "Address");
+let schema = S$RescriptSchema.setName(S$RescriptSchema.string, "Address");
 
 function fromStringLowercaseOrThrow(string) {
   if (Viem.isAddress(string)) {
     return string.toLowerCase();
   } else {
-    return Js_exn.raiseError("Address \"" + string + "\" is invalid. Expected a 20-byte hex string starting with 0x.");
+    return Stdlib_JsError.throwWithMessage(`Address "` + string + `" is invalid. Expected a 20-byte hex string starting with 0x.`);
   }
 }
 
@@ -21,17 +21,14 @@ function fromAddressLowercaseOrThrow(address) {
 function fromStringOrThrow(string) {
   try {
     return Viem.getAddress(string);
-  }
-  catch (exn){
-    return Js_exn.raiseError("Address \"" + string + "\" is invalid. Expected a 20-byte hex string starting with 0x.");
+  } catch (exn) {
+    return Stdlib_JsError.throwWithMessage(`Address "` + string + `" is invalid. Expected a 20-byte hex string starting with 0x.`);
   }
 }
 
-function fromAddressOrThrow(address) {
-  return fromStringOrThrow(address);
-}
+let fromAddressOrThrow = fromStringOrThrow;
 
-var Evm = {
+let Evm = {
   fromStringLowercaseOrThrow: fromStringLowercaseOrThrow,
   fromAddressLowercaseOrThrow: fromAddressLowercaseOrThrow,
   fromStringOrThrow: fromStringOrThrow,
@@ -39,7 +36,7 @@ var Evm = {
 };
 
 export {
-  schema ,
-  Evm ,
+  schema,
+  Evm,
 }
 /* schema Not a pure module */

package/src/Api.res

@@ -0,0 +1,15 @@
+// Top-of-graph module — putting these in Main or TestIndexer would cycle
+// back through Envio.
+
+let indexer: unknown = Main.getGlobalIndexer()
+
+let createTestIndexer: unit => unknown = () => {
+  let workerPath =
+    NodeJs.Path.join(
+      NodeJs.Path.getDirname(NodeJs.ImportMeta.importMeta),
+      "TestIndexerWorker.res.mjs",
+    )->NodeJs.Path.toString
+  TestIndexer.makeCreateTestIndexer(~config=Config.loadWithoutRegistrations(), ~workerPath)()->(
+    Utils.magic: TestIndexer.t<'a> => unknown
+  )
+}

package/src/Api.res.mjs

@@ -0,0 +1,20 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as Main from "./Main.res.mjs";
+import * as Path from "path";
+import * as Config from "./Config.res.mjs";
+import * as NodeJs from "./bindings/NodeJs.res.mjs";
+import * as TestIndexer from "./TestIndexer.res.mjs";
+
+let indexer = Main.getGlobalIndexer();
+
+function createTestIndexer() {
+  let workerPath = Path.join(NodeJs.Path.getDirname(import.meta), "TestIndexerWorker.res.mjs");
+  return TestIndexer.makeCreateTestIndexer(Config.loadWithoutRegistrations(), workerPath)();
+}
+
+export {
+  indexer,
+  createTestIndexer,
+}
+/* indexer Not a pure module */

package/src/Batch.res

@@ -1,5 +1,3 @@
-open Belt
-
 @@warning("-44")
 open Utils.UnsafeIntOperators
 
@@ -29,7 +27,7 @@ type t = {
   checkpointIds: array<bigint>,
   checkpointChainIds: array<int>,
   checkpointBlockNumbers: array<int>,
-  checkpointBlockHashes: array<Js.Null.t<string>>,
+  checkpointBlockHashes: array<Null.t<string>>,
   checkpointEventsProcessed: array<int>,
 }
 
@@ -68,7 +66,7 @@ let getOrderedNextChain = (fetchStates: ChainMap.t<FetchState.t>, ~batchSizePerC
 }
 
 // Save overhead of recreating the dict every time
-let immutableEmptyBatchSizePerChain: dict<int> = Js.Dict.empty()
+let immutableEmptyBatchSizePerChain: dict<int> = Dict.make()
 let hasOrderedReadyItem = (fetchStates: ChainMap.t<FetchState.t>) => {
   switch fetchStates->getOrderedNextChain(~batchSizePerChain=immutableEmptyBatchSizePerChain) {
   | Some(fetchState) => fetchState->FetchState.hasReadyItem
@@ -79,7 +77,7 @@ let hasOrderedReadyItem = (fetchStates: ChainMap.t<FetchState.t>) => {
 let hasUnorderedReadyItem = (fetchStates: ChainMap.t<FetchState.t>) => {
   fetchStates
   ->ChainMap.values
-  ->Js.Array2.some(fetchState => {
+  ->Array.some(fetchState => {
     fetchState->FetchState.isActivelyIndexing && fetchState->FetchState.hasReadyItem
   })
 }
@@ -128,7 +126,7 @@ let getProgressedChainsById = {
     ~batchSizePerChain: dict<int>,
     ~progressBlockNumberPerChain: dict<int>,
   ) => {
-    let progressedChainsById = Js.Dict.empty()
+    let progressedChainsById = Dict.make()
 
     // Needed to:
     // - Recalculate the computed queue sizes
@@ -136,7 +134,7 @@ let getProgressedChainsById = {
     // - Trigger onBlock pointer update
     chainsBeforeBatch
     ->ChainMap.values
-    ->Array.forEachU(chainBeforeBatch => {
+    ->Array.forEach(chainBeforeBatch => {
       let fetchState = chainBeforeBatch.fetchState
 
       let progressBlockNumberAfterBatch = switch progressBlockNumberPerChain->Utils.Dict.dangerouslyGetNonOption(
@@ -150,7 +148,7 @@ let getProgressedChainsById = {
         fetchState.chainId->Int.toString,
       ) {
       | Some(batchSize) =>
-        let leftItems = fetchState.buffer->Js.Array2.sliceFrom(batchSize)
+        let leftItems = fetchState.buffer->Array.slice(~start=batchSize)
         getChainAfterBatchIfProgressed(
           ~chainBeforeBatch,
           ~batchSize,
@@ -198,16 +196,16 @@ let addReorgCheckpoints = (
     let prevCheckpointId = ref(prevCheckpointId)
     for blockNumber in fromBlockExclusive + 1 to toBlockExclusive - 1 {
       switch reorgDetection->ReorgDetection.getHashByBlockNumber(~blockNumber) {
-      | Js.Null.Value(hash) =>
+      | Null.Value(hash) =>
         let checkpointId = prevCheckpointId.contents->BigInt.add(1n)
         prevCheckpointId := checkpointId
 
-        mutCheckpointIds->Js.Array2.push(checkpointId)->ignore
-        mutCheckpointChainIds->Js.Array2.push(chainId)->ignore
-        mutCheckpointBlockNumbers->Js.Array2.push(blockNumber)->ignore
-        mutCheckpointBlockHashes->Js.Array2.push(Js.Null.Value(hash))->ignore
-        mutCheckpointEventsProcessed->Js.Array2.push(0)->ignore
-      | Js.Null.Null => ()
+        mutCheckpointIds->Array.push(checkpointId)
+        mutCheckpointChainIds->Array.push(chainId)
+        mutCheckpointBlockNumbers->Array.push(blockNumber)
+        mutCheckpointBlockHashes->Array.push(Null.Value(hash))
+        mutCheckpointEventsProcessed->Array.push(0)
+      | Null.Null => ()
       }
     }
     prevCheckpointId.contents
@@ -224,8 +222,8 @@ let prepareOrderedBatch = (
   let totalBatchSize = ref(0)
   let isFinished = ref(false)
   let prevCheckpointId = ref(checkpointIdBeforeBatch)
-  let mutBatchSizePerChain = Js.Dict.empty()
-  let mutProgressBlockNumberPerChain = Js.Dict.empty()
+  let mutBatchSizePerChain = Dict.make()
+  let mutProgressBlockNumberPerChain = Dict.make()
 
   let fetchStates = chainsBeforeBatch->ChainMap.map(chainBeforeBatch => chainBeforeBatch.fetchState)
 
@@ -283,30 +281,30 @@ let prepareOrderedBatch = (
           let checkpointId = prevCheckpointId.contents->BigInt.add(1n)
 
           items
-          ->Js.Array2.push(item0)
+          ->Array.push(item0)
           ->ignore
           for idx in 1 to newItemsCount - 1 {
             items
-            ->Js.Array2.push(fetchState.buffer->Belt.Array.getUnsafe(itemsCountBefore + idx))
+            ->Array.push(fetchState.buffer->Belt.Array.getUnsafe(itemsCountBefore + idx))
             ->ignore
           }
 
           checkpointIds
-          ->Js.Array2.push(checkpointId)
+          ->Array.push(checkpointId)
           ->ignore
           checkpointChainIds
-          ->Js.Array2.push(fetchState.chainId)
+          ->Array.push(fetchState.chainId)
           ->ignore
           checkpointBlockNumbers
-          ->Js.Array2.push(blockNumber)
+          ->Array.push(blockNumber)
           ->ignore
           checkpointBlockHashes
-          ->Js.Array2.push(
+          ->Array.push(
             chainBeforeBatch.reorgDetection->ReorgDetection.getHashByBlockNumber(~blockNumber),
           )
           ->ignore
           checkpointEventsProcessed
-          ->Js.Array2.push(newItemsCount)
+          ->Array.push(newItemsCount)
           ->ignore
 
           prevCheckpointId := checkpointId
@@ -371,7 +369,7 @@ let prepareUnorderedBatch = (
   let preparedFetchStates =
     chainsBeforeBatch
     ->ChainMap.values
-    ->Js.Array2.map(chainBeforeBatch => chainBeforeBatch.fetchState)
+    ->Array.map(chainBeforeBatch => chainBeforeBatch.fetchState)
     ->FetchState.sortForUnorderedBatch(~batchSizeTarget)
 
   let chainIdx = ref(0)
@@ -379,8 +377,8 @@ let prepareUnorderedBatch = (
   let totalBatchSize = ref(0)
 
   let prevCheckpointId = ref(checkpointIdBeforeBatch)
-  let mutBatchSizePerChain = Js.Dict.empty()
-  let mutProgressBlockNumberPerChain = Js.Dict.empty()
+  let mutBatchSizePerChain = Dict.make()
+  let mutProgressBlockNumberPerChain = Dict.make()
 
   let items = []
   let checkpointIds = []
@@ -393,7 +391,7 @@ let prepareUnorderedBatch = (
   // the way to group as many items from a single chain as possible
   // This way the loaders optimisations will hit more often
   while totalBatchSize.contents < batchSizeTarget && chainIdx.contents < preparedNumber {
-    let fetchState = preparedFetchStates->Js.Array2.unsafe_get(chainIdx.contents)
+    let fetchState = preparedFetchStates->Array.getUnsafe(chainIdx.contents)
     let chainBatchSize =
       fetchState->FetchState.getReadyItemsCount(
         ~targetSize=batchSizeTarget - totalBatchSize.contents,
@@ -426,15 +424,15 @@ let prepareUnorderedBatch = (
 
           let checkpointId = prevCheckpointId.contents->BigInt.add(1n)
 
-          checkpointIds->Js.Array2.push(checkpointId)->ignore
-          checkpointChainIds->Js.Array2.push(fetchState.chainId)->ignore
-          checkpointBlockNumbers->Js.Array2.push(blockNumber)->ignore
+          checkpointIds->Array.push(checkpointId)->ignore
+          checkpointChainIds->Array.push(fetchState.chainId)->ignore
+          checkpointBlockNumbers->Array.push(blockNumber)->ignore
           checkpointBlockHashes
-          ->Js.Array2.push(
+          ->Array.push(
             chainBeforeBatch.reorgDetection->ReorgDetection.getHashByBlockNumber(~blockNumber),
           )
           ->ignore
-          checkpointEventsProcessed->Js.Array2.push(1)->ignore
+          checkpointEventsProcessed->Array.push(1)->ignore
 
           prevBlockNumber := blockNumber
           prevCheckpointId := checkpointId
@@ -448,7 +446,7 @@ let prepareUnorderedBatch = (
           ->ignore
         }
 
-        items->Js.Array2.push(item)->ignore
+        items->Array.push(item)->ignore
       }
 
       totalBatchSize := totalBatchSize.contents + chainBatchSize