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

package/src/sources/SourceManager.resi

@@ -15,6 +15,7 @@ let make: (
   ~newBlockStallTimeout: int=?,
   ~newBlockStallTimeoutLive: int=?,
   ~stalledPollingInterval: int=?,
+  ~reducedPollingInterval: int=?,
   ~recoveryTimeout: float=?,
   ~getHeightRetryInterval: (~retry: int) => int=?,
 ) => t
@@ -30,7 +31,7 @@ let fetchNext: (
   ~stateId: int,
 ) => promise<unit>
 
-let waitForNewBlock: (t, ~knownHeight: int, ~isLive: bool) => promise<int>
+let waitForNewBlock: (t, ~knownHeight: int, ~isLive: bool, ~reducedPolling: bool) => promise<int>
 
 let executeQuery: (
   t,

package/src/sources/Svm.res

@@ -2,7 +2,7 @@
 @get external getTimestamp: Internal.eventBlock => int = "time"
 @get external getId: Internal.eventBlock => string = "hash"
 
-let cleanUpRawEventFieldsInPlace: Js.Json.t => unit = %raw(`fields => {
+let cleanUpRawEventFieldsInPlace: JSON.t => unit = %raw(`fields => {
     delete fields.hash
     delete fields.height
     delete fields.time
@@ -19,6 +19,13 @@ let ecosystem: Ecosystem.t = {
   getTimestamp,
   getId,
   cleanUpRawEventFieldsInPlace,
+  onBlockMethodName: "onSlot",
+  // SVM filter shape: `{slot: {_gte?, _lte?, _every?}}`.
+  // Inner range chunk parsed by `blockRangeSchema` in `Main.res`.
+  onBlockFilterSchema: S.object(s => s.field("slot", S.option(S.unknown))),
+  // SVM has no event handlers, so there is no `onEvent` `where` value to
+  // parse. The schema is a no-op object that always surfaces `None`.
+  onEventBlockFilterSchema: S.object(_ => None),
 }
 
 module GetFinalizedSlot = {
@@ -38,7 +45,7 @@ let makeRPCSource = (~chain, ~rpc: string): Source.t => {
 
   let urlHost = switch Utils.Url.getHostFromUrl(rpc) {
   | None =>
-    Js.Exn.raiseError(
+    JsError.throwWithMessage(
       `The RPC url for chain ${chainId->Belt.Int.toString} is in incorrect format. The RPC url needs to start with either http:// or https://`,
     )
   | Some(host) => host
@@ -52,7 +59,7 @@ let makeRPCSource = (~chain, ~rpc: string): Source.t => {
     poweredByHyperSync: false,
     pollingInterval: 10_000,
     getBlockHashes: (~blockNumbers as _, ~logger as _) =>
-      Js.Exn.raiseError("Svm does not support getting block hashes"),
+      JsError.throwWithMessage("Svm does not support getting block hashes"),
     getHeightOrThrow: async () => {
       let timerRef = Hrtime.makeTimer()
       let height = await GetFinalizedSlot.route->Rest.fetch((), ~client)
@@ -70,12 +77,12 @@ let makeRPCSource = (~chain, ~rpc: string): Source.t => {
       ~fromBlock as _,
       ~toBlock as _,
       ~addressesByContractName as _,
-      ~indexingContracts as _,
+      ~indexingAddresses as _,
       ~knownHeight as _,
       ~partitionId as _,
       ~selection as _,
       ~retry as _,
       ~logger as _,
-    ) => Js.Exn.raiseError("Svm does not support getting items"),
+    ) => JsError.throwWithMessage("Svm does not support getting items"),
   }
 }

package/src/sources/Svm.res.mjs

@@ -4,19 +4,19 @@ import * as Rpc from "./Rpc.res.mjs";
 import * as Rest from "../vendored/Rest.res.mjs";
 import * as Utils from "../Utils.res.mjs";
 import * as Hrtime from "../bindings/Hrtime.res.mjs";
-import * as Js_exn from "rescript/lib/es6/js_exn.js";
 import * as Prometheus from "../Prometheus.res.mjs";
+import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 
-var cleanUpRawEventFieldsInPlace = (fields => {
+let cleanUpRawEventFieldsInPlace = (fields => {
     delete fields.hash
     delete fields.height
     delete fields.time
   });
 
-var ecosystem_blockFields = ["slot"];
+let ecosystem_blockFields = ["slot"];
 
-var ecosystem_transactionFields = [];
+let ecosystem_transactionFields = [];
 
 function ecosystem_getNumber(prim) {
   return prim.height;
@@ -30,7 +30,11 @@ function ecosystem_getId(prim) {
   return prim.hash;
 }
 
-var ecosystem = {
+let ecosystem_onBlockFilterSchema = S$RescriptSchema.object(s => s.f("slot", S$RescriptSchema.option(S$RescriptSchema.unknown)));
+
+let ecosystem_onEventBlockFilterSchema = S$RescriptSchema.object(param => {});
+
+let ecosystem = {
   name: "svm",
   blockFields: ecosystem_blockFields,
   transactionFields: ecosystem_transactionFields,
@@ -40,51 +44,50 @@ var ecosystem = {
   getNumber: ecosystem_getNumber,
   getTimestamp: ecosystem_getTimestamp,
   getId: ecosystem_getId,
-  cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace
+  cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace,
+  onBlockMethodName: "onSlot",
+  onBlockFilterSchema: ecosystem_onBlockFilterSchema,
+  onEventBlockFilterSchema: ecosystem_onEventBlockFilterSchema
 };
 
-var route = Rpc.makeRpcRoute("getSlot", S$RescriptSchema.tuple(function (s) {
-          s.tag(0, {
-                commitment: "finalized"
-              });
-        }), S$RescriptSchema.$$int);
+let route = Rpc.makeRpcRoute("getSlot", S$RescriptSchema.tuple(s => {
+  s.tag(0, {
+    commitment: "finalized"
+  });
+}), S$RescriptSchema.int);
 
-var GetFinalizedSlot = {
+let GetFinalizedSlot = {
   route: route
 };
 
 function makeRPCSource(chain, rpc) {
-  var client = Rest.client(rpc, undefined);
-  var host = Utils.Url.getHostFromUrl(rpc);
-  var urlHost = host !== undefined ? host : Js_exn.raiseError("The RPC url for chain " + String(chain) + " is in incorrect format. The RPC url needs to start with either http:// or https://");
-  var name = "RPC (" + urlHost + ")";
+  let client = Rest.client(rpc, undefined);
+  let host = Utils.Url.getHostFromUrl(rpc);
+  let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + String(chain) + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
+  let name = `RPC (` + urlHost + `)`;
   return {
-          name: name,
-          sourceFor: "Sync",
-          chain: chain,
-          poweredByHyperSync: false,
-          pollingInterval: 10000,
-          getBlockHashes: (function (param, param$1) {
-              return Js_exn.raiseError("Svm does not support getting block hashes");
-            }),
-          getHeightOrThrow: (async function () {
-              var timerRef = Hrtime.makeTimer();
-              var height = await Rest.$$fetch(route, undefined, client);
-              var seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
-              Prometheus.SourceRequestCount.increment(name, chain, "getSlot");
-              Prometheus.SourceRequestCount.addSeconds(name, chain, "getSlot", seconds);
-              return height;
-            }),
-          getItemsOrThrow: (function (param, param$1, param$2, param$3, param$4, param$5, param$6, param$7, param$8) {
-              return Js_exn.raiseError("Svm does not support getting items");
-            })
-        };
+    name: name,
+    sourceFor: "Sync",
+    chain: chain,
+    poweredByHyperSync: false,
+    pollingInterval: 10000,
+    getBlockHashes: (param, param$1) => Stdlib_JsError.throwWithMessage("Svm does not support getting block hashes"),
+    getHeightOrThrow: async () => {
+      let timerRef = Hrtime.makeTimer();
+      let height = await Rest.fetch(route, undefined, client);
+      let seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
+      Prometheus.SourceRequestCount.increment(name, chain, "getSlot");
+      Prometheus.SourceRequestCount.addSeconds(name, chain, "getSlot", seconds);
+      return height;
+    },
+    getItemsOrThrow: (param, param$1, param$2, param$3, param$4, param$5, param$6, param$7, param$8) => Stdlib_JsError.throwWithMessage("Svm does not support getting items")
+  };
 }
 
 export {
-  cleanUpRawEventFieldsInPlace ,
-  ecosystem ,
-  GetFinalizedSlot ,
-  makeRPCSource ,
+  cleanUpRawEventFieldsInPlace,
+  ecosystem,
+  GetFinalizedSlot,
+  makeRPCSource,
 }
-/* route Not a pure module */
+/* ecosystem Not a pure module */

package/src/tui/Tui.res

@@ -1,5 +1,4 @@
 open Ink
-open Belt
 
 module ChainLine = {
   @react.component
@@ -100,13 +99,13 @@ module App = {
 
     // useEffect to refresh state every 500ms
     React.useEffect(() => {
-      let intervalId = Js.Global.setInterval(() => {
+      let intervalId = setInterval(() => {
         setState(_ => getState())
       }, 500)
 
       Some(
         () => {
-          Js.Global.clearInterval(intervalId)
+          clearInterval(intervalId)
         },
       )
     }, [getState])
@@ -120,7 +119,7 @@ module App = {
         let hasProcessedToEndblock = cf->ChainFetcher.hasProcessedToEndblock
         let knownHeight =
           cf->ChainFetcher.hasProcessedToEndblock
-            ? cf.fetchState.endBlock->Option.getWithDefault(cf.fetchState.knownHeight)
+            ? cf.fetchState.endBlock->Option.getOr(cf.fetchState.knownHeight)
             : cf.fetchState.knownHeight
 
         let firstEventBlock = cf.fetchState.firstEventBlock
@@ -130,10 +129,10 @@ module App = {
           // it's possible there are no events in that block  range (ie firstEventBlock = None)
           // This ensures TUI still displays synced in this case
           Synced({
-            firstEventBlockNumber: firstEventBlock->Option.getWithDefault(0),
+            firstEventBlockNumber: firstEventBlock->Option.getOr(0),
             latestProcessedBlock: cf.committedProgressBlockNumber,
-            timestampCaughtUpToHeadOrEndblock: cf.timestampCaughtUpToHeadOrEndblock->Option.getWithDefault(
-              Js.Date.now()->Js.Date.fromFloat,
+            timestampCaughtUpToHeadOrEndblock: cf.timestampCaughtUpToHeadOrEndblock->Option.getOr(
+              Date.now()->Date.fromTime,
             ),
             numEventsProcessed,
           })
@@ -199,7 +198,7 @@ module App = {
       />
       <Newline />
       {chains
-      ->Array.mapWithIndex((i, chainData) => {
+      ->Array.mapWithIndex((chainData, i) => {
         <ChainLine
           key={i->Int.toString}
           chainId={chainData.chainId}
@@ -230,10 +229,22 @@ module App = {
           }
         }
       </Box>
-      <Box flexDirection={Row}>
-        <Text> {"Dev Console: "->React.string} </Text>
-        <Text color={Info} underline=true> {`${Env.envioAppUrl}/console`->React.string} </Text>
-      </Box>
+      {if Envio.isDevMode() {
+        <Box flexDirection={Row}>
+          <Text> {"Dev Console: "->React.string} </Text>
+          <Text color={Info} underline=true> {`${Env.envioAppUrl}/console`->React.string} </Text>
+        </Box>
+      } else {
+        React.null
+      }}
+      {switch (state.ctx.config.storage.clickhouse, Env.ClickHouse.host()) {
+      | (true, Some(host)) =>
+        <Box flexDirection={Row}>
+          <Text> {"ClickHouse: "->React.string} </Text>
+          <Text color={Info} underline=true> {`${host}/play`->React.string} </Text>
+        </Box>
+      | _ => React.null
+      }}
       <Messages config=state.ctx.config />
     </Box>
   }