envio 3.13.0-alpha.0 → 3.13.0

package/src/Metrics.res

@@ -174,8 +174,10 @@ let sumByKey = (items: array<'item>, ~key: 'item => string, ~add: ('item, 'item)
 // unsplit run would have produced. Series keyed by chain concatenate, since a
 // chain belongs to exactly one worker; series keyed by name are summed, since
 // every worker runs the same handlers and effects over its own chains. The
-// clock is the caller's: it belongs to the group, not to any worker.
-let merge = (snapshots: array<t>, ~startTime, ~metricTime, ~elapsedSeconds) => {
+// clock and the buffer target are the caller's: both belong to the group, and
+// the target is what the run was configured with rather than anything a worker
+// could add up to.
+let merge = (snapshots: array<t>, ~startTime, ~metricTime, ~elapsedSeconds, ~targetBufferSize) => {
   let concat = select => snapshots->Array.flatMap(select)
   let sumInt = select => snapshots->Array.reduce(0, (acc, snapshot) => acc + snapshot->select)
   let sumFloat = select => snapshots->Array.reduce(0., (acc, snapshot) => acc +. snapshot->select)
@@ -184,8 +186,11 @@ let merge = (snapshots: array<t>, ~startTime, ~metricTime, ~elapsedSeconds) => {
     startTime,
     metricTime,
     elapsedSeconds,
-    targetBufferSize: sumInt(s => s.targetBufferSize),
-    isInReorgThreshold: snapshots->Array.some(s => s.isInReorgThreshold),
+    targetBufferSize,
+    // Chains cross into the threshold as one indexer, so a run is in it once
+    // every process is, the same reading as the arrival below.
+    isInReorgThreshold: snapshots->Utils.Array.notEmpty &&
+      snapshots->Array.every(s => s.isInReorgThreshold),
     // The run has arrived only once every process has: one still backfilling
     // speaks for the whole indexer.
     hasArrivedAtHead: snapshots->Utils.Array.notEmpty &&

package/src/Metrics.res.mjs

@@ -35,15 +35,15 @@ function sumByKey(items, key, add) {
   return order.map(k => byKey[k]);
 }
 
-function merge(snapshots, startTime, metricTime, elapsedSeconds) {
+function merge(snapshots, startTime, metricTime, elapsedSeconds, targetBufferSize) {
   let sumInt = select => Stdlib_Array.reduce(snapshots, 0, (acc, snapshot) => acc + select(snapshot) | 0);
   let sumFloat = select => Stdlib_Array.reduce(snapshots, 0, (acc, snapshot) => acc + select(snapshot));
   return {
     startTime: startTime,
     metricTime: metricTime,
     elapsedSeconds: elapsedSeconds,
-    targetBufferSize: sumInt(s => s.targetBufferSize),
-    isInReorgThreshold: snapshots.some(s => s.isInReorgThreshold),
+    targetBufferSize: targetBufferSize,
+    isInReorgThreshold: Utils.$$Array.notEmpty(snapshots) && snapshots.every(s => s.isInReorgThreshold),
     hasArrivedAtHead: Utils.$$Array.notEmpty(snapshots) && snapshots.every(s => s.hasArrivedAtHead),
     rollbackEnabled: snapshots.some(s => s.rollbackEnabled),
     maxBatchSize: Stdlib_Array.reduce(snapshots, 0, (acc, s) => Primitive_int.max(acc, s.maxBatchSize)),

package/src/Persistence.res

@@ -275,6 +275,10 @@ let init = {
     // would create rows for this process's chains only, leaving the ones it
     // skipped with no state for their own processes to resume.
     ~requireInitialized=false,
+    // Whether this process is the one that tells the operator the run resumed.
+    // A supervisor says it once for the whole run, so the workers it forked
+    // keep it to their own log files.
+    ~announceResume=true,
     ~startBlockRetry=StartBlockResolver.UntilItAnswers,
   ) => {
     try {
@@ -324,9 +328,7 @@ let init = {
           | _ => false
           }
         ) {
-          // An isolated process resumes state its supervisor already announced
-          // for the whole run, so it says so only to its own log file.
-          let logResume = requireInitialized ? Logging.debug : Logging.info
+          let logResume = announceResume ? Logging.info : Logging.trace
           logResume(`Found existing indexer storage. Resuming indexing state...`)
           let initialState = await persistence.storage.resumeInitialState(
             ~entities=persistence.allEntities,
@@ -371,6 +373,7 @@ let initForRun = (
   ~requireInitialized,
 ) =>
   persistence->init(
+    ~announceResume=!Worker.isEnabled,
     ~reset,
     ~chainConfigs=config.chainMap->ChainMap.values,
     ~contractMapping=config.contractMapping,

package/src/Persistence.res.mjs

@@ -2,6 +2,7 @@
 
 import * as Batch from "./Batch.res.mjs";
 import * as Config from "./Config.res.mjs";
+import * as Worker from "./Worker.res.mjs";
 import * as Logging from "./Logging.res.mjs";
 import * as ChainMap from "./ChainMap.res.mjs";
 import * as Frontier from "./db/Frontier.res.mjs";
@@ -32,10 +33,11 @@ function make(userEntities, allEnums, storage) {
   };
 }
 
-async function init(persistence, chainConfigs, contractMapping, envioInfo, resetCommand, runCommand, resetOpt, lowercaseAddressesOpt, requireInitializedOpt, startBlockRetryOpt) {
+async function init(persistence, chainConfigs, contractMapping, envioInfo, resetCommand, runCommand, resetOpt, lowercaseAddressesOpt, requireInitializedOpt, announceResumeOpt, startBlockRetryOpt) {
   let reset = resetOpt !== undefined ? resetOpt : false;
   let lowercaseAddresses = lowercaseAddressesOpt !== undefined ? lowercaseAddressesOpt : false;
   let requireInitialized = requireInitializedOpt !== undefined ? requireInitializedOpt : false;
+  let announceResume = announceResumeOpt !== undefined ? announceResumeOpt : true;
   let startBlockRetry = startBlockRetryOpt !== undefined ? startBlockRetryOpt : "UntilItAnswers";
   try {
     let promise = persistence.storageStatus;
@@ -78,7 +80,7 @@ async function init(persistence, chainConfigs, contractMapping, envioInfo, reset
       let tmp;
       tmp = typeof match !== "object" ? false : match.TAG === "Initializing";
       if (tmp) {
-        let logResume = requireInitialized ? Logging.debug : Logging.info;
+        let logResume = announceResume ? Logging.info : Logging.trace;
         logResume(`Found existing indexer storage. Resuming indexing state...`);
         let initialState$1 = await persistence.storage.resumeInitialState(persistence.allEntities, chainConfigs.map(chain => chain.id), (storedEnvioInfo, storedContractMapping) => Config.throwIfResumeIncompatible(storedEnvioInfo, storedContractMapping, envioInfo, contractMapping, resetCommand, runCommand));
         persistence.storageStatus = {
@@ -103,7 +105,7 @@ async function init(persistence, chainConfigs, contractMapping, envioInfo, reset
 }
 
 function initForRun(persistence, config, reset, isDevelopmentMode, requireInitialized) {
-  return init(persistence, ChainMap.values(config.chainMap), config.contractMapping, Config.envioInfo(), isDevelopmentMode ? "envio dev -r" : "envio start -r", isDevelopmentMode ? "envio dev" : "envio start", reset, config.lowercaseAddresses, requireInitialized, undefined);
+  return init(persistence, ChainMap.values(config.chainMap), config.contractMapping, Config.envioInfo(), isDevelopmentMode ? "envio dev -r" : "envio start -r", isDevelopmentMode ? "envio dev" : "envio start", reset, config.lowercaseAddresses, requireInitialized, !Worker.isEnabled, undefined);
 }
 
 function getInitializedStorageOrThrow(persistence) {

package/src/PgStorage.res

@@ -1857,7 +1857,7 @@ let make = (
     if withUpload {
       // Try to restore cache tables from the .envio/cache TSV files
       switch await scanCacheDir() {
-      | [] => Logging.info("No cache found to upload.")
+      | [] => Logging.info("No saved effect cache to load from .envio/cache.")
       | entries =>
         switch await getConnectedPsqlExec(~pgUser, ~pgHost, ~pgDatabase, ~pgPort, ~containerName) {
         | Ok(psqlExec) =>
@@ -2104,7 +2104,7 @@ let make = (
     switch await sql->loadCatalogRows(~indexName=name) {
     | rows => indexManager->IndexManager.resync(~name, ~rows)
     | exception exn =>
-      Logging.debug({
+      Logging.trace({
         "storage": storageName,
         "msg": `Could not re-read the index "${name}" after a failed build. The next attempt reads it again.`,
         "err": exn->Utils.prettifyExn,

package/src/PgStorage.res.mjs

@@ -1183,7 +1183,7 @@ function make(sql, pgHost, pgSchema, pgPort, pgUser, pgDatabase, pgPassword, isH
           Logging.error(`Failed to upload cache, continuing without it. ` + psqlExec._0);
         }
       } else {
-        Logging.info("No cache found to upload.");
+        Logging.info("No saved effect cache to load from .envio/cache.");
       }
     }
     let cacheTableInfo = await queryCacheTableInfo();
@@ -1311,7 +1311,7 @@ function make(sql, pgHost, pgSchema, pgPort, pgUser, pgDatabase, pgPassword, isH
       rows = await loadCatalogRows(sql, name);
     } catch (raw_exn) {
       let exn = Primitive_exceptions.internalToException(raw_exn);
-      return Logging.debug({
+      return Logging.trace({
         storage: storageName,
         msg: `Could not re-read the index "` + name + `" after a failed build. The next attempt reads it again.`,
         err: Utils.prettifyExn(exn)

package/src/Rollback.res

@@ -11,9 +11,9 @@ let getLastKnownValidBlock = async (
   ~isRealtime: bool,
 ) => {
   // Before the search, not after: it re-fetches the scanned hashes through the
-  // sources, and a source answering from a cache it filled on the orphaned
-  // chain would confirm blocks that no longer exist - stopping the rollback
-  // short of the real fork.
+  // sources, and a read still in flight from before the reorg describes the
+  // orphaned chain — joining one would confirm blocks that no longer exist and
+  // stop the rollback short of the real fork.
   chainState->ChainState.sourceManager->SourceManager.onReorg
 
   // Don't include the reorg block itself - different source instances

package/src/Server.res

@@ -77,9 +77,6 @@ let stateSchema = S.union([
   })),
 ])
 
-// Runtime state lives in the process-wide `EnvioGlobal` record (shared
-// across duplicate envio module instances); the slots are opaque there, so
-// cast them to the real types here.
 let startServer = (
   ~getMetrics: unit => option<Metrics.t>,
   ~envioVersion: string,

package/src/SimulateItems.res

@@ -657,7 +657,7 @@ let parse = (
   | Svm => {
       items,
       transactionStore: Some(TransactionStore.fromSvmJs(svmTxs, svmActivities)),
-      blockStore: Some(BlockStore.fromJs(svmBlocks, ~ecosystem=Svm, ~shouldChecksum=false)),
+      blockStore: Some(BlockStore.fromJs(svmBlocks, ~ecosystem=Svm)),
     }
   | _ => {
       items,

package/src/SimulateItems.res.mjs

@@ -459,7 +459,7 @@ function parse(simulateItems, config, chainConfig, onEventRegistrations) {
       return {
         items: items,
         transactionStore: Primitive_option.some(TransactionStore.fromSvmJs(svmTxs, svmActivities)),
-        blockStore: Primitive_option.some(BlockStore.fromJs(svmBlocks, "svm", false))
+        blockStore: Primitive_option.some(BlockStore.fromJs(svmBlocks, "svm"))
       };
   }
 }