@xyo-network/xl1-cli 1.6.4 → 1.6.6

package/build/commands/api/runApi.d.ts

@@ -1,2 +1,7 @@
-export declare function runApi(): void;
+import type { Logger } from '@xylabs/logger';
+interface RunApiContext {
+    logger?: Logger;
+}
+export declare function runApi(context: RunApiContext): void;
+export {};
 //# sourceMappingURL=runApi.d.ts.map

package/build/commands/api/runApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runApi.d.ts","sourceRoot":"","sources":["../../../src/commands/api/runApi.ts"],"names":[],"mappings":"AAGA,wBAAgB,MAAM,SAGrB"}
+{"version":3,"file":"runApi.d.ts","sourceRoot":"","sources":["../../../src/commands/api/runApi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAG5C,UAAU,aAAa;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,MAAM,CAAC,OAAO,EAAE,aAAa,QAG5C"}

package/build/commands/producer/runProducer.d.ts

@@ -1,3 +1,9 @@
+import type { Logger } from '@xylabs/logger';
 import type { Orchestrator } from '../../orchestration/index.ts';
-export declare const runProducer: (orchestrator: Orchestrator) => Promise<void>;
+interface RunProducerContext {
+    logger: Logger;
+    orchestrator: Orchestrator;
+}
+export declare const runProducer: (context: RunProducerContext) => Promise<void>;
+export {};
 //# sourceMappingURL=runProducer.d.ts.map

package/build/commands/producer/runProducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runProducer.d.ts","sourceRoot":"","sources":["../../../src/commands/producer/runProducer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAKhE,eAAO,MAAM,WAAW,GAAU,cAAc,YAAY,kBAmB3D,CAAA"}
+{"version":3,"file":"runProducer.d.ts","sourceRoot":"","sources":["../../../src/commands/producer/runProducer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAKhE,UAAU,kBAAkB;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,YAAY,CAAA;CAC3B;AAED,eAAO,MAAM,WAAW,GAAU,SAAS,kBAAkB,kBAoB5D,CAAA"}

package/build/commands/validator/runValidator.d.ts

@@ -1,3 +1,9 @@
+import type { Logger } from '@xylabs/logger';
 import type { Orchestrator } from '../../orchestration/index.ts';
-export declare const runValidator: (orchestrator: Orchestrator) => Promise<void>;
+interface RunValidatorContext {
+    logger: Logger;
+    orchestrator: Orchestrator;
+}
+export declare const runValidator: (context: RunValidatorContext) => Promise<void>;
+export {};
 //# sourceMappingURL=runValidator.d.ts.map

package/build/commands/validator/runValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runValidator.d.ts","sourceRoot":"","sources":["../../../src/commands/validator/runValidator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAGhE,eAAO,MAAM,YAAY,GAAU,cAAc,YAAY,kBAS5D,CAAA"}
+{"version":3,"file":"runValidator.d.ts","sourceRoot":"","sources":["../../../src/commands/validator/runValidator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAGhE,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,YAAY,CAAA;CAC3B;AAED,eAAO,MAAM,YAAY,GAAU,SAAS,mBAAmB,kBAW9D,CAAA"}

package/build/initLogger.d.ts

@@ -0,0 +1,3 @@
+import type { Logger } from '@xylabs/logger';
+export declare const initLogger: () => Logger;
+//# sourceMappingURL=initLogger.d.ts.map

package/build/initLogger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"initLogger.d.ts","sourceRoot":"","sources":["../src/initLogger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAI5C,eAAO,MAAM,UAAU,QAAO,MAS7B,CAAA"}

package/build/node/index.mjs

@@ -7,11 +7,11 @@ import { PayloadBuilder } from "@xyo-network/payload-builder";
 import { Mutex } from "async-mutex";
 
 // src/orchestration/actor/model/Actor.ts
-import { BaseEmitter } from "@xylabs/events";
+import { Base } from "@xylabs/base";
 import { forget } from "@xylabs/forget";
 import { IdLogger } from "@xylabs/logger";
 import { span, spanAsync } from "@xylabs/telemetry";
-var Actor = class extends BaseEmitter {
+var Actor = class extends Base {
   static {
     __name(this, "Actor");
   }
@@ -20,7 +20,7 @@ var Actor = class extends BaseEmitter {
   _displayName;
   _id;
   constructor(id, displayName = "Actor", params) {
-    const logger = params.logger ?? new IdLogger(console, () => `[${displayName} (${id})] `);
+    const logger = params.logger ?? new IdLogger(Base.defaultLogger ?? console, () => `[${displayName} (${id})] `);
     super({
       ...params,
       logger
@@ -102,7 +102,11 @@ var Orchestrator = class {
   }
   actors = [];
   keepAliveHandle = null;
+  logger;
   running = false;
+  constructor(logger) {
+    this.logger = logger;
+  }
   /**
   * Registers an actor.
   * (We won't activate the actor until `start()` is called.)
@@ -119,10 +123,10 @@ var Orchestrator = class {
   async start() {
     await Promise.resolve();
     if (this.running) {
-      console.log("[Orchestrator] Already started.");
+      this.logger?.warn("[Orchestrator] Already started.");
       return;
     }
-    console.log("[Orchestrator] Starting...");
+    this.logger?.log("[Orchestrator] Starting...");
     this.running = true;
     for (const actor of this.actors) {
       await actor.start();
@@ -136,16 +140,16 @@ var Orchestrator = class {
   async stop() {
     await Promise.resolve();
     if (!this.running) {
-      console.log("[Orchestrator] Already stopped.");
+      this.logger?.log("[Orchestrator] Already stopped.");
       return;
     }
-    console.log("[Orchestrator] Stopping...");
+    this.logger?.log("[Orchestrator] Stopping...");
     for (const actor of this.actors) {
       await actor.stop();
     }
     this.running = false;
     if (this.keepAliveHandle) clearInterval(this.keepAliveHandle);
-    console.log("[Orchestrator] Stopped...");
+    this.logger?.log("[Orchestrator] Stopped...");
   }
 };
 
@@ -204,8 +208,7 @@ var ChainHeadUpdateActor = class _ChainHeadUpdateActor extends Actor {
   get chainIterator() {
     return assertEx2(this.params.chainIterator, () => "chainIterator not set");
   }
-  static async create(params) {
-    await Promise.resolve();
+  static create(params) {
     return new _ChainHeadUpdateActor(params);
   }
   async start() {
@@ -255,7 +258,7 @@ var ProducerActor = class _ProducerActor extends Actor {
   _lastProducedBlock;
   _lastRedeclarationIntent;
   constructor(params) {
-    super(assertEx3(params.producer?.address, () => "Missing producer in params"), "Producer", params);
+    super(params.producer.address, "Producer", params);
   }
   get account() {
     return assertEx3(this.params.account, () => "account not set");
@@ -281,8 +284,7 @@ var ProducerActor = class _ProducerActor extends Actor {
   get stakeIntentService() {
     return assertEx3(this.params.stakeIntentService, () => "stakeIntentService not set");
   }
-  static async create(params) {
-    await Promise.resolve();
+  static create(params) {
     return new _ProducerActor(params);
   }
   async start() {
@@ -451,7 +453,6 @@ var initHealthEndpoints = /* @__PURE__ */ __name((params) => {
 
 // src/orchestration/initServices.ts
 import { assertEx as assertEx16 } from "@xylabs/assert";
-import { Base } from "@xylabs/base";
 import { asAddress as asAddress2 } from "@xylabs/hex";
 import { isDefined as isDefined5 } from "@xylabs/typeof";
 import { balanceSummaryRepositoryFromMap } from "@xyo-network/chain-modules";
@@ -696,9 +697,7 @@ var singleton11;
 var initLocalStakeIntentStateArchivist = /* @__PURE__ */ __name(async () => {
   return await mutex11.runExclusive(async () => {
     if (singleton11) return singleton11;
-    console.log("[InitServices:LocalStakeIntentStateArchivist:Initializing]");
     singleton11 = await getLocalPersistentArchivist("stakeIntent", "state");
-    console.log("[InitServices:LocalStakeIntentStateArchivist:Initialized]");
     return assertEx8(singleton11, () => new Error("Failed to initialize stake intent state archivist"));
   });
 }, "initLocalStakeIntentStateArchivist");
@@ -895,8 +894,8 @@ var getChainId = /* @__PURE__ */ __name(() => {
 
 // src/orchestration/services/implementation/evm/initGanacheProvider.ts
 var initJsonRpcProvider = /* @__PURE__ */ __name(() => {
-  const config2 = getJsonRpcProviderConfig();
-  return Promise.resolve(new JsonRpcProvider(...config2));
+  const config = getJsonRpcProviderConfig();
+  return Promise.resolve(new JsonRpcProvider(...config));
 }, "initJsonRpcProvider");
 var canUseJsonRpcProvider = /* @__PURE__ */ __name(() => {
   return canUseChainId() && process.env.XYO_JSON_RPC_URL !== void 0;
@@ -915,8 +914,8 @@ import { InfuraProvider } from "ethers/providers";
 var instance;
 var initInfuraProvider = /* @__PURE__ */ __name(() => {
   if (instance) return instance;
-  const config2 = getInfuraProviderConfig();
-  instance = Promise.resolve(new InfuraProvider(...config2));
+  const config = getInfuraProviderConfig();
+  instance = Promise.resolve(new InfuraProvider(...config));
   return instance;
 }, "initInfuraProvider");
 var canUseInfuraProvider = /* @__PURE__ */ __name(() => {
@@ -1196,17 +1195,16 @@ var isStartable = /* @__PURE__ */ __name((value) => {
   return isDefined5(value.start) && typeof value.start === "function";
 }, "isStartable");
 var initServices = /* @__PURE__ */ __name(async (logger) => {
-  Base.defaultLogger = logger ?? console;
-  const statusReporter = new RuntimeStatusMonitor(logger ?? console);
+  const statusReporter = new RuntimeStatusMonitor(logger);
   statusReporter.onGlobalTransition({
     to: "started"
   }, () => {
-    Base.defaultLogger?.log("All services started.");
+    logger.log("All services started.");
   });
   statusReporter.onGlobalTransition({
     to: "error"
   }, () => {
-    Base.defaultLogger?.error("Producer encountered an unhandled error!");
+    logger.error("Producer encountered an unhandled error!");
     process.exit(1);
   });
   await startupSpanAsync7("initHealthEndpoints", () => initHealthEndpoints({
@@ -1273,7 +1271,6 @@ var initServices = /* @__PURE__ */ __name(async (logger) => {
     chainArchivist,
     chainIterator,
     chainStakeViewer,
-    logger: console,
     stakeIntentStateArchivist,
     traceProvider,
     statusReporter
@@ -1326,7 +1323,7 @@ var initServices = /* @__PURE__ */ __name(async (logger) => {
     rewardService,
     stakeIntentService
   };
-  Base.defaultLogger?.log("All services created. Starting...");
+  logger?.log("All services created. Starting...");
   const startableServices = [
     balanceSummaryMap,
     ...Object.values(result)
@@ -1342,18 +1339,18 @@ import { hideBin } from "yargs/helpers";
 
 // src/commands/api/runApi.ts
 import { getServer } from "@xyo-network/chain-api";
-import { config } from "dotenv";
-function runApi() {
-  config();
-  void getServer();
+function runApi(context) {
+  const { logger } = context;
+  void getServer(void 0, void 0, logger);
 }
 __name(runApi, "runApi");
 
 // src/commands/producer/runProducer.ts
-var runProducer = /* @__PURE__ */ __name(async (orchestrator) => {
-  console.log("Services: Initializing...");
-  const services = await initServices();
-  console.log("Services: Initialized");
+var runProducer = /* @__PURE__ */ __name(async (context) => {
+  const { logger, orchestrator } = context;
+  logger?.log("Services: Initializing...");
+  const services = await initServices(logger);
+  logger?.log("Services: Initialized");
   const chainHeadUpdate = await ChainHeadUpdateActor.create(services);
   const producer = await ProducerActor.create(services);
   const balances = await BalanceActor.create(services);
@@ -1369,7 +1366,8 @@ var runProducer = /* @__PURE__ */ __name(async (orchestrator) => {
 }, "runProducer");
 
 // src/commands/validator/runValidator.ts
-var runValidator = /* @__PURE__ */ __name(async (orchestrator) => {
+var runValidator = /* @__PURE__ */ __name(async (context) => {
+  const { orchestrator } = context;
   const myActor = new Actor("Validator", "Validator", {});
   await orchestrator.registerActor(myActor);
   await orchestrator.start();
@@ -1395,28 +1393,25 @@ function waitForPort(host, port) {
   });
 }
 __name(waitForPort, "waitForPort");
-async function runCLI(orchestrator) {
+async function runCLI(context) {
   async function validateTransaction() {
-    console.log("Validating transaction...");
-    await Promise.resolve();
+    await Promise.reject("Not implemented yet");
   }
   __name(validateTransaction, "validateTransaction");
   async function submitTransaction() {
-    console.log("Submitting transaction...");
-    await Promise.resolve();
+    await Promise.reject("Not implemented yet");
   }
   __name(submitTransaction, "submitTransaction");
   async function checkBalance() {
-    console.log("Checking account balance...");
-    await Promise.resolve();
+    await Promise.reject("Not implemented yet");
   }
   __name(checkBalance, "checkBalance");
   const argv = yargs(hideBin(process.argv)).command("validator", "Run the XL1 validator", (yargs2) => {
     return yargs2.command("$0", "Run as a XL1 validator node", () => {
-    }, () => runValidator(orchestrator));
+    }, () => runValidator(context));
   }).command("producer", "Run the XL1 producer", (yargs2) => {
     return yargs2.command("$0", "Run as a XL1 producer node", () => {
-    }, () => runProducer(orchestrator));
+    }, () => runProducer(context));
   }).command("client", "Client-related operations", (yargs2) => {
     return yargs2.command("transaction", "Transaction-related operations", (yargs3) => {
       return yargs3.command("validate", "Validate a transaction", () => {
@@ -1425,14 +1420,14 @@ async function runCLI(orchestrator) {
     });
   }).command("api", "Run as a api node", (yargs2) => {
     return yargs2.command("$0", "Run as a api node", () => {
-    }, () => runApi()).command("run", "Run as a api node", () => {
-    }, () => runApi());
+    }, () => runApi(context)).command("run", "Run as a api node", () => {
+    }, () => runApi(context));
   }).command("$0", "Run a full XL1 deployment", (yargs2) => {
     return yargs2.command("$0", "Start the API and a producer", () => {
     }, async () => {
-      runApi();
+      runApi(context);
       await waitForPort("localhost", 8080);
-      await runProducer(orchestrator);
+      await runProducer(context);
     });
   }).command("account", "Account-related operations", (yargs2) => {
     return yargs2.command("balance", "Check account balance", () => {
@@ -1445,7 +1440,9 @@ __name(runCLI, "runCLI");
 // src/initEnv.ts
 import dotenv from "dotenv";
 var initEnv = /* @__PURE__ */ __name(() => {
-  dotenv.config();
+  dotenv.config({
+    quiet: true
+  });
   if (process.env.ENV_FILE !== void 0) {
     dotenv.config({
       path: process.env.ENV_FILE,
@@ -1454,24 +1451,43 @@ var initEnv = /* @__PURE__ */ __name(() => {
   }
 }, "initEnv");
 
+// src/initLogger.ts
+import { Base as Base2 } from "@xylabs/base";
+import { ConsoleLogger, LogLevel } from "@xylabs/logger";
+import { isDefined as isDefined6 } from "@xylabs/typeof";
+var initLogger = /* @__PURE__ */ __name(() => {
+  let level = LogLevel.info;
+  if (isDefined6(process.env.LOG_LEVEL)) {
+    const parsed = LogLevel[process.env.LOG_LEVEL.toLowerCase()];
+    if (isDefined6(parsed)) level = parsed;
+  }
+  const logger = new ConsoleLogger(level);
+  Base2.defaultLogger = logger;
+  return logger;
+}, "initLogger");
+
 // src/start.ts
 var start = /* @__PURE__ */ __name(async () => {
   initEnv();
-  const orchestrator = new Orchestrator();
+  const logger = initLogger();
+  const orchestrator = new Orchestrator(logger);
   process.on("SIGINT", () => {
     void (async () => {
       try {
-        console.log("\nSIGINT received. Attempting graceful shutdown...");
+        logger.log("\nSIGINT received. Attempting graceful shutdown...");
         await orchestrator?.stop();
-        console.log("Orchestrator stopped, exiting now.");
+        logger.log("Orchestrator stopped, exiting now.");
         process.exit(0);
       } catch (err) {
-        console.error("Error stopping orchestrator:", err);
+        logger.error("Error stopping orchestrator:", err);
         process.exit(1);
       }
     })();
   });
-  await runCLI(orchestrator);
+  await runCLI({
+    logger,
+    orchestrator
+  });
 }, "start");
 export {
   Actor,