@xyo-network/xl1-cli-lib 1.19.14 → 1.19.16

package/dist/node/index.mjs

@@ -1,32 +1,55 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
+// src/initLogger.ts
+import { Base, ConsoleLogger, isDefined, LogLevel, SilentLogger } from "@xylabs/sdk-js";
+var initLogger = /* @__PURE__ */ __name((config2) => {
+  let logger;
+  if (config2.log.silent) {
+    logger = new SilentLogger();
+  } else {
+    let level;
+    if (isDefined(config2.log.logLevel)) {
+      const parsed = LogLevel[config2.log.logLevel.toLowerCase()];
+      if (isDefined(parsed)) level = parsed;
+    }
+    logger = new ConsoleLogger(level);
+  }
+  Base.defaultLogger = logger;
+  return logger;
+}, "initLogger");
+
 // src/runCLI.ts
-import { deepMerge, isDefined as isDefined4, toAddress } from "@xylabs/sdk-js";
-import { runApi } from "@xyo-network/chain-api";
-import { runMempool } from "@xyo-network/chain-mempool";
-import { Orchestrator } from "@xyo-network/chain-orchestration";
+import { createDeepMerge, isDefined as isDefined2 } from "@xylabs/sdk-js";
+import { getApiActor, runApi } from "@xyo-network/chain-api";
+import { getMempoolActor, runMempool } from "@xyo-network/chain-mempool";
+import { ApiConfigZod, BridgeConfigZod, contextFromConfigWithoutLocator, locatorsFromConfig, MempoolConfigZod, Orchestrator, ProducerConfigZod, RewardRedemptionConfigZod, tryParseConfig } from "@xyo-network/chain-orchestration";
 import { runProducer } from "@xyo-network/chain-producer";
-import { ConfigZod as ConfigZod2, isZodError } from "@xyo-network/xl1-sdk";
+import { ActorConfigZod, ConfigZod, isZodError, resolveConfig } from "@xyo-network/xl1-sdk";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/bridge/runBridge.ts
 import { exists } from "@xylabs/sdk-js";
 import { BridgeActor } from "@xyo-network/chain-bridge";
-import { initBridgeWallet } from "@xyo-network/chain-orchestration";
-var runBridge = /* @__PURE__ */ __name(async (config2, orchestrator, locator) => {
-  const account = await initBridgeWallet({
+import { initActorWallet } from "@xyo-network/chain-orchestration";
+var getBridgeActor = /* @__PURE__ */ __name(async (config2, locator) => {
+  const account = await initActorWallet({
     config: config2,
-    logger: locator.context.logger
+    logger: locator.context.logger,
+    singletons: {},
+    caches: {}
   });
-  const api = await BridgeActor.create({
+  return await BridgeActor.create({
     account,
     config: config2,
     locator
   });
+}, "getBridgeActor");
+var runBridge = /* @__PURE__ */ __name(async (config2, orchestrator, locator) => {
+  const bridge = await getBridgeActor(config2, locator);
   const actors = [
-    api
+    bridge
   ].filter(exists);
   for (const actor of actors) {
     await orchestrator.registerActor(actor);
@@ -36,18 +59,24 @@ var runBridge = /* @__PURE__ */ __name(async (config2, orchestrator, locator) =>
 
 // src/commands/rewardRedemption/runRewardRedemptionApi.ts
 import { exists as exists2 } from "@xylabs/sdk-js";
-import { initRewardsRedemptionApiWallet } from "@xyo-network/chain-orchestration";
+import { initActorWallet as initActorWallet2 } from "@xyo-network/chain-orchestration";
 import { RewardRedemptionActor } from "@xyo-network/chain-reward-redemption";
-async function runRewardRedemptionApi(config2, orchestrator, locator) {
-  const account = await initRewardsRedemptionApiWallet({
+async function getRewardRedemptionActor(config2, locator) {
+  const account = await initActorWallet2({
     config: config2,
-    logger: locator.context.logger
+    logger: locator.context.logger,
+    singletons: {},
+    caches: {}
   });
-  const rewardRedemption = await RewardRedemptionActor.create({
+  return await RewardRedemptionActor.create({
     account,
     config: config2,
     locator
   });
+}
+__name(getRewardRedemptionActor, "getRewardRedemptionActor");
+async function runRewardRedemptionApi(config2, orchestrator, locator) {
+  const rewardRedemption = await getRewardRedemptionActor(config2, locator);
   const actors = [
     rewardRedemption
   ].filter(exists2);
@@ -58,6 +87,23 @@ async function runRewardRedemptionApi(config2, orchestrator, locator) {
 }
 __name(runRewardRedemptionApi, "runRewardRedemptionApi");
 
+// src/commands/validator/runValidator.ts
+import { exists as exists3 } from "@xylabs/sdk-js";
+import { initActorWallet as initActorWallet3, ValidatorActor } from "@xyo-network/chain-orchestration";
+var getValidatorActor = /* @__PURE__ */ __name(async (config2, locator) => {
+  const account = await initActorWallet3({
+    config: config2,
+    logger: locator.context.logger,
+    singletons: {},
+    caches: {}
+  });
+  return await ValidatorActor.create({
+    account,
+    config: config2,
+    locator
+  });
+}, "getValidatorActor");
+
 // src/images.ts
 var XL1LogoColorizedAscii = `\x1B[38;2;128;128;128m\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\x1B[0m\x1B[38;2;118;111;144m_\x1B[0m
 \x1B[38;2;128;128;128m\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\x1B[0m\x1B[38;2;72;32;223m\u2560\x1B[0m\x1B[38;2;66;21;234m\u2560\x1B[0m
@@ -78,307 +124,6 @@ var XL1LogoColorizedAscii = `\x1B[38;2;128;128;128m\xA0\xA0\xA0\xA0\xA0\xA0\xA0\
 \x1B[38;2;128;128;128m\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\x1B[0m\x1B[38;2;68;25;230m\u2560\x1B[0m\x1B[38;2;66;21;234m\u2560\x1B[0m
 \x1B[38;2;128;128;128m\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\x1B[0m\x1B[38;2;108;93;162m\xB2\x1B[0m\x1B[38;2;99;79;176m^\x1B[0m`;
 
-// src/initLogger.ts
-import { Base, ConsoleLogger, isDefined, LogLevel, SilentLogger } from "@xylabs/sdk-js";
-var initLogger = /* @__PURE__ */ __name((config2) => {
-  let logger;
-  if (config2.log.silent) {
-    logger = new SilentLogger();
-  } else {
-    let level;
-    if (isDefined(config2.log.logLevel)) {
-      const parsed = LogLevel[config2.log.logLevel.toLowerCase()];
-      if (isDefined(parsed)) level = parsed;
-    }
-    logger = new ConsoleLogger(level);
-  }
-  Base.defaultLogger = logger;
-  return logger;
-}, "initLogger");
-
-// src/locatorFromConfig.ts
-import { asAddress, assertEx, isDefined as isDefined2, isString } from "@xylabs/sdk-js";
-import { initApiWallet, initBalanceSummaryMap, initEvmProvidersIfAvailable, initFinalizationArchivistIfNeeded, initProducerAccount, initServerNode, initStatusReporter, initTransferSummaryMap } from "@xyo-network/chain-orchestration";
-import { SimpleBlockRunner } from "@xyo-network/chain-services";
-import { initTelemetry } from "@xyo-network/chain-telemetry";
-import { validateHydratedBlock, validateHydratedBlockState } from "@xyo-network/chain-validation";
-import { HDWallet } from "@xyo-network/wallet";
-import { AccountBalanceViewerRpcSchemas, ADDRESS_INDEX, BlockViewerRpcSchemas, FinalizationViewerRpcSchemas, generateXyoBaseWalletFromPhrase, HttpRpcTransport, JsonRpcAccountBalanceViewer, JsonRpcBlockViewer, JsonRpcFinalizationViewer, JsonRpcMempoolRunner, JsonRpcMempoolViewer, MempoolRunnerRpcSchemas, MempoolViewerRpcSchemas, ProviderFactoryLocator, SimpleAccountBalanceViewer, SimpleBlockRewardViewer, SimpleBlockValidationViewer, SimpleBlockViewer, SimpleFinalizationRunner, SimpleFinalizationViewer, SimpleMempoolRunner, SimpleMempoolViewer, SimpleNetworkStakeViewer, SimpleStepRewardsByPositionViewer, SimpleStepRewardsByStakerViewer, SimpleStepRewardsByStepViewer, SimpleStepRewardsTotalViewer, SimpleStepRewardsViewer, SimpleStepViewer, SimpleTimeSyncViewer, SimpleWindowedBlockViewer, SimpleXyoConnectionRunner, SimpleXyoConnectionViewer, SimpleXyoGateway, SimpleXyoGatewayRunner, SimpleXyoRunner, SimpleXyoSigner, SimpleXyoViewer } from "@xyo-network/xl1-sdk";
-async function telemetryContextFromConfig(config2, serviceName, serviceVersion) {
-  const { otlpEndpoint } = config2.telemetry?.otel ?? {};
-  const { path: endpoint = "/metrics", port = 9466 } = config2.telemetry?.metrics?.scrape ?? {};
-  return await initTelemetry({
-    attributes: {
-      serviceName,
-      serviceVersion
-    },
-    otlpEndpoint,
-    metricsConfig: {
-      endpoint,
-      port
-    }
-  });
-}
-__name(telemetryContextFromConfig, "telemetryContextFromConfig");
-async function contextFromConfigWithoutLocator(config2, logger, serviceName, serviceVersion) {
-  const singletons = {};
-  const caches = {};
-  const telemetryConfig = await telemetryContextFromConfig(config2, serviceName, serviceVersion);
-  const statusReporter = initStatusReporter({
-    logger
-  });
-  return {
-    ...telemetryConfig,
-    config: config2,
-    singletons,
-    caches,
-    logger,
-    statusReporter
-  };
-}
-__name(contextFromConfigWithoutLocator, "contextFromConfigWithoutLocator");
-async function rootLocatorFromConfig(config2, context) {
-  let locator = new ProviderFactoryLocator(context);
-  locator.registerMany([
-    SimpleNetworkStakeViewer.factory(SimpleNetworkStakeViewer.dependencies, {}),
-    SimpleTimeSyncViewer.factory(SimpleTimeSyncViewer.dependencies, {}),
-    SimpleStepViewer.factory(SimpleStepViewer.dependencies, {}),
-    SimpleStepRewardsViewer.factory(SimpleStepRewardsViewer.dependencies, {}),
-    SimpleStepRewardsByPositionViewer.factory(SimpleStepRewardsByPositionViewer.dependencies, {}),
-    SimpleStepRewardsByStakerViewer.factory(SimpleStepRewardsByStakerViewer.dependencies, {}),
-    SimpleStepRewardsByStepViewer.factory(SimpleStepRewardsByStepViewer.dependencies, {}),
-    SimpleStepRewardsTotalViewer.factory(SimpleStepRewardsTotalViewer.dependencies, {}),
-    SimpleBlockValidationViewer.factory(SimpleBlockValidationViewer.dependencies, {
-      state: validateHydratedBlockState,
-      protocol: validateHydratedBlock
-    })
-  ]);
-  locator = await initEvmProvidersIfAvailable(locator);
-  locator = await (isString(config2.remote.rpc?.url) ? remoteLocatorFromConfig(config2, {
-    ...context,
-    locator
-  }) : localLocatorFromConfig(config2, {
-    ...context,
-    locator
-  }));
-  locator.freeze();
-  return locator;
-}
-__name(rootLocatorFromConfig, "rootLocatorFromConfig");
-async function localLocatorFromConfig(config2, context) {
-  const balancesSummaryMap = assertEx(await initBalanceSummaryMap(context), () => "Balance Summary Map not initialized");
-  const transfersSummaryMap = assertEx(await initTransferSummaryMap(context), () => "Transfer Summary Map not initialized");
-  const wallet = await initApiWallet(context);
-  const { writableChainArchivist, readonlyChainArchivist, pendingTransactionsArchivist, pendingBlocksArchivist } = await initServerNode({
-    ...context,
-    wallet,
-    transfersSummaryMap,
-    balancesSummaryMap
-  });
-  await initFinalizationArchivistIfNeeded(writableChainArchivist, config2, wallet);
-  const locator = new ProviderFactoryLocator(context);
-  locator.registerMany([
-    SimpleMempoolViewer.factory(SimpleMempoolViewer.dependencies, {
-      pendingTransactionsArchivist,
-      pendingBlocksArchivist
-    }),
-    SimpleMempoolRunner.factory(SimpleMempoolRunner.dependencies, {
-      pendingTransactionsArchivist,
-      pendingBlocksArchivist
-    }),
-    SimpleAccountBalanceViewer.factory(SimpleAccountBalanceViewer.dependencies, {
-      balancesSummaryMap,
-      transfersSummaryMap
-    }),
-    SimpleFinalizationViewer.factory(SimpleFinalizationViewer.dependencies, {
-      finalizedArchivist: readonlyChainArchivist
-    }),
-    SimpleBlockViewer.factory(SimpleBlockViewer.dependencies, {
-      finalizedArchivist: readonlyChainArchivist
-    }),
-    SimpleWindowedBlockViewer.factory(SimpleWindowedBlockViewer.dependencies, {
-      maxWindowSize: 1e4,
-      syncInterval: 1e4
-    }),
-    SimpleXyoConnectionViewer.factory(SimpleXyoConnectionViewer.dependencies, {}),
-    SimpleXyoViewer.factory(SimpleXyoViewer.dependencies, {
-      finalizedArchivist: readonlyChainArchivist
-    }),
-    SimpleFinalizationViewer.factory(SimpleFinalizationViewer.dependencies, {
-      finalizedArchivist: readonlyChainArchivist
-    }),
-    SimpleFinalizationRunner.factory(SimpleFinalizationRunner.dependencies, {
-      finalizedArchivist: writableChainArchivist
-    })
-  ]);
-  locator.freeze();
-  return locator;
-}
-__name(localLocatorFromConfig, "localLocatorFromConfig");
-async function remoteLocatorFromConfig(config2, context) {
-  const balancesSummaryMap = assertEx(await initBalanceSummaryMap(context), () => "Balance Summary Map not initialized");
-  const transfersSummaryMap = assertEx(await initTransferSummaryMap(context), () => "Transfer Summary Map not initialized");
-  const wallet = await initApiWallet(context);
-  const { readonlyChainArchivist, pendingTransactionsArchivist, pendingBlocksArchivist } = await initServerNode({
-    ...context,
-    wallet,
-    transfersSummaryMap,
-    balancesSummaryMap
-  });
-  const locator = new ProviderFactoryLocator(context);
-  locator.registerMany([
-    SimpleMempoolViewer.factory(SimpleMempoolViewer.dependencies, {
-      pendingTransactionsArchivist,
-      pendingBlocksArchivist
-    }),
-    SimpleMempoolRunner.factory(SimpleMempoolRunner.dependencies, {
-      pendingTransactionsArchivist,
-      pendingBlocksArchivist
-    }),
-    SimpleAccountBalanceViewer.factory(SimpleAccountBalanceViewer.dependencies, {
-      balancesSummaryMap,
-      transfersSummaryMap
-    }),
-    SimpleFinalizationViewer.factory(SimpleFinalizationViewer.dependencies, {
-      finalizedArchivist: readonlyChainArchivist
-    }),
-    SimpleBlockViewer.factory(SimpleBlockViewer.dependencies, {
-      finalizedArchivist: readonlyChainArchivist
-    }),
-    SimpleWindowedBlockViewer.factory(SimpleWindowedBlockViewer.dependencies, {
-      maxWindowSize: 1e4,
-      syncInterval: 1e4
-    }),
-    SimpleXyoViewer.factory(SimpleXyoViewer.dependencies, {
-      finalizedArchivist: readonlyChainArchivist
-    })
-  ]);
-  locator.freeze();
-  return locator;
-}
-__name(remoteLocatorFromConfig, "remoteLocatorFromConfig");
-async function producerLocatorFromConfig(config2, context) {
-  const { logger } = context;
-  const account = await initProducerAccount({
-    config: config2
-  });
-  const locator = new ProviderFactoryLocator(context);
-  const rewardAddress = asAddress(config2.actors.producer.rewardAddress ?? account.address, true);
-  logger?.info(`Using reward address ${rewardAddress}`);
-  if (rewardAddress === account.address) {
-    logger?.warn(`Using producer account address as reward address: ${account.address}`);
-  }
-  const remoteUrl = config2.actors.producer.remote.rpc?.url;
-  if (isString(remoteUrl)) {
-    const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport(remoteUrl, schemas), "transportFactory");
-    locator.registerMany([
-      JsonRpcMempoolViewer.factory(JsonRpcMempoolViewer.dependencies, {
-        transport: await transportFactory(MempoolViewerRpcSchemas)
-      }),
-      JsonRpcMempoolRunner.factory(JsonRpcMempoolRunner.dependencies, {
-        transport: await transportFactory(MempoolRunnerRpcSchemas)
-      }),
-      JsonRpcAccountBalanceViewer.factory(JsonRpcAccountBalanceViewer.dependencies, {
-        transport: await transportFactory(AccountBalanceViewerRpcSchemas)
-      }),
-      JsonRpcFinalizationViewer.factory(JsonRpcFinalizationViewer.dependencies, {
-        transport: await transportFactory(FinalizationViewerRpcSchemas)
-      }),
-      JsonRpcBlockViewer.factory(JsonRpcBlockViewer.dependencies, {
-        transport: await transportFactory(BlockViewerRpcSchemas)
-      })
-    ]);
-  }
-  locator.registerMany([
-    SimpleBlockRewardViewer.factory(SimpleBlockRewardViewer.dependencies, {}),
-    SimpleBlockRunner.factory(SimpleBlockRunner.dependencies, {
-      account,
-      rewardAddress
-    })
-  ]);
-  locator.freeze();
-  return locator;
-}
-__name(producerLocatorFromConfig, "producerLocatorFromConfig");
-function apiLocatorFromConfig(config2, context) {
-  const locator = new ProviderFactoryLocator(context);
-  locator.registerMany([
-    SimpleXyoRunner.factory(SimpleXyoRunner.dependencies, {}),
-    SimpleXyoConnectionRunner.factory(SimpleXyoConnectionRunner.dependencies, {}),
-    SimpleXyoGateway.factory(SimpleXyoGateway.dependencies, {})
-  ]);
-  locator.freeze();
-  return locator;
-}
-__name(apiLocatorFromConfig, "apiLocatorFromConfig");
-function mempoolLocatorFromConfig(config2, context) {
-  const locator = new ProviderFactoryLocator(context);
-  locator.registerMany([]);
-  locator.freeze();
-  return locator;
-}
-__name(mempoolLocatorFromConfig, "mempoolLocatorFromConfig");
-async function bridgeLocatorFromConfig(config2, context) {
-  const locator = new ProviderFactoryLocator(context);
-  const { mnemonic } = config2.actors.bridge;
-  const walletPhrase = isDefined2(mnemonic) ? mnemonic : HDWallet.generateMnemonic();
-  const wallet = await generateXyoBaseWalletFromPhrase(walletPhrase);
-  const signerAccount = await wallet.derivePath(ADDRESS_INDEX.XYO);
-  const remoteUrl = config2.actors.bridge.remote.rpc?.url;
-  if (isString(remoteUrl)) {
-    const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport(remoteUrl, schemas), "transportFactory");
-    locator.registerMany([
-      JsonRpcMempoolViewer.factory(JsonRpcMempoolViewer.dependencies, {
-        transport: await transportFactory(MempoolViewerRpcSchemas)
-      }),
-      JsonRpcMempoolRunner.factory(JsonRpcMempoolRunner.dependencies, {
-        transport: await transportFactory(MempoolRunnerRpcSchemas)
-      }),
-      JsonRpcAccountBalanceViewer.factory(JsonRpcAccountBalanceViewer.dependencies, {
-        transport: await transportFactory(AccountBalanceViewerRpcSchemas)
-      }),
-      JsonRpcFinalizationViewer.factory(JsonRpcFinalizationViewer.dependencies, {
-        transport: await transportFactory(FinalizationViewerRpcSchemas)
-      }),
-      JsonRpcBlockViewer.factory(JsonRpcBlockViewer.dependencies, {
-        transport: await transportFactory(BlockViewerRpcSchemas)
-      })
-    ]);
-  }
-  locator.registerMany([
-    SimpleXyoSigner.factory(SimpleXyoSigner.dependencies, {
-      account: signerAccount
-    }),
-    SimpleXyoRunner.factory(SimpleXyoRunner.dependencies, {}),
-    SimpleXyoConnectionRunner.factory(SimpleXyoConnectionRunner.dependencies, {}),
-    SimpleXyoGatewayRunner.factory(SimpleXyoGatewayRunner.dependencies, {})
-  ]);
-  locator.freeze();
-  return locator;
-}
-__name(bridgeLocatorFromConfig, "bridgeLocatorFromConfig");
-function rewardRedemptionLocatorFromConfig(config2, context) {
-  const locator = new ProviderFactoryLocator(context);
-  locator.registerMany([
-    SimpleXyoGatewayRunner.factory(SimpleXyoGatewayRunner.dependencies, {})
-  ]);
-  locator.freeze();
-  return locator;
-}
-__name(rewardRedemptionLocatorFromConfig, "rewardRedemptionLocatorFromConfig");
-async function locatorsFromConfig(actors, config2, context) {
-  const result = {
-    _root: await rootLocatorFromConfig(config2, context)
-  };
-  if (actors.includes("producer")) result.producer = await producerLocatorFromConfig(config2, result._root.context);
-  if (actors.includes("api")) result.api = await apiLocatorFromConfig(config2, result._root.context);
-  if (actors.includes("mempool")) result.mempool = await mempoolLocatorFromConfig(config2, result._root.context);
-  if (actors.includes("bridge")) result.bridge = await bridgeLocatorFromConfig(config2, result._root.context);
-  if (actors.includes("rewardRedemption")) result.rewardRedemption = await rewardRedemptionLocatorFromConfig(config2, result._root.context);
-  return result;
-}
-__name(locatorsFromConfig, "locatorsFromConfig");
-
 // src/optionsFromGlobalZodRegistry.ts
 import { isUsageMeta } from "@xyo-network/xl1-sdk";
 import { globalRegistry } from "zod";
@@ -396,24 +141,6 @@ var optionsFromGlobalZodRegistry = /* @__PURE__ */ __name(() => {
   return opts;
 }, "optionsFromGlobalZodRegistry");
 
-// src/tryParseConfig.ts
-import { isDefined as isDefined3, isNull } from "@xylabs/sdk-js";
-import { ConfigZod } from "@xyo-network/xl1-sdk";
-import { cosmiconfigSync } from "cosmiconfig";
-var configName = "xyo";
-var configSection = "xl1";
-var tryParseConfig = /* @__PURE__ */ __name(() => {
-  const explorer = cosmiconfigSync(configName);
-  const result = explorer.search();
-  if (!isNull(result)) {
-    const section = result?.config?.[configSection];
-    if (isDefined3(section) && typeof section === "object") {
-      return ConfigZod.parse(section);
-    }
-  }
-  return ConfigZod.parse({});
-}, "tryParseConfig");
-
 // src/waitForHostPort.ts
 import net from "net";
 var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
@@ -437,25 +164,28 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var configuration;
-var version = isDefined4("1.19.13") ? "1.19.13" : "unknown";
-function resolveConfig(config2) {
-  const logger = console;
-  const defaultChainId = toAddress("1");
-  const resolved = structuredClone(config2);
-  if (!resolved.chain.id) {
-    logger.warn(`No chain ID specified in configuration; defaulting to ${defaultChainId}`);
-    resolved.chain.id = defaultChainId;
-  }
-  return resolved;
-}
-__name(resolveConfig, "resolveConfig");
+var version = isDefined2("1.19.15") ? "1.19.15" : "unknown";
+var deepMerge = createDeepMerge({
+  arrayStrategy: "concat"
+});
 var getLocatorsFromConfig = /* @__PURE__ */ __name(async (actors, configuration2) => {
+  const actorConfigs = [];
+  for (const actorName of actors) {
+    const rawConfig = configuration2.actors.find((actor) => actor.name === actorName) ?? {
+      name: actorName
+    };
+    const actorConfig = ActorConfigZod.loose().parse(rawConfig);
+    actorConfigs.push(actorConfig);
+  }
+  const config2 = ConfigZod.parse(deepMerge(configuration2, {
+    actors: actorConfigs
+  }));
   const logger = initLogger(configuration2);
   const orchestrator = await Orchestrator.create({
     logger
   });
-  const context = await contextFromConfigWithoutLocator(configuration2, logger, "xl1-cli", version);
-  const locators = await locatorsFromConfig(actors, configuration2, context);
+  const context = await contextFromConfigWithoutLocator(config2, logger, "xl1-cli", version);
+  const locators = await locatorsFromConfig(context, config2);
   process.on("SIGINT", () => {
     void (async () => {
       try {
@@ -486,30 +216,25 @@ $0 <command> [options]`).parserConfiguration({
     "dot-notation": true,
     "parse-numbers": false,
     "populate--": true
-  }).env("XL1").scriptName("xl1").middleware((argv2) => {
+  }).env("XL1").scriptName("xl1").middleware(async (argv2) => {
     try {
-      const parsedConfigFile = tryParseConfig();
-      const parsedConfigArgs = argv2;
-      const parseResult = ConfigZod2.safeParse(parsedConfigFile);
+      const parsedConfigFile = await tryParseConfig();
+      const parsedConfigArgs = ConfigZod.safeParse(argv2).data ?? {};
+      const parseResult = ConfigZod.safeParse(deepMerge(parsedConfigFile, parsedConfigArgs));
       if (!parseResult.success) {
         throw parseResult.error;
       }
-      const mergedConfig = deepMerge(parsedConfigArgs);
-      const validatedMergedConfigResult = ConfigZod2.safeParse(mergedConfig);
+      const mergedConfig = parseResult.data;
+      const validatedMergedConfigResult = ConfigZod.safeParse(mergedConfig);
       if (!validatedMergedConfigResult.success) {
         throw validatedMergedConfigResult.error;
       }
       const resolvedConfig = resolveConfig(validatedMergedConfigResult.data);
-      const validatedConfigResult = ConfigZod2.safeParse(resolvedConfig);
+      const validatedConfigResult = ConfigZod.safeParse(resolvedConfig);
       if (!validatedConfigResult.success) {
         throw validatedConfigResult.error;
       }
       configuration = validatedConfigResult.data;
-      const { actors, ...rootConfig } = configuration;
-      const actorNames = Object.keys(actors);
-      for (const actorName of actorNames) {
-        configuration.actors[actorName] = deepMerge(rootConfig ?? {}, configuration.actors[actorName] ?? {});
-      }
       if (argv2["dump-config"]) {
         console.log(JSON.stringify(configuration, null, 2));
         process.exit(0);
@@ -527,9 +252,19 @@ $0 <command> [options]`).parserConfiguration({
     return yargs2.command("$0", "Run a XL1 API Node", () => {
     }, async () => {
       const { locators, orchestrator } = await getLocatorsFromConfig([
-        "api"
+        "api",
+        "mempool",
+        "validator"
       ], configuration);
-      await runApi(configuration, orchestrator, locators["api"]);
+      const actors = await Promise.all([
+        getApiActor(ApiConfigZod.parse(locators["api"].context.config), locators["api"]),
+        getMempoolActor(MempoolConfigZod.parse(locators["mempool"].context.config), locators["mempool"]),
+        getValidatorActor(ActorConfigZod.parse(locators["validator"].context.config), locators["validator"])
+      ]);
+      for (const actor of actors) {
+        await orchestrator.registerActor(actor);
+      }
+      await orchestrator.start();
     });
   }).command("bridge", "Run a XL1 Bridge Node", (yargs2) => {
     return yargs2.command("$0", "Run a XL1 Bridge Node", () => {
@@ -537,7 +272,7 @@ $0 <command> [options]`).parserConfiguration({
       const { locators, orchestrator } = await getLocatorsFromConfig([
         "bridge"
       ], configuration);
-      await runBridge(configuration, orchestrator, locators["bridge"]);
+      await runBridge(BridgeConfigZod.parse(locators["bridge"].context.config), orchestrator, locators["bridge"]);
     });
   }).command("mempool", "Run a XL1 Mempool Node", (yargs2) => {
     return yargs2.command("$0", "Run a XL1 Mempool Node", () => {
@@ -545,7 +280,7 @@ $0 <command> [options]`).parserConfiguration({
       const { locators, orchestrator } = await getLocatorsFromConfig([
         "mempool"
       ], configuration);
-      await runMempool(configuration, orchestrator, locators["mempool"]);
+      await runMempool(MempoolConfigZod.parse(locators["mempool"].context.config), orchestrator, locators["mempool"]);
     });
   }).command("producer", "Run a XL1 Producer Node", (yargs2) => {
     return yargs2.command("$0", "Run a XL1 Producer Node", () => {
@@ -553,7 +288,7 @@ $0 <command> [options]`).parserConfiguration({
       const { locators, orchestrator } = await getLocatorsFromConfig([
         "producer"
       ], configuration);
-      await runProducer(configuration, orchestrator, locators["producer"]);
+      await runProducer(ProducerConfigZod.parse(locators["producer"].context.config), orchestrator, locators["producer"]);
     });
   }).command("reward-redemption-api", "Run a XL1 Rewards Redemption API Node", (yargs2) => {
     return yargs2.command("$0", "Run a XL1 Rewards Redemption API Node", () => {
@@ -561,7 +296,7 @@ $0 <command> [options]`).parserConfiguration({
       const { locators, orchestrator } = await getLocatorsFromConfig([
         "rewardRedemption"
       ], configuration);
-      await runRewardRedemptionApi(configuration, orchestrator, locators["rewardRedemption"]);
+      await runRewardRedemptionApi(RewardRedemptionConfigZod.parse(locators["rewardRedemption"].context.config), orchestrator, locators["rewardRedemption"]);
     });
   }).command("$0", "Run a full XL1 Node", () => {
   }, async () => {
@@ -569,20 +304,24 @@ $0 <command> [options]`).parserConfiguration({
       "producer",
       "api"
     ];
-    if (configuration.actors.mempool.enabled) {
+    const mempoolEnabled = configuration.actors.find((actor) => actor.name === "mempool")?.enabled;
+    if (mempoolEnabled) {
       actors.push("mempool");
     }
     const { locators, orchestrator } = await getLocatorsFromConfig([
       "api",
       "producer"
     ], configuration);
-    if (configuration.actors.mempool.enabled) {
-      await runMempool(configuration, orchestrator, locators["mempool"]);
-      await waitForHostPort(configuration.actors.mempool.host, configuration.actors.mempool.port);
+    if (mempoolEnabled) {
+      const mempoolConfig = MempoolConfigZod.parse(locators["mempool"].context.config);
+      await runMempool(mempoolConfig, orchestrator, locators["mempool"]);
+      await waitForHostPort(mempoolConfig.host, mempoolConfig.port);
     }
-    await runApi(configuration, orchestrator, locators["api"]);
-    await waitForHostPort(configuration.actors.api.host, configuration.actors.api.port);
-    await runProducer(configuration, orchestrator, locators["producer"]);
+    const apiConfig = ApiConfigZod.parse(locators["api"].context.config);
+    await runApi(apiConfig, orchestrator, locators["api"]);
+    await waitForHostPort(apiConfig.host, apiConfig.port);
+    const producerConfig = ProducerConfigZod.parse(locators["producer"].context.config);
+    await runProducer(producerConfig, orchestrator, locators["producer"]);
   }).options({
     "dump-config": {
       type: "boolean",
@@ -603,6 +342,7 @@ var start = /* @__PURE__ */ __name(async () => {
   await runCLI();
 }, "start");
 export {
+  initLogger,
   runCLI,
   start
 };