envio 3.5.0-alpha.3 → 3.5.0-rc.0

package/src/LogSelection.res

@@ -85,7 +85,7 @@ let extractStartBlock = (
 // getter — the enclosing chainObj is a plain JS object.
 let makeChainArg = (
   ~contractName: string,
-  ~chainId: int,
+  ~chainId: ChainId.t,
   ~getAddresses: unit => array<Address.t>,
 ) => {
   let contractObj = Utils.Object.createNullObject()
@@ -125,7 +125,7 @@ let parseWhereOrThrow = {
     ~sighash,
     ~params: array<string>,
     ~contractName: string,
-    ~chainId: int,
+    ~chainId: ChainId.t,
     ~onEventBlockFilterSchema: S.t<option<unknown>>,
     ~topic1=noopGetter,
     ~topic2=noopGetter,

package/src/Main.res

@@ -2,7 +2,7 @@
 // backward compatibility with consumers like RACE — new metric fields stay off
 // the HTTP response.
 type chainData = {
-  chainId: float,
+  chainId: ChainId.t,
   poweredByHyperSync: bool,
   firstEventBlockNumber: option<int>,
   latestProcessedBlock: option<int>,
@@ -46,7 +46,7 @@ let toChainData = (m: Metrics.chainMetrics): chainData => {
 }
 
 let chainDataSchema = S.schema((s): chainData => {
-  chainId: s.matches(S.float),
+  chainId: s.matches(ChainId.schema),
   poweredByHyperSync: s.matches(S.bool),
   firstEventBlockNumber: s.matches(S.option(S.int)),
   latestProcessedBlock: s.matches(S.option(S.int)),
@@ -88,7 +88,7 @@ let getGlobalPersistence = () =>
 let setGlobalPersistence = (persistence: Persistence.t) =>
   EnvioGlobal.value.persistence = Some(persistence->(Utils.magic: Persistence.t => unknown))
 
-let getInitialChainState = (~chainId: int): option<Persistence.initialChainState> => {
+let getInitialChainState = (~chainId: ChainId.t): option<Persistence.initialChainState> => {
   switch getGlobalPersistence() {
   | Some(persistence) =>
     switch persistence.storageStatus {
@@ -107,7 +107,7 @@ let buildChainsObject = (~config: Config.t) => {
   config.chainMap
   ->ChainMap.values
   ->Array.forEach(chainConfig => {
-    let chainIdStr = chainConfig.id->Int.toString
+    let chainIdStr = chainConfig.id->ChainId.toString
 
     chainIds->Array.push(chainConfig.id)->ignore
 
@@ -151,10 +151,7 @@ let buildChainsObject = (~config: Config.t) => {
           | Some(state) => state->IndexerState.isRealtime
           // Before the global state is available (eg during handler
           // module load after resume), derive from persistence: every chain
-          // must have previously caught up to head or endBlock. Mirror the
-          // IndexerState.makeFromDbState path: updateSyncTimeOnRestart wipes
-          // the saved timestamps so a restart re-enters backfill.
-          | None if Env.updateSyncTimeOnRestart => false
+          // must have previously caught up to head or endBlock.
           | None =>
             config.chainMap
             ->ChainMap.values
@@ -183,8 +180,7 @@ let buildChainsObject = (~config: Config.t) => {
           get: () => {
             switch getIndexerState() {
             | Some(state) => {
-                let chain = ChainMap.Chain.makeUnsafe(~chainId=chainConfig.id)
-                let chainState = state->IndexerState.getChainState(~chain)
+                let chainState = state->IndexerState.getChainState(~chainId=chainConfig.id)
                 chainState->ChainState.contractAddresses(~contractName=contract.name)
               }
             // Before the global state is available (eg during handler
@@ -423,7 +419,7 @@ let getGlobalIndexer = (): 'indexer => {
     | "description" => Config.load().description->(Utils.magic: option<string> => unknown)
     | "chainIds" => {
         let (_, chainIds) = buildChainsObject(~config=Config.load())
-        chainIds->(Utils.magic: array<int> => unknown)
+        chainIds->(Utils.magic: array<ChainId.t> => unknown)
       }
     | "chains" => {
         let (chains, _) = buildChainsObject(~config=Config.load())

package/src/Main.res.mjs

@@ -5,6 +5,7 @@ import * as Tui from "./tui/Tui.res.mjs";
 import * as Envio from "./Envio.res.mjs";
 import * as Utils from "./Utils.res.mjs";
 import * as Config from "./Config.res.mjs";
+import * as ChainId from "./ChainId.res.mjs";
 import * as Logging from "./Logging.res.mjs";
 import * as Metrics from "./Metrics.res.mjs";
 import Express from "express";
@@ -46,7 +47,7 @@ function toChainData(m) {
 }
 
 let chainDataSchema = S$RescriptSchema.schema(s => ({
-  chainId: s.m(S$RescriptSchema.float),
+  chainId: s.m(ChainId.schema),
   poweredByHyperSync: s.m(S$RescriptSchema.bool),
   firstEventBlockNumber: s.m(S$RescriptSchema.option(S$RescriptSchema.int)),
   latestProcessedBlock: s.m(S$RescriptSchema.option(S$RescriptSchema.int)),
@@ -110,7 +111,7 @@ function buildChainsObject(config) {
   let chainIds = [];
   let chains = Object.create(null);
   ChainMap.values(config.chainMap).forEach(chainConfig => {
-    let chainIdStr = chainConfig.id.toString();
+    let chainIdStr = ChainId.toString(chainConfig.id);
     chainIds.push(chainConfig.id);
     let chainObj = Object.create(null);
     Object.defineProperty(Object.defineProperty(Object.defineProperty(Object.defineProperty(Object.defineProperty(chainObj, "id", {
@@ -149,8 +150,6 @@ function buildChainsObject(config) {
         let state = EnvioGlobal.value.indexerState;
         if (state !== undefined) {
           return IndexerState.isRealtime(Primitive_option.valFromOption(state));
-        } else if (Env.updateSyncTimeOnRestart) {
-          return false;
         } else {
           return ChainMap.values(config.chainMap).every(c => {
             let chainState = getInitialChainState(c.id);
@@ -176,8 +175,7 @@ function buildChainsObject(config) {
         get: () => {
           let state = EnvioGlobal.value.indexerState;
           if (state !== undefined) {
-            let chain = ChainMap.Chain.makeUnsafe(chainConfig.id);
-            let chainState = IndexerState.getChainState(Primitive_option.valFromOption(state), chain);
+            let chainState = IndexerState.getChainState(Primitive_option.valFromOption(state), chainConfig.id);
             return ChainState.contractAddresses(chainState, contract.name);
           }
           let chainState$1 = getInitialChainState(chainConfig.id);

package/src/Metrics.res

@@ -1,5 +1,5 @@
 type chainMetrics = {
-  chainId: float,
+  chainId: ChainId.t,
   poweredByHyperSync: bool,
   firstEventBlockNumber: option<int>,
   latestProcessedBlock: option<int>,
@@ -84,7 +84,7 @@ type historyPruneMetrics = {
 
 type sourceRequestMetrics = {
   source: string,
-  chainId: int,
+  chainId: ChainId.t,
   method: string,
   count: int,
   seconds: float,
@@ -92,7 +92,7 @@ type sourceRequestMetrics = {
 
 type sourceHeightMetrics = {
   source: string,
-  chainId: int,
+  chainId: ChainId.t,
   height: int,
 }
 
@@ -198,7 +198,7 @@ let single = (b: builder, ~name, ~help, ~kind, ~value) => {
 }
 
 let renderMetrics = (b: builder, metrics: t) => {
-  let chains = metrics.chains->Array.map(m => (`{chainId="${m.chainId->Float.toString}"}`, m))
+  let chains = metrics.chains->Array.map(m => (`{chainId="${m.chainId->ChainId.toString}"}`, m))
   let handlers =
     metrics.handlers->Array.map(s => (
       `{contract="${s.contract->escapeLabelValue}",event="${s.event->escapeLabelValue}"}`,
@@ -224,7 +224,7 @@ let renderMetrics = (b: builder, metrics: t) => {
   let sourceRequests = {
     let byLabels: dict<sourceRequestMetrics> = Dict.make()
     metrics.sourceRequests->Array.forEach(s => {
-      let labels = `{source="${s.source->escapeLabelValue}",chainId="${s.chainId->Int.toString}",method="${s.method->escapeLabelValue}"}`
+      let labels = `{source="${s.source->escapeLabelValue}",chainId="${s.chainId->ChainId.toString}",method="${s.method->escapeLabelValue}"}`
       switch byLabels->Utils.Dict.dangerouslyGetNonOption(labels) {
       | Some(existing) =>
         byLabels->Dict.set(
@@ -239,7 +239,7 @@ let renderMetrics = (b: builder, metrics: t) => {
   let sources = {
     let byLabels: dict<int> = Dict.make()
     metrics.sourceHeights->Array.forEach(s => {
-      let labels = `{source="${s.source->escapeLabelValue}",chainId="${s.chainId->Int.toString}"}`
+      let labels = `{source="${s.source->escapeLabelValue}",chainId="${s.chainId->ChainId.toString}"}`
       switch byLabels->Utils.Dict.dangerouslyGetNonOption(labels) {
       | Some(existing) if existing >= s.height => ()
       | _ => byLabels->Dict.set(labels, s.height)

package/src/Metrics.res.mjs

@@ -2,6 +2,7 @@
 
 import * as V8 from "v8";
 import * as Utils from "./Utils.res.mjs";
+import * as ChainId from "./ChainId.res.mjs";
 import * as Process from "process";
 import * as Perf_hooks from "perf_hooks";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
@@ -56,7 +57,7 @@ function single(b, name, help, kind, value) {
 
 function renderMetrics(b, metrics) {
   let chains = metrics.chains.map(m => [
-    `{chainId="` + m.chainId.toString() + `"}`,
+    `{chainId="` + ChainId.toString(m.chainId) + `"}`,
     m
   ]);
   let handlers = metrics.handlers.map(s => [
@@ -81,7 +82,7 @@ function renderMetrics(b, metrics) {
   ]);
   let byLabels = {};
   metrics.sourceRequests.forEach(s => {
-    let labels = `{source="` + escapeLabelValue(s.source) + `",chainId="` + s.chainId.toString() + `",method="` + escapeLabelValue(s.method) + `"}`;
+    let labels = `{source="` + escapeLabelValue(s.source) + `",chainId="` + ChainId.toString(s.chainId) + `",method="` + escapeLabelValue(s.method) + `"}`;
     let existing = byLabels[labels];
     if (existing !== undefined) {
       byLabels[labels] = {
@@ -98,7 +99,7 @@ function renderMetrics(b, metrics) {
   let sourceRequests = Object.entries(byLabels);
   let byLabels$1 = {};
   metrics.sourceHeights.forEach(s => {
-    let labels = `{source="` + escapeLabelValue(s.source) + `",chainId="` + s.chainId.toString() + `"}`;
+    let labels = `{source="` + escapeLabelValue(s.source) + `",chainId="` + ChainId.toString(s.chainId) + `"}`;
     let existing = byLabels$1[labels];
     if (existing !== undefined && existing >= s.height) {
       return;

package/src/Persistence.res

@@ -19,7 +19,7 @@ type effectCacheRecord = {
 }
 
 type initialChainState = {
-  id: int,
+  id: ChainId.t,
   startBlock: int,
   endBlock: option<int>,
   maxReorgDepth: int,
@@ -93,11 +93,19 @@ type storage = {
   // once they're queryable. Best-effort: it resolves even when a build fails,
   // leaving the query to run unindexed rather than failing the handler.
   ensureQueryIndexes: (~table: Table.table, ~filters: array<EntityFilter.t>) => promise<unit>,
-  // Creates every schema-defined index still missing and stamps `ready_at` on
-  // the given chains, atomically. Called once, when backfill completes.
+  // Creates every schema-defined index still missing, without touching
+  // `ready_at`. For a resumed indexer that is already ready and so never runs
+  // `finalizeBackfill`: an index dropped or invalidated while it was down would
+  // otherwise never be rebuilt. Best-effort, and safe to run with indexing live.
+  ensureSchemaIndexes: (~entities: array<Internal.entityConfig>) => promise<unit>,
+  // Creates every schema-defined index still missing, then stamps `ready_at` on
+  // the given chains. Called once, when backfill completes. The indexes are
+  // committed one at a time so a failure part way through doesn't undo the ones
+  // already built; `ready_at` is only written once they all verify, and all
+  // chains are stamped together.
   finalizeBackfill: (
     ~entities: array<Internal.entityConfig>,
-    ~chainIds: array<int>,
+    ~chainIds: array<ChainId.t>,
     ~readyAt: Date.t,
   ) => promise<unit>,
   // This is to download cache from the database to .envio/cache
@@ -115,7 +123,7 @@ type storage = {
   ) => promise<unit>,
   // Get rollback target checkpoint
   getRollbackTargetCheckpoint: (
-    ~reorgChainId: int,
+    ~reorgChainId: ChainId.t,
     ~lastKnownValidBlockNumber: int,
   ) => promise<option<Internal.checkpointId>>,
   // Get rollback progress diff
@@ -123,7 +131,7 @@ type storage = {
     ~rollbackTargetCheckpointId: Internal.checkpointId,
   ) => promise<
     array<{
-      "chain_id": int,
+      "chain_id": ChainId.t,
       "events_processed_diff": string,
       "new_progress_block_number": int,
     }>,
@@ -251,7 +259,7 @@ let init = {
           persistence.storageStatus = Ready(initialState)
           let progress = Dict.make()
           initialState.chains->Array.forEach(c => {
-            progress->Utils.Dict.setByInt(c.id, c.progressBlockNumber)
+            progress->ChainId.Dict.set(c.id, c.progressBlockNumber)
           })
           Logging.info({
             "msg": `Successfully resumed indexing state! Continuing from the last checkpoint.`,