envio 3.11.0 → 3.12.1

package/src/tui/components/TuiData.res

@@ -10,22 +10,17 @@ type synced = {
 
 type progress = SearchingForEvents | Syncing(syncing) | Synced(synced)
 
-let getNumberOfEventsProccessed = (progress: progress) => {
-  switch progress {
-  | SearchingForEvents => 0.
-  | Syncing(syncing) => syncing.numEventsProcessed
-  | Synced(synced) => synced.numEventsProcessed
-  }
-}
 type chain = {
   chainId: string,
   eventsProcessed: float,
-  progressBlock: option<int>,
-  bufferBlock: option<int>,
-  sourceBlock: option<int>,
+  // Clamped into [startBlock, toBlock]: the source height is 0 until the first
+  // height fetch lands, and the buffer starts one block below startBlock, so raw
+  // values can fall outside the range the progress bar counts up to.
+  progressBlock: int,
+  bufferBlock: int,
+  toBlock: int,
   startBlock: int,
   endBlock: option<int>,
-  firstEventBlockNumber: option<int>,
   poweredByHyperSync: bool,
   progress: progress,
   latestFetchedBlockNumber: int,
@@ -34,14 +29,64 @@ type chain = {
    `"Blocks"` everywhere else. Drives the per-chain progress label. */
   blockUnit: string,
   rateLimitTimeMs: float,
-  isRateLimited: bool,
   rateLimitResetInMs: option<float>,
 }
 
-let minOfOption: (int, option<int>) => int = (a: int, b: option<int>) => {
-  switch (a, b) {
-  | (a, Some(b)) => min(a, b)
-  | (a, None) => a
+let fromChainMetrics = (m: Metrics.chainMetrics, ~blockUnit): chain => {
+  // A chain can reach its end block without ever matching an event, so it
+  // still has to render as synced with no first event block to report.
+  let firstEventBlockNumber = m.firstEventBlockNumber->Option.getOr(0)
+  let syncing: syncing = {
+    firstEventBlockNumber,
+    latestProcessedBlock: m.progressBlockNumber,
+    numEventsProcessed: m.numEventsProcessed,
+  }
+  let synced = (~timestampCaughtUpToHeadOrEndblock): progress => Synced({
+    firstEventBlockNumber,
+    latestProcessedBlock: m.progressBlockNumber,
+    numEventsProcessed: m.numEventsProcessed,
+    timestampCaughtUpToHeadOrEndblock,
+  })
+  let progress = if m->Metrics.hasProcessedToEndblock {
+    synced(
+      ~timestampCaughtUpToHeadOrEndblock=m.timestampCaughtUpToHeadOrEndblock->Option.getOr(
+        Date.now()->Date.fromTime,
+      ),
+    )
+  } else {
+    switch (m.firstEventBlockNumber, m.timestampCaughtUpToHeadOrEndblock) {
+    | (Some(_), Some(timestampCaughtUpToHeadOrEndblock)) =>
+      synced(~timestampCaughtUpToHeadOrEndblock)
+    | (Some(_), None) => Syncing(syncing)
+    | (None, _) => SearchingForEvents
+    }
+  }
+
+  let toBlock = Pervasives.max(
+    switch m.endBlock {
+    | Some(endBlock) => Pervasives.min(m.sourceBlockNumber, endBlock)
+    | None => m.sourceBlockNumber
+    },
+    m.startBlock,
+  )
+  let clampToRange = blockNumber =>
+    blockNumber->Pervasives.max(m.startBlock)->Pervasives.min(toBlock)
+
+  {
+    progress,
+    chainId: m.chainId->ChainId.toString,
+    eventsProcessed: m.numEventsProcessed,
+    progressBlock: m.progressBlockNumber->clampToRange,
+    bufferBlock: m.latestFetchedBlockNumber->clampToRange,
+    toBlock,
+    startBlock: m.startBlock,
+    endBlock: m.endBlock,
+    poweredByHyperSync: m.poweredByHyperSync,
+    latestFetchedBlockNumber: m.latestFetchedBlockNumber,
+    knownHeight: m.knownHeight,
+    blockUnit,
+    rateLimitTimeMs: m.rateLimitTimeMs,
+    rateLimitResetInMs: m.rateLimitResetInMs,
   }
 }
 

package/src/tui/components/TuiData.res.mjs

@@ -1,21 +1,60 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as ChainId from "../../ChainId.res.mjs";
+import * as Metrics from "../../Metrics.res.mjs";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 
-function getNumberOfEventsProccessed(progress) {
-  if (typeof progress !== "object") {
-    return 0;
+function fromChainMetrics(m, blockUnit) {
+  let firstEventBlockNumber = Stdlib_Option.getOr(m.firstEventBlockNumber, 0);
+  let syncing_latestProcessedBlock = m.progressBlockNumber;
+  let syncing_numEventsProcessed = m.numEventsProcessed;
+  let syncing = {
+    firstEventBlockNumber: firstEventBlockNumber,
+    latestProcessedBlock: syncing_latestProcessedBlock,
+    numEventsProcessed: syncing_numEventsProcessed
+  };
+  let synced = timestampCaughtUpToHeadOrEndblock => ({
+    TAG: "Synced",
+    _0: {
+      firstEventBlockNumber: firstEventBlockNumber,
+      latestProcessedBlock: m.progressBlockNumber,
+      numEventsProcessed: m.numEventsProcessed,
+      timestampCaughtUpToHeadOrEndblock: timestampCaughtUpToHeadOrEndblock
+    }
+  });
+  let progress;
+  if (Metrics.hasProcessedToEndblock(m)) {
+    progress = synced(Stdlib_Option.getOr(m.timestampCaughtUpToHeadOrEndblock, new Date(Date.now())));
   } else {
-    return progress._0.numEventsProcessed;
-  }
-}
-
-function minOfOption(a, b) {
-  if (b !== undefined) {
-    return Primitive_int.min(a, b);
-  } else {
-    return a;
+    let match = m.firstEventBlockNumber;
+    let match$1 = m.timestampCaughtUpToHeadOrEndblock;
+    progress = match !== undefined ? (
+        match$1 !== undefined ? synced(match$1) : ({
+            TAG: "Syncing",
+            _0: syncing
+          })
+      ) : "SearchingForEvents";
   }
+  let endBlock = m.endBlock;
+  let toBlock = Primitive_int.max(endBlock !== undefined ? Primitive_int.min(m.sourceBlockNumber, endBlock) : m.sourceBlockNumber, m.startBlock);
+  let clampToRange = blockNumber => Primitive_int.min(Primitive_int.max(blockNumber, m.startBlock), toBlock);
+  return {
+    chainId: ChainId.toString(m.chainId),
+    eventsProcessed: m.numEventsProcessed,
+    progressBlock: clampToRange(m.progressBlockNumber),
+    bufferBlock: clampToRange(m.latestFetchedBlockNumber),
+    toBlock: toBlock,
+    startBlock: m.startBlock,
+    endBlock: m.endBlock,
+    poweredByHyperSync: m.poweredByHyperSync,
+    progress: progress,
+    latestFetchedBlockNumber: m.latestFetchedBlockNumber,
+    knownHeight: m.knownHeight,
+    blockUnit: blockUnit,
+    rateLimitTimeMs: m.rateLimitTimeMs,
+    rateLimitResetInMs: m.rateLimitResetInMs
+  };
 }
 
 function formatLocaleString(n) {
@@ -27,9 +66,8 @@ function formatFloatLocaleString(n) {
 }
 
 export {
-  getNumberOfEventsProccessed,
-  minOfOption,
+  fromChainMetrics,
   formatLocaleString,
   formatFloatLocaleString,
 }
-/* No side effect */
+/* ChainId Not a pure module */

package/svm.schema.json

@@ -341,13 +341,6 @@
           "description": "Base58-encoded program id (32 bytes). A single value is allowed only when the config defines one chain; with several, give a mapping keyed by chain id that names every one of them, writing `_` for a chain the program is not deployed on.",
           "$ref": "#/$defs/SvmProgramId"
         },
-        "handler": {
-          "description": "Optional relative path to a file where handlers are registered for the given program. If not provided, handlers can be auto-loaded from the src directory.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
         "idl": {
           "description": "Optional path (relative to config.yaml) to an IDL JSON file (Anchor 0.30+, legacy Anchor, Shank, or Codama). When present, every usable instruction is in the catalog and `onInstruction` selects by name. Omit YAML `instructions` to take that catalog as-is. A YAML row overwrites the IDL instruction of the same name, or adds a name the IDL did not declare.",
           "type": [

package/src/db/CheckpointBounds.res

@@ -1,53 +0,0 @@
-// A checkpoint id per chain that a query compares each chain's rows against. A
-// schema with a cross-chain entity gets one bound for every chain, since a reorg
-// on any chain reaches every chain's rows; otherwise each chain has its own, and
-// a chain absent from them is left alone.
-type t =
-  | EveryChain(Internal.checkpointId)
-  | PerChain(array<(ChainId.t, Internal.checkpointId)>)
-
-// The pieces a query splices in to read its bound as `checkpointId`: a SELECT
-// joins the bounds next to its table with `join`, a DELETE names them with
-// `using` and matches the chain with `usingMatch` in its WHERE.
-type sql = {
-  join: string,
-  using: string,
-  usingMatch: string,
-  checkpointId: string,
-}
-
-// The chain ids are cast to the widest integer type rather than the column's
-// own: nothing indexes the join, so the values only have to compare.
-let relation = `unnest($1::${(Postgres.BigInt :> string)}[],$2::${(Postgres.BigInt :> string)}[]) AS envio_bounds(chain_id, checkpoint_id)`
-
-let sql = (bounds: t, ~chainIdColumn: option<string>, ~tableRef: string): sql =>
-  switch (bounds, chainIdColumn) {
-  | (EveryChain(_), _) => {join: "", using: "", usingMatch: "", checkpointId: "$1"}
-  | (PerChain(_), Some(column)) =>
-    let chainMatch = `envio_bounds.chain_id = ${tableRef}."${column}"`
-    {
-      join: ` JOIN ${relation} ON ${chainMatch}`,
-      using: ` USING ${relation}`,
-      usingMatch: ` AND ${chainMatch}`,
-      checkpointId: "envio_bounds.checkpoint_id",
-    }
-  | (PerChain(_), None) =>
-    JsError.throwWithMessage(
-      "Internal error: per-chain checkpoint bounds can't bound a table with no chain-id column. Only a schema whose entities are all per-chain has them.",
-    )
-  }
-
-// Bound in the order `sql` reads them: the one bound as `$1`, or the chains and
-// their bounds as the two parallel arrays the relation unnests.
-let params = (bounds: t): unknown =>
-  switch bounds {
-  | EveryChain(checkpointId) =>
-    [checkpointId->BigInt.toString]->(Utils.magic: array<string> => unknown)
-  | PerChain(byChain) =>
-    [
-      byChain->Array.map(((chainId, _)) => chainId)->(Utils.magic: array<ChainId.t> => unknown),
-      byChain
-      ->Array.map(((_, checkpointId)) => checkpointId->BigInt.toString)
-      ->(Utils.magic: array<string> => unknown),
-    ]->(Utils.magic: array<unknown> => unknown)
-  }

package/src/db/CheckpointBounds.res.mjs

@@ -1,44 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
-
-let relation = `unnest($1::` + "BIGINT" + `[],$2::` + "BIGINT" + `[]) AS envio_bounds(chain_id, checkpoint_id)`;
-
-function sql(bounds, chainIdColumn, tableRef) {
-  if (bounds.TAG === "EveryChain") {
-    return {
-      join: "",
-      using: "",
-      usingMatch: "",
-      checkpointId: "$1"
-    };
-  }
-  if (chainIdColumn === undefined) {
-    return Stdlib_JsError.throwWithMessage("Internal error: per-chain checkpoint bounds can't bound a table with no chain-id column. Only a schema whose entities are all per-chain has them.");
-  }
-  let chainMatch = `envio_bounds.chain_id = ` + tableRef + `."` + chainIdColumn + `"`;
-  return {
-    join: ` JOIN ` + relation + ` ON ` + chainMatch,
-    using: ` USING ` + relation,
-    usingMatch: ` AND ` + chainMatch,
-    checkpointId: "envio_bounds.checkpoint_id"
-  };
-}
-
-function params(bounds) {
-  if (bounds.TAG === "EveryChain") {
-    return [bounds._0.toString()];
-  }
-  let byChain = bounds._0;
-  return [
-    byChain.map(param => param[0]),
-    byChain.map(param => param[1].toString())
-  ];
-}
-
-export {
-  relation,
-  sql,
-  params,
-}
-/* No side effect */