@xyo-network/xl1-cli-lib 1.20.28 → 1.21.0

package/dist/node/commands/index.d.ts

@@ -1,10 +1,3 @@
-export * from './api/index.ts';
-export * from './bridge/index.ts';
-export * from './finalizer/index.ts';
-export * from './mempool/index.ts';
-export * from './producer/index.ts';
-export * from './rewardRedemption/index.ts';
 export * from './start/index.ts';
-export * from './types.ts';
 export * from './withDeprecationWarning.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/node/commands/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,6BAA6B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,6BAA6B,CAAA"}

package/dist/node/commands/start/startCommand.d.ts

@@ -1,5 +1,5 @@
+import type { GetLocatorsFromConfig } from '@xyo-network/chain-orchestration';
 import type { Config } from '@xyo-network/xl1-sdk';
 import type { CommandModule } from 'yargs';
-import type { GetLocatorsFromConfig } from '../types.ts';
 export declare function startCommand(getConfiguration: () => Config, getLocatorsFromConfig: GetLocatorsFromConfig): CommandModule;
 //# sourceMappingURL=startCommand.d.ts.map

package/dist/node/commands/start/startCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/startCommand.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,EAAkC,MAAM,sBAAsB,CAAA;AAClF,OAAO,KAAK,EACgB,aAAa,EACxC,MAAM,OAAO,CAAA;AAMd,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAyExD,wBAAgB,YAAY,CAAC,gBAAgB,EAAE,MAAM,MAAM,EAAE,qBAAqB,EAAE,qBAAqB,GAAG,aAAa,CAgCxH"}
+{"version":3,"file":"startCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/startCommand.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACO,qBAAqB,EACvC,MAAM,kCAAkC,CAAA;AAWzC,OAAO,KAAK,EAAE,MAAM,EAAkC,MAAM,sBAAsB,CAAA;AAClF,OAAO,KAAK,EACgB,aAAa,EACxC,MAAM,OAAO,CAAA;AA2Ed,wBAAgB,YAAY,CAAC,gBAAgB,EAAE,MAAM,MAAM,EAAE,qBAAqB,EAAE,qBAAqB,GAAG,aAAa,CA6BxH"}

package/dist/node/index.mjs

@@ -101,224 +101,26 @@ var initLogger = /* @__PURE__ */ __name((config2) => {
 import { stdin as input, stdout as output } from "process";
 import { createInterface } from "readline/promises";
 import { isDefined as isDefined3 } from "@xylabs/sdk-js";
+import { apiCommand } from "@xyo-network/chain-api";
+import { bridgeCommand } from "@xyo-network/chain-bridge";
+import { finalizerCommand } from "@xyo-network/chain-finalizer";
+import { mempoolCommand } from "@xyo-network/chain-mempool";
 import { contextFromConfigWithoutLocator, detectDerivationPathCollisions, formatWalletReport, initializeResolvedWalletReport, locatorsFromConfig, Orchestrator } from "@xyo-network/chain-orchestration";
+import { initHealthEndpoints } from "@xyo-network/chain-orchestration-express";
+import { producerCommand } from "@xyo-network/chain-producer";
+import { rewardRedemptionCommand } from "@xyo-network/chain-reward-redemption";
 import { ActorConfigZod, ConfigZod as ConfigZod2 } from "@xyo-network/xl1-sdk";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
-// src/commands/api/apiCommand.ts
+// src/commands/start/startCommand.ts
 import { getApiActor } from "@xyo-network/chain-api";
+import { getBridgeActor } from "@xyo-network/chain-bridge";
+import { getFinalizerActor } from "@xyo-network/chain-finalizer";
 import { getMempoolActor } from "@xyo-network/chain-mempool";
-import { ApiConfigZod, FinalizerConfigZod, MempoolConfigZod } from "@xyo-network/chain-orchestration";
-
-// src/commands/finalizer/runFinalizer.ts
-import { exists } from "@xylabs/sdk-js";
-import { FinalizerActor, initActorWallet } from "@xyo-network/chain-orchestration";
-var getFinalizerActor = /* @__PURE__ */ __name(async (config2, locator) => {
-  const account = await initActorWallet({
-    config: config2,
-    logger: locator.context.logger,
-    singletons: {},
-    caches: {}
-  });
-  return await FinalizerActor.create({
-    account,
-    config: config2,
-    locator
-  });
-}, "getFinalizerActor");
-
-// src/commands/api/apiCommand.ts
-function apiCommand(getConfiguration2, getLocatorsFromConfig2) {
-  return {
-    command: "api",
-    deprecated: 'Use "start api" instead',
-    describe: "Run a XL1 API Node",
-    handler: /* @__PURE__ */ __name(async () => {
-      const configuration2 = getConfiguration2();
-      const { locators, orchestrator } = await getLocatorsFromConfig2([
-        "api",
-        "mempool",
-        "finalizer"
-      ], configuration2);
-      const actors = await Promise.all([
-        getApiActor(ApiConfigZod.parse(locators["api"].context.config), locators["api"]),
-        getMempoolActor(MempoolConfigZod.parse(locators["mempool"].context.config), locators["mempool"]),
-        getFinalizerActor(FinalizerConfigZod.parse(locators["finalizer"].context.config), locators["finalizer"])
-      ]);
-      for (const actor of actors) {
-        await orchestrator.registerActor(actor);
-      }
-      await orchestrator.start();
-    }, "handler")
-  };
-}
-__name(apiCommand, "apiCommand");
-
-// src/commands/bridge/bridgeCommand.ts
-import { BridgeConfigZod } from "@xyo-network/chain-orchestration";
-
-// src/commands/bridge/runBridge.ts
-import { exists as exists2 } from "@xylabs/sdk-js";
-import { BridgeActor } from "@xyo-network/chain-bridge";
-import { initActorWallet as initActorWallet2 } from "@xyo-network/chain-orchestration";
-var getBridgeActor = /* @__PURE__ */ __name(async (config2, locator) => {
-  const account = await initActorWallet2({
-    config: config2,
-    logger: locator.context.logger,
-    singletons: {},
-    caches: {}
-  });
-  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 = [
-    bridge
-  ].filter(exists2);
-  for (const actor of actors) {
-    await orchestrator.registerActor(actor);
-  }
-  await orchestrator.start();
-}, "runBridge");
-
-// src/commands/bridge/bridgeCommand.ts
-function bridgeCommand(getConfiguration2, getLocatorsFromConfig2) {
-  return {
-    command: "bridge",
-    deprecated: 'Use "start bridge" instead',
-    describe: "Run a XL1 Bridge Node",
-    handler: /* @__PURE__ */ __name(async () => {
-      const configuration2 = getConfiguration2();
-      const { locators, orchestrator } = await getLocatorsFromConfig2([
-        "bridge"
-      ], configuration2);
-      await runBridge(BridgeConfigZod.parse(locators["bridge"].context.config), orchestrator, locators["bridge"]);
-    }, "handler")
-  };
-}
-__name(bridgeCommand, "bridgeCommand");
-
-// src/commands/mempool/mempoolCommand.ts
-import { runMempool } from "@xyo-network/chain-mempool";
-import { MempoolConfigZod as MempoolConfigZod2 } from "@xyo-network/chain-orchestration";
-function mempoolCommand(getConfiguration2, getLocatorsFromConfig2) {
-  return {
-    command: "mempool",
-    deprecated: 'Use "start mempool" instead',
-    describe: "Run a XL1 Mempool Node",
-    handler: /* @__PURE__ */ __name(async () => {
-      const configuration2 = getConfiguration2();
-      const { locators, orchestrator } = await getLocatorsFromConfig2([
-        "mempool"
-      ], configuration2);
-      await runMempool(MempoolConfigZod2.parse(locators["mempool"].context.config), orchestrator, locators["mempool"]);
-    }, "handler")
-  };
-}
-__name(mempoolCommand, "mempoolCommand");
-
-// src/commands/producer/producerCommand.ts
-import { ProducerConfigZod } from "@xyo-network/chain-orchestration";
-import { runProducer } from "@xyo-network/chain-producer";
-function producerCommand(getConfiguration2, getLocatorsFromConfig2) {
-  return {
-    command: "producer",
-    deprecated: 'Use "start producer" instead',
-    describe: "Run a XL1 Producer Node",
-    handler: /* @__PURE__ */ __name(async () => {
-      const configuration2 = getConfiguration2();
-      const { locators, orchestrator } = await getLocatorsFromConfig2([
-        "producer"
-      ], configuration2);
-      await runProducer(ProducerConfigZod.parse(locators["producer"].context.config), orchestrator, locators["producer"]);
-    }, "handler")
-  };
-}
-__name(producerCommand, "producerCommand");
-
-// src/commands/rewardRedemption/rewardRedemptionCommand.ts
-import { RewardRedemptionConfigZod } from "@xyo-network/chain-orchestration";
-
-// src/commands/rewardRedemption/runRewardRedemptionApi.ts
-import { exists as exists3 } from "@xylabs/sdk-js";
-import { initActorWallet as initActorWallet3 } from "@xyo-network/chain-orchestration";
-import { RewardRedemptionActor } from "@xyo-network/chain-reward-redemption";
-async function getRewardRedemptionActor(config2, locator) {
-  const account = await initActorWallet3({
-    config: config2,
-    logger: locator.context.logger,
-    singletons: {},
-    caches: {}
-  });
-  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(exists3);
-  for (const actor of actors) {
-    await orchestrator.registerActor(actor);
-  }
-  await orchestrator.start();
-}
-__name(runRewardRedemptionApi, "runRewardRedemptionApi");
-
-// src/commands/rewardRedemption/rewardRedemptionCommand.ts
-function rewardRedemptionCommand(getConfiguration2, getLocatorsFromConfig2) {
-  return {
-    command: "reward-redemption-api",
-    deprecated: 'Use "start rewardRedemption" instead',
-    describe: "Run a XL1 Rewards Redemption API Node",
-    handler: /* @__PURE__ */ __name(async () => {
-      const configuration2 = getConfiguration2();
-      const { locators, orchestrator } = await getLocatorsFromConfig2([
-        "rewardRedemption"
-      ], configuration2);
-      await runRewardRedemptionApi(RewardRedemptionConfigZod.parse(locators["rewardRedemption"].context.config), orchestrator, locators["rewardRedemption"]);
-    }, "handler")
-  };
-}
-__name(rewardRedemptionCommand, "rewardRedemptionCommand");
-
-// src/commands/start/startCommand.ts
-import { getApiActor as getApiActor2 } from "@xyo-network/chain-api";
-import { getMempoolActor as getMempoolActor2 } from "@xyo-network/chain-mempool";
-import { ApiConfigZod as ApiConfigZod2, BridgeConfigZod as BridgeConfigZod2, FinalizerConfigZod as FinalizerConfigZod2, MempoolConfigZod as MempoolConfigZod3, ProducerConfigZod as ProducerConfigZod2, RewardRedemptionConfigZod as RewardRedemptionConfigZod2 } from "@xyo-network/chain-orchestration";
-import { runProducer as runProducer2 } from "@xyo-network/chain-producer";
-
-// src/waitForHostPort.ts
-import net from "net";
-var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
-  return new Promise((resolve) => {
-    const tryConnect = /* @__PURE__ */ __name(() => {
-      const socket = new net.Socket();
-      socket.setTimeout(1e3).once("error", () => {
-        socket.destroy();
-        setTimeout(tryConnect, 500);
-      }).once("timeout", () => {
-        socket.destroy();
-        setTimeout(tryConnect, 500);
-      }).connect(port, host, () => {
-        socket.end();
-        resolve();
-      });
-    }, "tryConnect");
-    tryConnect();
-  });
-}, "waitForHostPort");
-
-// src/commands/start/startCommand.ts
+import { ApiConfigZod, BridgeConfigZod, FinalizerConfigZod, MempoolConfigZod, ProducerConfigZod, RewardRedemptionConfigZod } from "@xyo-network/chain-orchestration";
+import { getProducerActor } from "@xyo-network/chain-producer";
+import { getRewardRedemptionActor } from "@xyo-network/chain-reward-redemption";
 var KNOWN_ACTORS = [
   "api",
   "bridge",
@@ -327,6 +129,7 @@ var KNOWN_ACTORS = [
   "producer",
   "rewardRedemption"
 ];
+var BOOT_TIMEOUT_MS = 6e4;
 function getActorsFromConfig(configuration2) {
   const enabledActors = configuration2.actors.filter((actor) => actor.enabled !== false).map((actor) => actor.name);
   return enabledActors.length > 0 ? enabledActors : void 0;
@@ -340,56 +143,50 @@ function getDefaultActors() {
   ];
 }
 __name(getDefaultActors, "getDefaultActors");
-async function startActor(name, locator, orchestrator) {
+async function buildActor(name, locator) {
   switch (name) {
     case "api": {
-      const config2 = ApiConfigZod2.parse(locator.context.config);
-      const actor = await getApiActor2(config2, locator);
-      await orchestrator.registerActor(actor);
-      await orchestrator.start();
-      await waitForHostPort(config2.host, config2.port);
-      break;
+      const config2 = ApiConfigZod.parse(locator.context.config);
+      return await getApiActor(config2, locator);
     }
     case "bridge": {
-      const config2 = BridgeConfigZod2.parse(locator.context.config);
-      const actor = await getBridgeActor(config2, locator);
-      await orchestrator.registerActor(actor);
-      await orchestrator.start();
-      break;
+      const config2 = BridgeConfigZod.parse(locator.context.config);
+      return await getBridgeActor(config2, locator);
     }
     case "mempool": {
-      const config2 = MempoolConfigZod3.parse(locator.context.config);
-      const actor = await getMempoolActor2(config2, locator);
-      await orchestrator.registerActor(actor);
-      await orchestrator.start();
-      await waitForHostPort(config2.host, config2.port);
-      break;
+      const config2 = MempoolConfigZod.parse(locator.context.config);
+      return await getMempoolActor(config2, locator);
     }
     case "producer": {
-      const config2 = ProducerConfigZod2.parse(locator.context.config);
-      await runProducer2(config2, orchestrator, locator);
-      break;
+      const config2 = ProducerConfigZod.parse(locator.context.config);
+      return await getProducerActor(config2, locator);
     }
     case "rewardRedemption": {
-      const config2 = RewardRedemptionConfigZod2.parse(locator.context.config);
-      const actor = await getRewardRedemptionActor(config2, locator);
-      await orchestrator.registerActor(actor);
-      await orchestrator.start();
-      break;
+      const config2 = RewardRedemptionConfigZod.parse(locator.context.config);
+      return await getRewardRedemptionActor(config2, locator);
     }
     case "finalizer": {
-      const config2 = FinalizerConfigZod2.parse(locator.context.config);
-      const actor = await getFinalizerActor(config2, locator);
-      await orchestrator.registerActor(actor);
-      await orchestrator.start();
-      break;
+      const config2 = FinalizerConfigZod.parse(locator.context.config);
+      return await getFinalizerActor(config2, locator);
     }
     default: {
       throw new Error(`Unknown actor: ${name}`);
     }
   }
 }
-__name(startActor, "startActor");
+__name(buildActor, "buildActor");
+async function bootActors(requestedActors, locators, orchestrator, configuration2) {
+  const startedAt = Date.now();
+  const actors = await Promise.all(requestedActors.map((name) => buildActor(name, locators[name])));
+  for (const actor of actors) {
+    await orchestrator.registerActor(actor);
+  }
+  await orchestrator.start();
+  await orchestrator.whenReady(BOOT_TIMEOUT_MS);
+  const ms = Date.now() - startedAt;
+  initLogger(configuration2).info(`[xl1] system ready (${requestedActors.length} actor${requestedActors.length === 1 ? "" : "s"}, ${ms}ms)`);
+}
+__name(bootActors, "bootActors");
 function startCommand(getConfiguration2, getLocatorsFromConfig2) {
   return {
     command: [
@@ -415,9 +212,7 @@ function startCommand(getConfiguration2, getLocatorsFromConfig2) {
       const configuration2 = getConfiguration2();
       const requestedActors = argv.actors !== void 0 && argv.actors.length > 0 ? argv.actors : getActorsFromConfig(configuration2) ?? getDefaultActors();
       const { locators, orchestrator } = await getLocatorsFromConfig2(requestedActors, configuration2);
-      for (const name of requestedActors) {
-        await startActor(name, locators[name], orchestrator);
-      }
+      await bootActors(requestedActors, locators, orchestrator, configuration2);
     }, "handler")
   };
 }
@@ -479,8 +274,10 @@ var optionsFromGlobalZodRegistry = /* @__PURE__ */ __name(() => {
 }, "optionsFromGlobalZodRegistry");
 
 // src/runCLI.ts
+var DEFAULT_HEALTH_CHECK_PORT = 9090;
 var configuration;
-var version = isDefined3("1.20.28") ? "1.20.28" : "unknown";
+var skipInsecureConfirm = false;
+var version = isDefined3("1.21.0") ? "1.21.0" : "unknown";
 function getConfiguration() {
   return configuration;
 }
@@ -527,11 +324,23 @@ async function getLocatorsFromConfig(actors, configuration2) {
   const walletReport = await initializeResolvedWalletReport(actors, configuration2);
   logger.info(formatWalletReport(walletReport));
   const context = await contextFromConfigWithoutLocator(config2, logger, "xl1-cli", version);
-  const locators = await locatorsFromConfig(context, config2, async () => await promptForInsecureGenesisConfirmation(logger));
+  if (skipInsecureConfirm) {
+    logger.warn("Insecure genesis reward wallet is active. Interactive confirmation skipped via --skip-insecure-confirm.");
+  }
+  const onInsecureGenesisConfirm = skipInsecureConfirm ? void 0 : async () => await promptForInsecureGenesisConfirmation(logger);
+  const locators = await locatorsFromConfig(context, config2, onInsecureGenesisConfirm);
+  const healthCheckPort = configuration2.healthCheckPort ?? DEFAULT_HEALTH_CHECK_PORT;
+  const healthServer = healthCheckPort > 0 && context.statusReporter !== void 0 ? await initHealthEndpoints({
+    logger,
+    port: healthCheckPort,
+    readiness: orchestrator,
+    statusMonitor: context.statusReporter
+  }) : void 0;
   process.on("SIGINT", () => {
     void (async () => {
       try {
         logger.log("\nSIGINT received. Attempting graceful shutdown...");
+        healthServer?.close();
         await orchestrator?.stop();
         logger.log("Orchestrator stopped, exiting now.");
         process.exit(0);
@@ -563,7 +372,8 @@ $0 <command> [options]`).parserConfiguration({
     await configMiddleware(argv2, (config2) => {
       configuration = config2;
     });
-  }).options(optionsFromGlobalZodRegistry()).wrap(y.terminalWidth()).command(withDeprecationWarning(apiCommand(getConfiguration, getLocatorsFromConfig))).command(withDeprecationWarning(bridgeCommand(getConfiguration, getLocatorsFromConfig))).command(withDeprecationWarning(mempoolCommand(getConfiguration, getLocatorsFromConfig))).command(withDeprecationWarning(producerCommand(getConfiguration, getLocatorsFromConfig))).command(withDeprecationWarning(rewardRedemptionCommand(getConfiguration, getLocatorsFromConfig))).command(startCommand(getConfiguration, getLocatorsFromConfig)).options({
+    skipInsecureConfirm = Boolean(argv2["skip-insecure-confirm"]);
+  }).options(optionsFromGlobalZodRegistry()).wrap(y.terminalWidth()).command(withDeprecationWarning(apiCommand(getConfiguration, getLocatorsFromConfig))).command(withDeprecationWarning(bridgeCommand(getConfiguration, getLocatorsFromConfig))).command(withDeprecationWarning(finalizerCommand(getConfiguration, getLocatorsFromConfig))).command(withDeprecationWarning(mempoolCommand(getConfiguration, getLocatorsFromConfig))).command(withDeprecationWarning(producerCommand(getConfiguration, getLocatorsFromConfig))).command(withDeprecationWarning(rewardRedemptionCommand(getConfiguration, getLocatorsFromConfig))).command(startCommand(getConfiguration, getLocatorsFromConfig)).options({
     "config": {
       type: "string",
       description: "Path to a config file to use instead of the default search.",
@@ -577,6 +387,11 @@ $0 <command> [options]`).parserConfiguration({
       type: "boolean",
       description: "Just process the configuration and print the resolved config to stdout, then exit.",
       default: false
+    },
+    "skip-insecure-confirm": {
+      type: "boolean",
+      description: "Skip the interactive RETURN confirmation when the built-in dev mnemonic / insecure genesis reward wallet is active.",
+      default: false
     }
   }).help().alias("help", "h").version(version).argv;
   await argv;