envio 3.2.1 → 3.3.0-alpha.1

package/src/tui/Tui.res

@@ -134,11 +134,11 @@ module App = {
   @react.component
   let make = (~getState) => {
     let stdoutColumns = Hooks.useStdoutColumns()
-    // GlobalState is mutated in place — passing the same ref to useState
+    // IndexerState is mutated in place — passing the same ref to useState
     // would bail out via Object.is and skip the re-render. Tick a counter
     // instead and read state freshly from getState() on every render.
     let (tick, setTick) = React.useState(() => 0)
-    let state: GlobalState.t = getState()
+    let state: IndexerState.t = getState()
 
     React.useEffect(() => {
       let intervalId = setInterval(() => {
@@ -153,18 +153,22 @@ module App = {
     }, [getState])
 
     let chains =
-      state.chainManager.chainFetchers
-      ->ChainMap.values
-      ->Array.map(cf => {
-        let {numEventsProcessed, fetchState} = cf
+      state
+      ->IndexerState.chainStates
+      ->Dict.valuesToArray
+      ->Array.map(cs => {
+        let numEventsProcessed = cs->ChainState.numEventsProcessed
+        let fetchState = cs->ChainState.fetchState
+        let committedProgressBlockNumber = cs->ChainState.committedProgressBlockNumber
+        let timestampCaughtUpToHeadOrEndblock = cs->ChainState.timestampCaughtUpToHeadOrEndblock
+        let sourceManager = cs->ChainState.sourceManager
         let latestFetchedBlockNumber = Pervasives.max(fetchState->FetchState.bufferBlockNumber, 0)
-        let hasProcessedToEndblock = cf->ChainFetcher.hasProcessedToEndblock
-        let knownHeight =
-          cf->ChainFetcher.hasProcessedToEndblock
-            ? cf.fetchState.endBlock->Option.getOr(cf.fetchState.knownHeight)
-            : cf.fetchState.knownHeight
+        let hasProcessedToEndblock = cs->ChainState.hasProcessedToEndblock
+        let knownHeight = hasProcessedToEndblock
+          ? fetchState.endBlock->Option.getOr(fetchState.knownHeight)
+          : fetchState.knownHeight
 
-        let firstEventBlock = cf.fetchState.firstEventBlock
+        let firstEventBlock = fetchState.firstEventBlock
         let progress: TuiData.progress = if hasProcessedToEndblock {
           // If the endblock has been reached then set the progress to synced.
           // if there's chains that have no events in the block range start->end,
@@ -172,25 +176,25 @@ module App = {
           // This ensures TUI still displays synced in this case
           Synced({
             firstEventBlockNumber: firstEventBlock->Option.getOr(0),
-            latestProcessedBlock: cf.committedProgressBlockNumber,
-            timestampCaughtUpToHeadOrEndblock: cf.timestampCaughtUpToHeadOrEndblock->Option.getOr(
+            latestProcessedBlock: committedProgressBlockNumber,
+            timestampCaughtUpToHeadOrEndblock: timestampCaughtUpToHeadOrEndblock->Option.getOr(
               Date.now()->Date.fromTime,
             ),
             numEventsProcessed,
           })
         } else {
-          switch (firstEventBlock, cf.timestampCaughtUpToHeadOrEndblock) {
+          switch (firstEventBlock, timestampCaughtUpToHeadOrEndblock) {
           | (Some(firstEventBlockNumber), Some(timestampCaughtUpToHeadOrEndblock)) =>
             Synced({
               firstEventBlockNumber,
-              latestProcessedBlock: cf.committedProgressBlockNumber,
+              latestProcessedBlock: committedProgressBlockNumber,
               timestampCaughtUpToHeadOrEndblock,
               numEventsProcessed,
             })
           | (Some(firstEventBlockNumber), None) =>
             Syncing({
               firstEventBlockNumber,
-              latestProcessedBlock: cf.committedProgressBlockNumber,
+              latestProcessedBlock: committedProgressBlockNumber,
               numEventsProcessed,
             })
           | (None, _) => SearchingForEvents
@@ -203,25 +207,23 @@ module App = {
             knownHeight,
             latestFetchedBlockNumber,
             eventsProcessed: numEventsProcessed,
-            chainId: cf.chainConfig.id->Int.toString,
-            progressBlock: cf.committedProgressBlockNumber < cf.fetchState.startBlock
-              ? Some(cf.fetchState.startBlock)
-              : Some(cf.committedProgressBlockNumber),
+            chainId: (cs->ChainState.chainConfig).id->Int.toString,
+            progressBlock: committedProgressBlockNumber < fetchState.startBlock
+              ? Some(fetchState.startBlock)
+              : Some(committedProgressBlockNumber),
             bufferBlock: Some(latestFetchedBlockNumber),
-            sourceBlock: Some(cf.fetchState.knownHeight),
-            firstEventBlockNumber: cf.fetchState.firstEventBlock,
-            startBlock: cf.fetchState.startBlock,
-            endBlock: cf.fetchState.endBlock,
-            poweredByHyperSync: (
-              cf.sourceManager->SourceManager.getActiveSource
-            ).poweredByHyperSync,
-            blockUnit: switch state.ctx.config.ecosystem.name {
+            sourceBlock: Some(fetchState.knownHeight),
+            firstEventBlockNumber: fetchState.firstEventBlock,
+            startBlock: fetchState.startBlock,
+            endBlock: fetchState.endBlock,
+            poweredByHyperSync: (sourceManager->SourceManager.getActiveSource).poweredByHyperSync,
+            blockUnit: switch (state->IndexerState.config).ecosystem.name {
             | Svm => "Slot"
             | Evm | Fuel => "Block"
             },
-            rateLimitTimeMs: cf.sourceManager->SourceManager.getRateLimitTimeMs,
-            isRateLimited: cf.sourceManager->SourceManager.isRateLimited,
-            rateLimitResetInMs: cf.sourceManager->SourceManager.getRateLimitResetInMs,
+            rateLimitTimeMs: sourceManager->SourceManager.getRateLimitTimeMs,
+            isRateLimited: sourceManager->SourceManager.isRateLimited,
+            rateLimitResetInMs: sourceManager->SourceManager.getRateLimitResetInMs,
           }: TuiData.chain
         )
       })
@@ -269,7 +271,7 @@ module App = {
         totalEventsProcessed
         eventsPerSecond={SyncETA.isIndexerFullySynced(chains) ? None : eventsPerSecond}
       />
-      <SyncETA chains indexerStartTime=state.indexerStartTime />
+      <SyncETA chains indexerStartTime={state->IndexerState.indexerStartTime} />
       {
         let maxRateLimitTimeMs =
           chains->Array.reduce(0., (acc, chain) => Pervasives.max(acc, chain.rateLimitTimeMs))
@@ -315,7 +317,7 @@ module App = {
           }
         }
       </Box>
-      {if state.ctx.config.isDev {
+      {if (state->IndexerState.config).isDev {
         <Box flexDirection={Row}>
           <Text> {"Dev Console: "->React.string} </Text>
           <Text color={Info} underline=true> {`${Env.envioAppUrl}/console`->React.string} </Text>
@@ -323,7 +325,7 @@ module App = {
       } else {
         React.null
       }}
-      {switch (state.ctx.config.storage.clickhouse, Env.ClickHouse.host()) {
+      {switch ((state->IndexerState.config).storage.clickhouse, Env.ClickHouse.host()) {
       | (true, Some(host)) =>
         <Box flexDirection={Row}>
           <Text> {"ClickHouse: "->React.string} </Text>
@@ -331,7 +333,7 @@ module App = {
         </Box>
       | _ => React.null
       }}
-      <Messages config=state.ctx.config />
+      <Messages config={state->IndexerState.config} />
     </Box>
   }
 }

package/src/tui/Tui.res.mjs

@@ -6,10 +6,10 @@ import * as Ink$1 from "ink";
 import * as React from "react";
 import * as SyncETA from "./components/SyncETA.res.mjs";
 import * as TuiData from "./components/TuiData.res.mjs";
-import * as ChainMap from "../ChainMap.res.mjs";
 import * as Messages from "./components/Messages.res.mjs";
+import * as ChainState from "../ChainState.res.mjs";
 import * as FetchState from "../FetchState.res.mjs";
-import * as ChainFetcher from "../ChainFetcher.res.mjs";
+import * as IndexerState from "../IndexerState.res.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import InkBigText from "ink-big-text";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
@@ -207,47 +207,47 @@ function Tui$App(props) {
       clearInterval(intervalId);
     };
   }, [getState]);
-  let chains = ChainMap.values(state.chainManager.chainFetchers).map(cf => {
-    let numEventsProcessed = cf.numEventsProcessed;
-    let latestFetchedBlockNumber = Primitive_int.max(FetchState.bufferBlockNumber(cf.fetchState), 0);
-    let hasProcessedToEndblock = ChainFetcher.hasProcessedToEndblock(cf);
-    let knownHeight = ChainFetcher.hasProcessedToEndblock(cf) ? Stdlib_Option.getOr(cf.fetchState.endBlock, cf.fetchState.knownHeight) : cf.fetchState.knownHeight;
-    let firstEventBlock = cf.fetchState.firstEventBlock;
-    let progress;
-    if (hasProcessedToEndblock) {
-      progress = {
+  let chains = Object.values(IndexerState.chainStates(state)).map(cs => {
+    let numEventsProcessed = ChainState.numEventsProcessed(cs);
+    let fetchState = ChainState.fetchState(cs);
+    let committedProgressBlockNumber = ChainState.committedProgressBlockNumber(cs);
+    let timestampCaughtUpToHeadOrEndblock = ChainState.timestampCaughtUpToHeadOrEndblock(cs);
+    let sourceManager = ChainState.sourceManager(cs);
+    let latestFetchedBlockNumber = Primitive_int.max(FetchState.bufferBlockNumber(fetchState), 0);
+    let hasProcessedToEndblock = ChainState.hasProcessedToEndblock(cs);
+    let knownHeight = hasProcessedToEndblock ? Stdlib_Option.getOr(fetchState.endBlock, fetchState.knownHeight) : fetchState.knownHeight;
+    let firstEventBlock = fetchState.firstEventBlock;
+    let progress = hasProcessedToEndblock ? ({
         TAG: "Synced",
         _0: {
           firstEventBlockNumber: Stdlib_Option.getOr(firstEventBlock, 0),
-          latestProcessedBlock: cf.committedProgressBlockNumber,
+          latestProcessedBlock: committedProgressBlockNumber,
           numEventsProcessed: numEventsProcessed,
-          timestampCaughtUpToHeadOrEndblock: Stdlib_Option.getOr(cf.timestampCaughtUpToHeadOrEndblock, new Date(Date.now()))
+          timestampCaughtUpToHeadOrEndblock: Stdlib_Option.getOr(timestampCaughtUpToHeadOrEndblock, new Date(Date.now()))
         }
-      };
-    } else {
-      let match = cf.timestampCaughtUpToHeadOrEndblock;
-      progress = firstEventBlock !== undefined ? (
-          match !== undefined ? ({
-              TAG: "Synced",
-              _0: {
-                firstEventBlockNumber: firstEventBlock,
-                latestProcessedBlock: cf.committedProgressBlockNumber,
-                numEventsProcessed: numEventsProcessed,
-                timestampCaughtUpToHeadOrEndblock: match
-              }
-            }) : ({
-              TAG: "Syncing",
-              _0: {
-                firstEventBlockNumber: firstEventBlock,
-                latestProcessedBlock: cf.committedProgressBlockNumber,
-                numEventsProcessed: numEventsProcessed
-              }
-            })
-        ) : "SearchingForEvents";
-    }
-    let match$1 = state.ctx.config.ecosystem.name;
+      }) : (
+        firstEventBlock !== undefined ? (
+            timestampCaughtUpToHeadOrEndblock !== undefined ? ({
+                TAG: "Synced",
+                _0: {
+                  firstEventBlockNumber: firstEventBlock,
+                  latestProcessedBlock: committedProgressBlockNumber,
+                  numEventsProcessed: numEventsProcessed,
+                  timestampCaughtUpToHeadOrEndblock: timestampCaughtUpToHeadOrEndblock
+                }
+              }) : ({
+                TAG: "Syncing",
+                _0: {
+                  firstEventBlockNumber: firstEventBlock,
+                  latestProcessedBlock: committedProgressBlockNumber,
+                  numEventsProcessed: numEventsProcessed
+                }
+              })
+          ) : "SearchingForEvents"
+      );
+    let match = IndexerState.config(state).ecosystem.name;
     let tmp;
-    switch (match$1) {
+    switch (match) {
       case "evm" :
       case "fuel" :
         tmp = "Block";
@@ -257,22 +257,22 @@ function Tui$App(props) {
         break;
     }
     return {
-      chainId: cf.chainConfig.id.toString(),
+      chainId: ChainState.chainConfig(cs).id.toString(),
       eventsProcessed: numEventsProcessed,
-      progressBlock: cf.committedProgressBlockNumber < cf.fetchState.startBlock ? cf.fetchState.startBlock : cf.committedProgressBlockNumber,
+      progressBlock: committedProgressBlockNumber < fetchState.startBlock ? fetchState.startBlock : committedProgressBlockNumber,
       bufferBlock: latestFetchedBlockNumber,
-      sourceBlock: cf.fetchState.knownHeight,
-      startBlock: cf.fetchState.startBlock,
-      endBlock: cf.fetchState.endBlock,
-      firstEventBlockNumber: cf.fetchState.firstEventBlock,
-      poweredByHyperSync: SourceManager.getActiveSource(cf.sourceManager).poweredByHyperSync,
+      sourceBlock: fetchState.knownHeight,
+      startBlock: fetchState.startBlock,
+      endBlock: fetchState.endBlock,
+      firstEventBlockNumber: fetchState.firstEventBlock,
+      poweredByHyperSync: SourceManager.getActiveSource(sourceManager).poweredByHyperSync,
       progress: progress,
       latestFetchedBlockNumber: latestFetchedBlockNumber,
       knownHeight: knownHeight,
       blockUnit: tmp,
-      rateLimitTimeMs: SourceManager.getRateLimitTimeMs(cf.sourceManager),
-      isRateLimited: SourceManager.isRateLimited(cf.sourceManager),
-      rateLimitResetInMs: SourceManager.getRateLimitResetInMs(cf.sourceManager)
+      rateLimitTimeMs: SourceManager.getRateLimitTimeMs(sourceManager),
+      isRateLimited: SourceManager.isRateLimited(sourceManager),
+      rateLimitResetInMs: SourceManager.getRateLimitResetInMs(sourceManager)
     };
   });
   let totalEventsProcessed = Stdlib_Array.reduce(chains, 0, (acc, chain) => acc + chain.eventsProcessed);
@@ -329,7 +329,7 @@ function Tui$App(props) {
     tmp = null;
   }
   let defaultPassword = "testing";
-  let match$1 = state.ctx.config.storage.clickhouse;
+  let match$1 = IndexerState.config(state).storage.clickhouse;
   let match$2 = Env.ClickHouse.host();
   return JsxRuntime.jsxs(Ink$1.Box, {
     children: [
@@ -362,7 +362,7 @@ function Tui$App(props) {
       }),
       JsxRuntime.jsx(SyncETA.make, {
         chains: chains,
-        indexerStartTime: state.indexerStartTime
+        indexerStartTime: IndexerState.indexerStartTime(state)
       }),
       tmp,
       JsxRuntime.jsx(Ink.Newline.make, {}),
@@ -383,7 +383,7 @@ function Tui$App(props) {
         ],
         flexDirection: "row"
       }),
-      state.ctx.config.isDev ? JsxRuntime.jsxs(Ink$1.Box, {
+      IndexerState.config(state).isDev ? JsxRuntime.jsxs(Ink$1.Box, {
           children: [
             JsxRuntime.jsx(Ink$1.Text, {
               children: "Dev Console: "
@@ -410,7 +410,7 @@ function Tui$App(props) {
           flexDirection: "row"
         }) : null,
       JsxRuntime.jsx(Messages.make, {
-        config: state.ctx.config
+        config: IndexerState.config(state)
       })
     ],
     flexDirection: "column"