envio 3.0.0-alpha.5 → 3.0.0-alpha.7

package/index.d.ts

@@ -15,6 +15,9 @@ export type {
 import type { Address } from "./src/Types.ts";
 export type { EffectCaller, Address } from "./src/Types.ts";
 
+/** Utility type to expand/flatten complex types for better IDE display. */
+export type Prettify<T> = { [K in keyof T]: T[K] } & {};
+
 import type {
   effect as Effect,
   effectArgs as EffectArgs,
@@ -162,9 +165,10 @@ export interface Global {}
 
 /**
  * Shape of the indexer configuration.
- * Used as a constraint for IndexerFromConfig to allow usage without codegen.
+ * Will be used internally for defineConfig.
+ * Currently should match the internal.config.json structure.
  */
-export type IndexerConfig = {
+type IndexerConfig = {
   /** The indexer name. */
   name: string;
   /** The indexer description. */
@@ -336,6 +340,19 @@ type SvmChain<Id extends number = number> = {
 
 // ============== Indexer Type ==============
 
+/** Minimal type constraint for IndexerFromConfig to allow usage without full IndexerConfig. */
+type IndexerConfigTypes = {
+  evm?: {
+    chains: Record<string, { id: number }>;
+    contracts?: Record<string, {}>;
+  };
+  fuel?: {
+    chains: Record<string, { id: number }>;
+    contracts?: Record<string, {}>;
+  };
+  svm?: { chains: Record<string, { id: number }> };
+};
+
 // Helper: Check if ecosystem is configured in a given config
 type HasEvm<Config> = "evm" extends keyof Config ? true : false;
 type HasFuel<Config> = "fuel" extends keyof Config ? true : false;
@@ -351,7 +368,7 @@ type EcosystemTuple<Config> = [
 type EcosystemCount<Config> = EcosystemTuple<Config>["length"];
 
 // EVM ecosystem type
-type EvmEcosystem<Config extends IndexerConfig /*= GlobalIndexerConfig*/> =
+type EvmEcosystem<Config extends IndexerConfigTypes> =
   "evm" extends keyof Config
     ? Config["evm"] extends {
         chains: infer Chains;
@@ -379,7 +396,7 @@ type EvmEcosystem<Config extends IndexerConfig /*= GlobalIndexerConfig*/> =
     : never;
 
 // Fuel ecosystem type
-type FuelEcosystem<Config extends IndexerConfig /*= GlobalIndexerConfig*/> =
+type FuelEcosystem<Config extends IndexerConfigTypes> =
   "fuel" extends keyof Config
     ? Config["fuel"] extends {
         chains: infer Chains;
@@ -407,7 +424,7 @@ type FuelEcosystem<Config extends IndexerConfig /*= GlobalIndexerConfig*/> =
     : never;
 
 // SVM ecosystem type
-type SvmEcosystem<Config extends IndexerConfig /*= GlobalIndexerConfig*/> =
+type SvmEcosystem<Config extends IndexerConfigTypes> =
   "svm" extends keyof Config
     ? Config["svm"] extends { chains: infer Chains }
       ? Chains extends Record<string, { id: number }>
@@ -426,7 +443,7 @@ type SvmEcosystem<Config extends IndexerConfig /*= GlobalIndexerConfig*/> =
     : never;
 
 // Single ecosystem chains (flattened at root level)
-type SingleEcosystemChains<Config extends IndexerConfig> =
+type SingleEcosystemChains<Config extends IndexerConfigTypes> =
   HasEvm<Config> extends true
     ? EvmEcosystem<Config>
     : HasFuel<Config> extends true
@@ -436,7 +453,7 @@ type SingleEcosystemChains<Config extends IndexerConfig> =
     : {};
 
 // Multi-ecosystem chains (namespaced by ecosystem)
-type MultiEcosystemChains<Config extends IndexerConfig> =
+type MultiEcosystemChains<Config extends IndexerConfigTypes> =
   (HasEvm<Config> extends true
     ? {
         /** EVM ecosystem configuration. */
@@ -461,11 +478,70 @@ type MultiEcosystemChains<Config extends IndexerConfig> =
  * - Single ecosystem: chains are at the root level.
  * - Multiple ecosystems: chains are namespaced by ecosystem (evm, fuel, svm).
  */
-export type IndexerFromConfig<Config extends IndexerConfig> = {
-  /** The indexer name from config.yaml. */
-  readonly name: Config["name"];
-  /** The indexer description from config.yaml. */
-  readonly description: string | undefined;
-} & (EcosystemCount<Config> extends 1
-  ? SingleEcosystemChains<Config>
-  : MultiEcosystemChains<Config>);
+export type IndexerFromConfig<Config extends IndexerConfigTypes> = Prettify<
+  {
+    /** The indexer name from config.yaml. */
+    readonly name: string;
+    /** The indexer description from config.yaml. */
+    readonly description: string | undefined;
+  } & (EcosystemCount<Config> extends 1
+    ? SingleEcosystemChains<Config>
+    : MultiEcosystemChains<Config>)
+>;
+
+// ============== Test Indexer Types ==============
+
+/** Configuration for a single chain in the test indexer. */
+export type TestIndexerChainConfig = {
+  /** The block number to start processing from. */
+  startBlock: number;
+  /** The block number to stop processing at. */
+  endBlock: number;
+};
+
+/** Progress returned after processing blocks with the test indexer. */
+export type TestIndexerProcessResult = {
+  /** Changes happened during the processing. */
+  changes: unknown[];
+};
+
+// Helper to extract chain IDs from config for test indexer
+type TestIndexerChainIds<Config extends IndexerConfigTypes> =
+  HasEvm<Config> extends true
+    ? Config["evm"] extends { chains: infer Chains }
+      ? Chains extends Record<string, { id: number }>
+        ? Chains[keyof Chains]["id"]
+        : never
+      : never
+    : HasFuel<Config> extends true
+    ? Config["fuel"] extends { chains: infer Chains }
+      ? Chains extends Record<string, { id: number }>
+        ? Chains[keyof Chains]["id"]
+        : never
+      : never
+    : HasSvm<Config> extends true
+    ? Config["svm"] extends { chains: infer Chains }
+      ? Chains extends Record<string, { id: number }>
+        ? Chains[keyof Chains]["id"]
+        : never
+      : never
+    : never;
+
+/** Process configuration for the test indexer, with chains keyed by chain ID. */
+export type TestIndexerProcessConfig<Config extends IndexerConfigTypes> = {
+  /** Chain configurations keyed by chain ID. Each chain specifies start and end blocks. */
+  chains: {
+    [K in TestIndexerChainIds<Config>]?: TestIndexerChainConfig;
+  };
+};
+
+/**
+ * Test indexer type resolved from config.
+ * Allows running the indexer for specific block ranges and inspecting results.
+ */
+export type TestIndexerFromConfig<Config extends IndexerConfigTypes> = {
+  /** Process blocks for the specified chains and return progress with checkpoints and changes. */
+  process: (
+    config: Prettify<TestIndexerProcessConfig<Config>>
+  ) => Promise<TestIndexerProcessResult>;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v3.0.0-alpha.5",
+  "version": "v3.0.0-alpha.7",
   "type": "module",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.js",
@@ -29,10 +29,10 @@
     "node": ">=22.0.0"
   },
   "optionalDependencies": {
-    "envio-linux-x64": "v3.0.0-alpha.5",
-    "envio-linux-arm64": "v3.0.0-alpha.5",
-    "envio-darwin-x64": "v3.0.0-alpha.5",
-    "envio-darwin-arm64": "v3.0.0-alpha.5"
+    "envio-linux-x64": "v3.0.0-alpha.7",
+    "envio-linux-arm64": "v3.0.0-alpha.7",
+    "envio-darwin-x64": "v3.0.0-alpha.7",
+    "envio-darwin-arm64": "v3.0.0-alpha.7"
   },
   "dependencies": {
     "@clickhouse/client": "1.12.1",
@@ -41,9 +41,11 @@
     "@envio-dev/hypersync-client": "0.7.0",
     "bignumber.js": "9.1.2",
     "eventsource": "4.1.0",
-    "pino": "8.16.1",
-    "pino-pretty": "10.2.3",
+    "express": "4.19.2",
+    "pino": "10.1.0",
+    "pino-pretty": "13.1.3",
     "prom-client": "15.0.0",
+    "yargs": "17.7.2",
     "rescript": "11.1.3",
     "rescript-schema": "9.3.4",
     "viem": "2.21.0",
@@ -54,9 +56,8 @@
     "ink": "6.5.1",
     "ink-big-text": "2.0.0",
     "ink-spinner": "5.0.0",
-    "express": "4.19.2",
-    "yargs": "17.7.2",
-    "postgres": "3.4.1"
+    "postgres": "3.4.1",
+    "tsx": "4.21.0"
   },
   "files": [
     "bin.js",

package/src/Benchmark.res

@@ -216,7 +216,7 @@ let throttler = Throttler.make(
   ~logger=Logging.createChild(~params={"context": "Benchmarking framework"}),
 )
 let cacheFileName = "BenchmarkCache.json"
-let cacheFilePath = NodeJs.Path.join(NodeJs.Path.__dirname, cacheFileName)
+let cacheFilePath = NodeJs.Path.join(NodeJs.Path.getDirname(NodeJs.ImportMeta.importMeta), cacheFileName)
 
 let saveToCacheFile = if (
   Env.Benchmark.saveDataStrategy->Env.Benchmark.SaveDataStrategy.shouldSaveJsonFile

package/src/Benchmark.res.mjs

@@ -243,7 +243,7 @@ var throttler = Throttler.make(Env.ThrottleWrites.jsonFileBenchmarkIntervalMilli
 
 var cacheFileName = "BenchmarkCache.json";
 
-var cacheFilePath = Path.join(NodeJs.Path.$$__dirname, cacheFileName);
+var cacheFilePath = Path.join(NodeJs.Path.getDirname(import.meta), cacheFileName);
 
 var saveToCacheFile = Env.Benchmark.SaveDataStrategy.shouldSaveJsonFile(Env.Benchmark.saveDataStrategy) ? (function (data) {
       var write = function () {

package/src/ChainFetcher.res

@@ -40,6 +40,7 @@ let make = (
   ~isInReorgThreshold,
   ~reorgCheckpoints: array<Internal.reorgCheckpoint>,
   ~maxReorgDepth,
+  ~knownHeight=0,
 ): t => {
   // We don't need the router itself, but only validation logic,
   // since now event router is created for selection of events
@@ -177,7 +178,7 @@ let make = (
     ~endBlock,
     ~eventConfigs,
     ~targetBufferSize,
-    ~knownHeight=0, // FIXME: Get it from db or fetch before creating FetchState
+    ~knownHeight,
     ~chainId=chainConfig.id,
     // FIXME: Shouldn't set with full history
     ~blockLag=Pervasives.max(
@@ -287,6 +288,7 @@ let makeFromDbState = async (
     ~logger,
     ~targetBufferSize,
     ~isInReorgThreshold,
+    ~knownHeight=resumedChainState.sourceBlockNumber,
   )
 }
 

package/src/ChainFetcher.res.mjs

@@ -21,7 +21,8 @@ import * as ReorgDetection from "./ReorgDetection.res.mjs";
 import * as Caml_js_exceptions from "rescript/lib/es6/caml_js_exceptions.js";
 import * as SafeCheckpointTracking from "./SafeCheckpointTracking.res.mjs";
 
-function make(chainConfig, dynamicContracts, startBlock, endBlock, firstEventBlockNumber, progressBlockNumber, config, registrations, targetBufferSize, logger, timestampCaughtUpToHeadOrEndblock, numEventsProcessed, numBatchesFetched, isInReorgThreshold, reorgCheckpoints, maxReorgDepth) {
+function make(chainConfig, dynamicContracts, startBlock, endBlock, firstEventBlockNumber, progressBlockNumber, config, registrations, targetBufferSize, logger, timestampCaughtUpToHeadOrEndblock, numEventsProcessed, numBatchesFetched, isInReorgThreshold, reorgCheckpoints, maxReorgDepth, knownHeightOpt) {
+  var knownHeight = knownHeightOpt !== undefined ? knownHeightOpt : 0;
   var eventRouter = EventRouter.empty();
   var contracts = [];
   var eventConfigs = [];
@@ -96,7 +97,7 @@ function make(chainConfig, dynamicContracts, startBlock, endBlock, firstEventBlo
             
           }));
   }
-  var fetchState = FetchState.make(startBlock, endBlock, eventConfigs, contracts, config.maxAddrInPartition, chainConfig.id, targetBufferSize, 0, progressBlockNumber, onBlockConfigs, Caml.int_max(!config.shouldRollbackOnReorg || isInReorgThreshold ? 0 : chainConfig.maxReorgDepth, Belt_Option.getWithDefault(Env.indexingBlockLag, 0)));
+  var fetchState = FetchState.make(startBlock, endBlock, eventConfigs, contracts, config.maxAddrInPartition, chainConfig.id, targetBufferSize, knownHeight, progressBlockNumber, onBlockConfigs, Caml.int_max(!config.shouldRollbackOnReorg || isInReorgThreshold ? 0 : chainConfig.maxReorgDepth, Belt_Option.getWithDefault(Env.indexingBlockLag, 0)));
   var chainReorgCheckpoints = Belt_Array.keepMapU(reorgCheckpoints, (function (reorgCheckpoint) {
           if (reorgCheckpoint.chain_id === chainConfig.id) {
             return reorgCheckpoint;
@@ -123,7 +124,7 @@ function makeFromConfig(chainConfig, config, registrations, targetBufferSize) {
   var logger = Logging.createChild({
         chainId: chainConfig.id
       });
-  return make(chainConfig, [], chainConfig.startBlock, chainConfig.endBlock, undefined, -1, config, registrations, targetBufferSize, logger, undefined, 0, 0, false, [], chainConfig.maxReorgDepth);
+  return make(chainConfig, [], chainConfig.startBlock, chainConfig.endBlock, undefined, -1, config, registrations, targetBufferSize, logger, undefined, 0, 0, false, [], chainConfig.maxReorgDepth, undefined);
 }
 
 async function makeFromDbState(chainConfig, resumedChainState, reorgCheckpoints, isInReorgThreshold, config, registrations, targetBufferSize) {
@@ -133,7 +134,7 @@ async function makeFromDbState(chainConfig, resumedChainState, reorgCheckpoints,
       });
   Prometheus.ProgressEventsCount.set(resumedChainState.numEventsProcessed, chainId);
   var progressBlockNumber = resumedChainState.progressBlockNumber >= 0 ? resumedChainState.progressBlockNumber : resumedChainState.startBlock - 1 | 0;
-  return make(chainConfig, resumedChainState.dynamicContracts, resumedChainState.startBlock, resumedChainState.endBlock, resumedChainState.firstEventBlockNumber, progressBlockNumber, config, registrations, targetBufferSize, logger, Env.updateSyncTimeOnRestart ? undefined : resumedChainState.timestampCaughtUpToHeadOrEndblock, resumedChainState.numEventsProcessed, 0, isInReorgThreshold, reorgCheckpoints, resumedChainState.maxReorgDepth);
+  return make(chainConfig, resumedChainState.dynamicContracts, resumedChainState.startBlock, resumedChainState.endBlock, resumedChainState.firstEventBlockNumber, progressBlockNumber, config, registrations, targetBufferSize, logger, Env.updateSyncTimeOnRestart ? undefined : resumedChainState.timestampCaughtUpToHeadOrEndblock, resumedChainState.numEventsProcessed, 0, isInReorgThreshold, reorgCheckpoints, resumedChainState.maxReorgDepth, resumedChainState.sourceBlockNumber);
 }
 
 function getContractStartBlock(config, chain, contractName) {

package/src/ChainManager.res

@@ -7,6 +7,13 @@ type t = {
   isInReorgThreshold: bool,
 }
 
+// Check if progress is past the reorg threshold (safe block).
+// A chain is in reorg threshold when progressBlockNumber > sourceBlockNumber - maxReorgDepth.
+// This matches the logic in InternalTable.Checkpoints.makeGetReorgCheckpointsQuery.
+let isProgressInReorgThreshold = (~progressBlockNumber, ~sourceBlockNumber, ~maxReorgDepth) => {
+  maxReorgDepth > 0 && progressBlockNumber > sourceBlockNumber - maxReorgDepth
+}
+
 let calculateTargetBufferSize = (~activeChainsCount, ~config: Config.t) => {
   let targetBatchesInBuffer = 3
   switch Env.targetBufferSize {
@@ -37,22 +44,18 @@ let makeFromDbState = async (
   ~initialState: Persistence.initialState,
   ~config: Config.t,
   ~registrations,
-  ~persistence: Persistence.t,
 ): t => {
   let isInReorgThreshold = if initialState.cleanRun {
     false
   } else {
-    // TODO: Move to Persistence.initialState
-    // Since now it's possible not to have rows in the history table
-    // even after the indexer started saving history (entered reorg threshold),
-    // This rows check might incorrectly return false for recovering the isInReorgThreshold option.
-    // But this is not a problem. There's no history anyways, and the indexer will be able to
-    // correctly calculate isInReorgThreshold as it starts.
-    let hasStartedSavingHistory = await persistence.storage.hasEntityHistoryRows()
-
-    //If we have started saving history, continue to save history
-    //as regardless of whether we are still in a reorg threshold
-    hasStartedSavingHistory
+    // Check if any chain is in reorg threshold by comparing progress with sourceBlock - maxReorgDepth.
+    initialState.chains->Array.some(chain =>
+      isProgressInReorgThreshold(
+        ~progressBlockNumber=chain.progressBlockNumber,
+        ~sourceBlockNumber=chain.sourceBlockNumber,
+        ~maxReorgDepth=chain.maxReorgDepth,
+      )
+    )
   }
 
   let targetBufferSize = calculateTargetBufferSize(

package/src/ChainManager.res.mjs

@@ -10,6 +10,14 @@ import * as Prometheus from "./Prometheus.res.mjs";
 import * as ChainFetcher from "./ChainFetcher.res.mjs";
 import * as SafeCheckpointTracking from "./SafeCheckpointTracking.res.mjs";
 
+function isProgressInReorgThreshold(progressBlockNumber, sourceBlockNumber, maxReorgDepth) {
+  if (maxReorgDepth > 0) {
+    return progressBlockNumber > (sourceBlockNumber - maxReorgDepth | 0);
+  } else {
+    return false;
+  }
+}
+
 function calculateTargetBufferSize(activeChainsCount, config) {
   if (Env.targetBufferSize !== undefined) {
     return Env.targetBufferSize;
@@ -31,8 +39,10 @@ function makeFromConfig(config, registrations) {
         };
 }
 
-async function makeFromDbState(initialState, config, registrations, persistence) {
-  var isInReorgThreshold = initialState.cleanRun ? false : await persistence.storage.hasEntityHistoryRows();
+async function makeFromDbState(initialState, config, registrations) {
+  var isInReorgThreshold = initialState.cleanRun ? false : Belt_Array.some(initialState.chains, (function (chain) {
+            return isProgressInReorgThreshold(chain.progressBlockNumber, chain.sourceBlockNumber, chain.maxReorgDepth);
+          }));
   var targetBufferSize = calculateTargetBufferSize(initialState.chains.length, config);
   Prometheus.ProcessingMaxBatchSize.set(config.batchSize);
   Prometheus.IndexingTargetBufferSize.set(targetBufferSize);
@@ -125,6 +135,7 @@ function getSafeCheckpointId(chainManager) {
 }
 
 export {
+  isProgressInReorgThreshold ,
   calculateTargetBufferSize ,
   makeFromConfig ,
   makeFromDbState ,

package/src/Config.res

@@ -53,10 +53,16 @@ type sourceSync = {
 
 type multichain = | @as("ordered") Ordered | @as("unordered") Unordered
 
+type contractHandler = {
+  name: string,
+  handler: option<string>,
+}
+
 type t = {
   name: string,
   description: option<string>,
   handlers: string,
+  contractHandlers: array<contractHandler>,
   shouldRollbackOnReorg: bool,
   shouldSaveFullHistory: bool,
   multichain: multichain,
@@ -83,6 +89,7 @@ let publicConfigChainSchema = S.schema(s =>
 let contractConfigSchema = S.schema(s =>
   {
     "abi": s.matches(S.json(~validate=false)),
+    "handler": s.matches(S.option(S.string)),
   }
 )
 
@@ -293,10 +300,25 @@ let fromPublic = (
     })
     ->Js.Dict.fromArray
 
+  // Extract contract handlers from the public config
+  let contractHandlers = switch publicContractsConfig {
+  | Some(contractsDict) =>
+    contractsDict
+    ->Js.Dict.entries
+    ->Js.Array2.map(((contractName, contractConfig)) => {
+      {
+        name: contractName,
+        handler: contractConfig["handler"],
+      }
+    })
+  | None => []
+  }
+
   {
     name: publicConfig["name"],
     description: publicConfig["description"],
     handlers: publicConfig["handlers"]->Option.getWithDefault("src/handlers"),
+    contractHandlers,
     shouldRollbackOnReorg: publicConfig["rollbackOnReorg"]->Option.getWithDefault(true),
     shouldSaveFullHistory: publicConfig["saveFullHistory"]->Option.getWithDefault(false),
     multichain: publicConfig["multichain"]->Option.getWithDefault(Unordered),

package/src/Config.res.mjs

@@ -25,7 +25,8 @@ var publicConfigChainSchema = S$RescriptSchema.schema(function (s) {
 
 var contractConfigSchema = S$RescriptSchema.schema(function (s) {
       return {
-              abi: s.m(S$RescriptSchema.json(false))
+              abi: s.m(S$RescriptSchema.json(false)),
+              handler: s.m(S$RescriptSchema.option(S$RescriptSchema.string))
             };
     });
 
@@ -246,10 +247,17 @@ function fromPublic(publicConfigJson, codegenChainsOpt, maxAddrInPartitionOpt, u
                     entityConfig
                   ];
           }));
+  var contractHandlers = publicContractsConfig !== undefined ? Js_dict.entries(publicContractsConfig).map(function (param) {
+          return {
+                  name: param[0],
+                  handler: param[1].handler
+                };
+        }) : [];
   return {
           name: publicConfig.name,
           description: publicConfig.description,
           handlers: Belt_Option.getWithDefault(publicConfig.handlers, "src/handlers"),
+          contractHandlers: contractHandlers,
           shouldRollbackOnReorg: Belt_Option.getWithDefault(publicConfig.rollbackOnReorg, true),
           shouldSaveFullHistory: Belt_Option.getWithDefault(publicConfig.saveFullHistory, false),
           multichain: Belt_Option.getWithDefault(publicConfig.multichain, "unordered"),

package/src/Env.res

@@ -1,17 +1,8 @@
-
 // Loads the .env from the root working directory
 %%raw(`import 'dotenv/config'`)
 
-%%private(
-  let envSafe = EnvSafe.make()
+%%private(let envSafe = EnvSafe.make())
 
-  let getLogLevelConfig = (name, ~default): Pino.logLevel =>
-    envSafe->EnvSafe.get(
-      name,
-      S.enum([#trace, #debug, #info, #warn, #error, #fatal, #udebug, #uinfo, #uwarn, #uerror]),
-      ~fallback=default,
-    )
-)
 // resets the timestampCaughtUpToHeadOrEndblock after a restart when true
 let updateSyncTimeOnRestart =
   envSafe->EnvSafe.get("UPDATE_SYNC_TIME_ON_RESTART", S.bool, ~fallback=true)
@@ -34,9 +25,22 @@ let serverPort =
 
 let tuiOffEnvVar = envSafe->EnvSafe.get("TUI_OFF", S.bool, ~fallback=false)
 
+let logLevelSchema = S.enum([
+  #trace,
+  #debug,
+  #info,
+  #warn,
+  #error,
+  #fatal,
+  #udebug,
+  #uinfo,
+  #uwarn,
+  #uerror,
+  #silent,
+])
 let logFilePath = envSafe->EnvSafe.get("LOG_FILE", S.string, ~fallback="logs/envio.log")
-let userLogLevel = getLogLevelConfig("LOG_LEVEL", ~default=#info)
-let defaultFileLogLevel = getLogLevelConfig("FILE_LOG_LEVEL", ~default=#trace)
+let userLogLevel = envSafe->EnvSafe.get("LOG_LEVEL", S.option(logLevelSchema))
+let defaultFileLogLevel = envSafe->EnvSafe.get("FILE_LOG_LEVEL", logLevelSchema, ~fallback=#trace)
 
 let prodEnvioAppUrl = "https://envio.dev"
 let envioAppUrl = envSafe->EnvSafe.get("ENVIO_APP", S.string, ~fallback=prodEnvioAppUrl)
@@ -121,7 +125,12 @@ let logStrategy =
   )
 
 Logging.setLogger(
-  Logging.makeLogger(~logStrategy, ~logFilePath, ~defaultFileLogLevel, ~userLogLevel),
+  Logging.makeLogger(
+    ~logStrategy,
+    ~logFilePath,
+    ~defaultFileLogLevel,
+    ~userLogLevel=userLogLevel->Belt.Option.getWithDefault(#info),
+  ),
 )
 
 module Db = {

package/src/Env.res.mjs

@@ -3,6 +3,7 @@
 import * as EnvSafe from "rescript-envsafe/src/EnvSafe.res.mjs";
 import * as Logging from "./Logging.res.mjs";
 import * as Postgres from "./bindings/Postgres.res.mjs";
+import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
 import * as Caml_option from "rescript/lib/es6/caml_option.js";
 import * as HyperSyncClient from "./sources/HyperSyncClient.res.mjs";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
@@ -12,21 +13,6 @@ import 'dotenv/config'
 
 var envSafe = EnvSafe.make(undefined);
 
-function getLogLevelConfig(name, $$default) {
-  return EnvSafe.get(envSafe, name, S$RescriptSchema.$$enum([
-                  "trace",
-                  "debug",
-                  "info",
-                  "warn",
-                  "error",
-                  "fatal",
-                  "udebug",
-                  "uinfo",
-                  "uwarn",
-                  "uerror"
-                ]), undefined, $$default, undefined, undefined);
-}
-
 var updateSyncTimeOnRestart = EnvSafe.get(envSafe, "UPDATE_SYNC_TIME_ON_RESTART", S$RescriptSchema.bool, undefined, true, undefined, undefined);
 
 var targetBufferSize = EnvSafe.get(envSafe, "ENVIO_INDEXING_MAX_BUFFER_SIZE", S$RescriptSchema.option(S$RescriptSchema.$$int), undefined, undefined, undefined, undefined);
@@ -41,11 +27,25 @@ var serverPort = EnvSafe.get(envSafe, "ENVIO_INDEXER_PORT", S$RescriptSchema.por
 
 var tuiOffEnvVar = EnvSafe.get(envSafe, "TUI_OFF", S$RescriptSchema.bool, undefined, false, undefined, undefined);
 
+var logLevelSchema = S$RescriptSchema.$$enum([
+      "trace",
+      "debug",
+      "info",
+      "warn",
+      "error",
+      "fatal",
+      "udebug",
+      "uinfo",
+      "uwarn",
+      "uerror",
+      "silent"
+    ]);
+
 var logFilePath = EnvSafe.get(envSafe, "LOG_FILE", S$RescriptSchema.string, undefined, "logs/envio.log", undefined, undefined);
 
-var userLogLevel = getLogLevelConfig("LOG_LEVEL", "info");
+var userLogLevel = EnvSafe.get(envSafe, "LOG_LEVEL", S$RescriptSchema.option(logLevelSchema), undefined, undefined, undefined, undefined);
 
-var defaultFileLogLevel = getLogLevelConfig("FILE_LOG_LEVEL", "trace");
+var defaultFileLogLevel = EnvSafe.get(envSafe, "FILE_LOG_LEVEL", logLevelSchema, undefined, "trace", undefined, undefined);
 
 var prodEnvioAppUrl = "https://envio.dev";
 
@@ -123,7 +123,7 @@ var logStrategy = EnvSafe.get(envSafe, "LOG_STRATEGY", S$RescriptSchema.$$enum([
           "both-prettyconsole"
         ]), undefined, "console-pretty", undefined, undefined);
 
-Logging.setLogger(Logging.makeLogger(logStrategy, logFilePath, defaultFileLogLevel, userLogLevel));
+Logging.setLogger(Logging.makeLogger(logStrategy, logFilePath, defaultFileLogLevel, Belt_Option.getWithDefault(userLogLevel, "info")));
 
 var host = EnvSafe.get(envSafe, "ENVIO_PG_HOST", S$RescriptSchema.string, undefined, undefined, "localhost", undefined);
 
@@ -249,6 +249,7 @@ export {
   indexingBlockLag ,
   serverPort ,
   tuiOffEnvVar ,
+  logLevelSchema ,
   logFilePath ,
   userLogLevel ,
   defaultFileLogLevel ,