@constellation-network/node-pilot 0.0.8 → 0.0.10

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @constellation-network/node-pilot
 $ cpilot COMMAND
 running command...
 $ cpilot (--version|-v)
-@constellation-network/node-pilot/0.0.8 darwin-arm64 node-v22.15.0
+@constellation-network/node-pilot/0.0.10 darwin-arm64 node-v22.15.0
 $ cpilot --help [COMMAND]
 USAGE
   $ cpilot COMMAND
@@ -42,8 +42,8 @@ If no command is entered, node-pilot will automatically perform a series of chec
 * [`cpilot config set NAME VALUE`](#cpilot-config-set-name-value)
 * [`cpilot help [COMMAND]`](#cpilot-help-command)
 * [`cpilot info`](#cpilot-info)
-* [`cpilot logs [LAYER]`](#cpilot-logs-layer)
-* [`cpilot restart`](#cpilot-restart)
+* [`cpilot logs LAYER`](#cpilot-logs-layer)
+* [`cpilot restart [LAYER]`](#cpilot-restart-layer)
 * [`cpilot shutdown`](#cpilot-shutdown)
 * [`cpilot status`](#cpilot-status)
 
@@ -62,7 +62,7 @@ EXAMPLES
   $ cpilot config
 ```
 
-_See code: [src/commands/config.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.8/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.10/src/commands/config.ts)_
 
 ## `cpilot config get [NAME]`
 
@@ -86,7 +86,7 @@ EXAMPLES
   $ cpilot config get gl0:CL_PUBLIC_HTTP_PORT
 ```
 
-_See code: [src/commands/config/get.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.8/src/commands/config/get.ts)_
+_See code: [src/commands/config/get.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.10/src/commands/config/get.ts)_
 
 ## `cpilot config set NAME VALUE`
 
@@ -109,7 +109,7 @@ EXAMPLES
   $ cpilot config set gl0:CL_PUBLIC_HTTP_PORT 9000
 ```
 
-_See code: [src/commands/config/set.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.8/src/commands/config/set.ts)_
+_See code: [src/commands/config/set.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.10/src/commands/config/set.ts)_
 
 ## `cpilot help [COMMAND]`
 
@@ -146,15 +146,15 @@ EXAMPLES
   $ cpilot info
 ```
 
-_See code: [src/commands/info.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.8/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.10/src/commands/info.ts)_
 
-## `cpilot logs [LAYER]`
+## `cpilot logs LAYER`
 
 view validator node runtime logs
 
 ```
 USAGE
-  $ cpilot logs [LAYER] [-f] [-n <value>]
+  $ cpilot logs LAYER [-f] [-n <value>]
 
 ARGUMENTS
   LAYER  network layer to view. e.g. gl0
@@ -170,15 +170,26 @@ EXAMPLES
   $ cpilot logs
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.8/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.10/src/commands/logs.ts)_
 
-## `cpilot restart`
+## `cpilot restart [LAYER]`
 
 A full shutdown of the validator node, then restart
 
 ```
 USAGE
-  $ cpilot restart
+  $ cpilot restart [LAYER] [-p ] [--autostart] [--update]
+
+ARGUMENTS
+  LAYER  network layer to restart. e.g. gl0
+
+FLAGS
+  --autostart  restart each running project if it has been stopped
+  --update     update each project if a new version is available
+
+GLOBAL FLAGS
+  -p, --project=<option>  Specify the project name to use
+                          <options: >
 
 DESCRIPTION
   A full shutdown of the validator node, then restart
@@ -187,7 +198,7 @@ EXAMPLES
   $ cpilot restart
 ```
 
-_See code: [src/commands/restart.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.8/src/commands/restart.ts)_
+_See code: [src/commands/restart.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.10/src/commands/restart.ts)_
 
 ## `cpilot shutdown`
 
@@ -204,7 +215,7 @@ EXAMPLES
   $ cpilot shutdown
 ```
 
-_See code: [src/commands/shutdown.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.8/src/commands/shutdown.ts)_
+_See code: [src/commands/shutdown.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.10/src/commands/shutdown.ts)_
 
 ## `cpilot status`
 
@@ -218,5 +229,5 @@ DESCRIPTION
   Display node status and configuration settings
 ```
 
-_See code: [src/commands/status.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.8/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.10/src/commands/status.ts)_
 <!-- commandsstop -->

package/bin/dev.js

@@ -5,15 +5,10 @@ const skipDefaultCommand = {
 if (process.argv.length === 2) {
     process.argv[2] = 'status';
 }
-else if (process.argv.length > 2 && process.argv[2].startsWith('-') && !skipDefaultCommand[process.argv[2]]) {
+else if (process.argv.length > 2 && process.argv.every(a => a.startsWith('-')) && !skipDefaultCommand[process.argv[2]]) {
     process.argv.splice(2, 0 , 'status');
 }
 
 import {execute} from '@oclif/core'
 
 await execute({development: true, dir: import.meta.url})
-
-// eslint-disable-next-line no-warning-comments
-// TODO
-// cpilot config set project pacaswap-metagraph
-// cpilot config --project pacaswap-metagraph

package/bin/run.js

@@ -6,7 +6,7 @@ const skipDefaultCommand = {
 if (process.argv.length === 2) {
     process.argv[2] = 'status';
 }
-else if (process.argv.length > 2 && process.argv[2].startsWith('-') && !skipDefaultCommand[process.argv[2]]) {
+else if (process.argv.length > 2 && process.argv.every(a => a.startsWith('-')) && !skipDefaultCommand[process.argv[2]]) {
     process.argv.splice(2, 0 , 'status');
 }
 

package/dist/base-command.d.ts

@@ -0,0 +1,9 @@
+import { Command } from '@oclif/core';
+export declare abstract class BaseCommand extends Command {
+    static baseFlags: {
+        project: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    checkProject(flags: {
+        project?: string;
+    }): void;
+}

package/dist/base-command.js

@@ -0,0 +1,20 @@
+// src/base.ts
+import { Command, Flags } from '@oclif/core';
+import { configStore } from "./config-store.js";
+import { configHelper } from "./helpers/config-helper.js";
+export class BaseCommand extends Command {
+    static baseFlags = {
+        project: Flags.string({
+            char: 'p',
+            description: 'Specify the project name to use',
+            helpGroup: 'GLOBAL', // Optional: Group this flag in the help output
+            options: configStore.getProjects()
+        })
+    };
+    checkProject(flags) {
+        configHelper.assertProject('No project found. ');
+        if (flags.project) {
+            configStore.setActiveProject(flags.project);
+        }
+    }
+}

package/dist/checks/check-hardware.js

@@ -20,7 +20,7 @@ export const checkHardware = {
         const numOfCores = os.availableParallelism();
         let allPassed = true;
         const formatActual = (value, recommended, units = '') => {
-            const passed = Number(value) >= recommended;
+            const passed = Math.ceil(Number(value)) >= recommended;
             allPassed = allPassed && passed;
             return passed ? chalk.greenBright(value + units) : chalk.redBright(value + units);
         };
@@ -32,8 +32,8 @@ export const checkHardware = {
             { headerColor: 'white', value: 'ACTUAL' },
         ];
         const rows = [
-            [fc("Disk size"), fc("320 GB"), formatActual(totalSpaceGB, 320, " GB")],
-            [fc("System memory"), fc("8 GB"), formatActual(totalMemoryGB, 8, " GB")],
+            [fc("Disk size"), fc("240 GB"), formatActual(totalSpaceGB, 240, " GB")],
+            [fc("System memory"), fc("16 GB"), formatActual(totalMemoryGB, 16, " GB")],
             [fc("CPU cores"), fc("8 cores"), formatActual(numOfCores, 8, " cores")],
         ];
         clm.echo(ttyTable(header, rows).render() + "\n");

package/dist/checks/check-initial-setup.js

@@ -1,5 +1,6 @@
 import chalk from "chalk";
 import { configStore } from "../config-store.js";
+import { systemdService } from "../services/systemd-service.js";
 import { checkDependencies } from "./check-dependencies.js";
 import { checkHardware } from "./check-hardware.js";
 export const checkInitialSetup = {
@@ -13,5 +14,6 @@ export const checkInitialSetup = {
         console.log("               " + chalk.whiteBright("NODE PILOT") + "              ");
         console.log(chalk.whiteBright(" ****************************************"));
         await checkHardware.systemRequirements();
+        await systemdService.install();
     },
 };

package/dist/checks/check-layers.js

@@ -2,7 +2,7 @@ import { input } from "@inquirer/prompts";
 import chalk from "chalk";
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
-import { dockerHelper } from "../helpers/docker-helper.js";
+import { dockerService } from "../services/docker-service.js";
 import { nodeService } from "../services/node-service.js";
 export const checkLayers = {
     async layersReadyToJoin() {
@@ -27,9 +27,9 @@ export const checkLayers = {
             }
             await input({ default: 'y', message: 'Would you like to start the validator(s)? (y/n): ' }).then(async (answer) => {
                 if (answer.toLowerCase() === 'y') {
-                    await dockerHelper.dockerBuild();
+                    await dockerService.dockerBuild();
                     clm.preStep('Starting the node...');
-                    await dockerHelper.dockerUp();
+                    await dockerService.dockerUp();
                     await nodeService.pollForLayersState(layersToRun);
                 }
                 else {
@@ -40,11 +40,11 @@ export const checkLayers = {
         else if (notRunningLayers.length > 0) {
             const layersNotRunning = notRunningLayers.map(r => r.layer);
             clm.preStep('The following Validator Node layers are not running: ' + chalk.cyan(layersNotRunning.join(', ')));
-            await input({ default: 'y', message: 'Would you like to restart the docker containers? (y/n): ' }).then(async (answer) => {
+            await input({ default: 'y', message: 'Would you like to start the validator(s)? (y/n): ' }).then(async (answer) => {
                 if (answer.toLowerCase() === 'y') {
-                    clm.preStep('Restarting docker containers...');
-                    await dockerHelper.dockerUp();
-                    await nodeService.pollForLayersState(layersToRun);
+                    clm.preStep('Starting docker containers...');
+                    await dockerService.dockerStartLayers(layersNotRunning);
+                    await nodeService.pollForLayersState(layersNotRunning);
                 }
                 else {
                     clm.echo('Node not started.');

package/dist/checks/check-network.d.ts

@@ -1,7 +1,9 @@
 export declare const checkNetwork: {
+    checkForExistingNodeIdInCluster(): Promise<void>;
     checkSeedList(): Promise<void>;
     configureIpAddress(): Promise<void>;
     detectExternalIpAddress(): Promise<void>;
     enterIpAddressManually(): Promise<string>;
     fetchIPAddress(): Promise<string>;
+    isNetworkConnectable(): Promise<boolean>;
 };

package/dist/checks/check-network.js

@@ -4,7 +4,27 @@ import fs from "node:fs";
 import path from "node:path";
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
+import { clusterService } from "../services/cluster-service.js";
+import { dockerService } from "../services/docker-service.js";
+import { shellService } from "../services/shell-service.js";
 export const checkNetwork = {
+    async checkForExistingNodeIdInCluster() {
+        if (configStore.hasProjectFlag('duplicateNodeIdChecked')) {
+            return;
+        }
+        clm.preStep('Checking for existing Node ID in cluster...');
+        const { nodeId } = configStore.getProjectInfo();
+        const clusterInfo = await clusterService.getClusterInfo();
+        const found = clusterInfo.some(node => node.id === nodeId);
+        const isDockerRunning = await dockerService.isRunning();
+        if (!isDockerRunning && found) {
+            clm.warn('Node ID already exists in the cluster.');
+            clm.warn('You need to shutdown your node from a previous installation before continuing.');
+            clm.error(`Or to change the node ID, configure the Key File: use ${chalk.cyan('cpilot config')}, and select ${chalk.cyan('Key File')}`);
+        }
+        configStore.setProjectFlag('duplicateNodeIdChecked', true);
+        clm.postStep('No duplicate Node found.');
+    },
     async checkSeedList() {
         if (configStore.hasProjectFlag('seedListChecked')) {
             return;
@@ -23,10 +43,11 @@ export const checkNetwork = {
         }
         const printNotFoundError = () => {
             clm.warn(`Node ID not found in ${type.toUpperCase()} seed list. You may try again later.`);
-            clm.error(`To change the Key File: use ${chalk.cyan('cpilot config')}, and select ${chalk.cyan('Key File')}`);
+            clm.warn(`To change the Key File: use ${chalk.cyan('cpilot config')}, and select ${chalk.cyan('Key File')}`);
+            clm.error(`To change the Network: use ${chalk.cyan('cpilot config')}, and select ${chalk.cyan('Network')}`);
         };
         if (type === 'mainnet') {
-            // the mainnet seed list comed from a network release files
+            // the mainnet seed list comed from a network release
             printNotFoundError();
         }
         else {
@@ -52,11 +73,11 @@ export const checkNetwork = {
         }
     },
     async configureIpAddress() {
-        const { CL_EXTERNAL_IP: currentIpAddress } = configStore.getEnvCommonInfo();
+        const { CL_EXTERNAL_IP: currentIpAddress } = configStore.getEnvInfo();
         const detectedIpAddress = await checkNetwork.fetchIPAddress().catch(() => '');
         if (!currentIpAddress && !detectedIpAddress) {
             const newIpAddress = await checkNetwork.enterIpAddressManually();
-            configStore.setEnvCommonInfo({ CL_EXTERNAL_IP: newIpAddress });
+            configStore.setEnvInfo({ CL_EXTERNAL_IP: newIpAddress });
             return;
         }
         if (currentIpAddress) {
@@ -85,7 +106,7 @@ export const checkNetwork = {
         else if (answer === 'manual') {
             selectedIpAddress = await checkNetwork.enterIpAddressManually();
         }
-        configStore.setEnvCommonInfo({ CL_EXTERNAL_IP: selectedIpAddress });
+        configStore.setEnvInfo({ CL_EXTERNAL_IP: selectedIpAddress });
     },
     async detectExternalIpAddress() {
         const externalIp = await this.fetchIPAddress()
@@ -94,7 +115,7 @@ export const checkNetwork = {
             return this.enterIpAddressManually();
         });
         clm.postStep("\nExternal IP address: " + chalk.cyan(externalIp) + "\n");
-        configStore.setEnvCommonInfo({ CL_EXTERNAL_IP: externalIp });
+        configStore.setEnvInfo({ CL_EXTERNAL_IP: externalIp });
     },
     async enterIpAddressManually() {
         return input({
@@ -110,11 +131,25 @@ export const checkNetwork = {
         });
     },
     async fetchIPAddress() {
-        return fetch('https://ifconfig.me/ip')
-            .then(res => {
-            if (res.ok)
-                return res.text();
-            throw new Error('Failed to fetch IP address');
+        return shellService.runCommandWithOutput('curl -4 https://ifconfig.me/ip');
+    },
+    async isNetworkConnectable() {
+        return clusterService.getClusterInfo()
+            .then(async (nodes) => {
+            const someAreReady = nodes.some(node => node.state === 'Ready');
+            if (!someAreReady) {
+                if (nodes.length > 0) {
+                    clm.warn(`Found ${nodes.length} nodes in the cluster, but none are READY.`);
+                }
+                throw new Error(`Network is not connectable.`);
+            }
+            clm.debug(`Network is live. Found ${nodes.length} nodes in the cluster.`);
+            configStore.setClusterStats({ total: nodes.length });
+            return true;
+        })
+            .catch(() => {
+            clm.error(`Network is not in service. Please try again later.`);
+            return false;
         });
     }
 };

package/dist/checks/check-node-ctl.js

@@ -5,11 +5,11 @@ import path from "node:path";
 import yaml from "yaml";
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
-import { dockerHelper } from "../helpers/docker-helper.js";
 import { keyFileHelper } from "../helpers/key-file-helper.js";
 import { promptHelper } from "../helpers/prompt-helper.js";
-import { shellService } from "../services/shell-service.js";
+import { dockerService } from "../services/docker-service.js";
 import { nodeService } from "../services/node-service.js";
+import { shellService } from "../services/shell-service.js";
 export const checkNodeCtl = {
     async check4Migration() {
         if (configStore.hasProjectFlag('nodeCtlChecked')) {
@@ -22,7 +22,7 @@ export const checkNodeCtl = {
         }
         const hasNodeAdminUser = fs.existsSync('/home/nodeadmin');
         if (hasNodeAdminUser) {
-            const isDockerRunning = await dockerHelper.isRunning();
+            const isDockerRunning = await dockerService.isRunning();
             const isPortOpen = await nodeService.isPortInUse(9000);
             clm.step(chalk.bold('NODECTL has been detected.'));
             if (!isDockerRunning && isPortOpen) {
@@ -71,7 +71,7 @@ export const checkNodeCtl = {
         // prompt for password
         const keyPassword = await password({ message: 'Enter the key file password:' });
         const keyAlias = await input({ message: 'Enter the key file alias:' });
-        configStore.setEnvCommonInfo({ CL_KEYALIAS: keyAlias, CL_KEYSTORE: pilotKeyPath, CL_PASSWORD: keyPassword });
+        configStore.setEnvInfo({ CL_KEYALIAS: keyAlias, CL_KEYSTORE: pilotKeyPath, CL_PASSWORD: keyPassword });
         try {
             const dagAddress = await keyFileHelper.getAddress();
             const nodeId = await keyFileHelper.getId();

package/dist/checks/check-project.d.ts

@@ -1,4 +1,5 @@
 export declare const checkProject: {
+    hasVersionChanged(): Promise<boolean>;
     projectInstallation(): Promise<void>;
     releaseVersion(): Promise<void>;
     runInstall(): Promise<boolean>;

package/dist/checks/check-project.js

@@ -1,15 +1,21 @@
 import { input, select } from "@inquirer/prompts";
+import chalk from "chalk";
 import ora from 'ora';
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
 import { configHelper } from "../helpers/config-helper.js";
-import { dockerHelper } from "../helpers/docker-helper.js";
 import { projectHelper } from "../helpers/project-helper.js";
 import { promptHelper } from "../helpers/prompt-helper.js";
 import { clusterService } from "../services/cluster-service.js";
+import { dockerService } from "../services/docker-service.js";
 import { shellService } from "../services/shell-service.js";
 import { checkNetwork } from "./check-network.js";
 export const checkProject = {
+    async hasVersionChanged() {
+        const clusterVersion = await clusterService.getReleaseVersion();
+        const rInfo = await configHelper.getReleaseInfo();
+        return !rInfo || (rInfo.version !== clusterVersion);
+    },
     async projectInstallation() {
         let updateNetworkType = false;
         let updateLayers = false;
@@ -86,9 +92,9 @@ export const checkProject = {
             clm.postStep(`Network files are already installed for ${nInfo.type} version ${clusterVersion}`);
             return false;
         }
-        const isRunning = await dockerHelper.isRunning();
+        const isRunning = await dockerService.isRunning();
         if (isRunning) {
-            await dockerHelper.dockerDown();
+            await dockerService.dockerDown();
         }
         const silent = !process.env.DEBUG;
         const spinner = ora('Running install script...');
@@ -99,10 +105,15 @@ export const checkProject = {
         else {
             clm.preStep('Running install script...');
         }
+        // const node = await clusterService.getClusterNodeInfo();
+        // const NODE_URL = `http://${node.host}:${node.publicPort}`;
         // NOTE: may be different for metagraphs
         await shellService.runProjectCommand(`scripts/install.sh ${nInfo.type}`, undefined, silent)
             .catch(() => {
             spinner.stop();
+            if (silent) {
+                clm.error(`Install script failed. run: ${chalk.cyan("DEBUG=true cpilot")} for more details`);
+            }
             clm.error('Install script failed. Please run cpilot again after correcting the error');
         });
         if (silent) {
@@ -118,7 +129,7 @@ export const checkProject = {
     async runUpgrade() {
         const changed = await this.runInstall();
         if (changed) {
-            await dockerHelper.dockerBuild();
+            await dockerService.dockerBuild();
         }
     }
 };

package/dist/checks/check-wallet.d.ts

@@ -0,0 +1,3 @@
+export declare const checkWallet: {
+    checkCollateral(): Promise<void>;
+};

package/dist/checks/check-wallet.js

@@ -0,0 +1,37 @@
+import chalk from "chalk";
+import { clm } from "../clm.js";
+import { configStore } from "../config-store.js";
+import { promptHelper } from "../helpers/prompt-helper.js";
+export const checkWallet = {
+    async checkCollateral() {
+        const { type } = configStore.getNetworkInfo();
+        if (type !== 'mainnet')
+            return;
+        const skipCollateralCheck = configStore.hasProjectFlag('skipCollateralCheck');
+        if (skipCollateralCheck)
+            return;
+        clm.preStep('Checking for required collateral...');
+        const { dagAddress } = configStore.getProjectInfo();
+        const url = `https://be-mainnet.constellationnetwork.io/addresses/${dagAddress}/balance`;
+        let hasError = false;
+        const balance = await fetch(url)
+            .then(res => res.json())
+            .then(i => i.data.balance)
+            .catch(() => {
+            clm.warn(`Failed to fetch balance from ${url}`);
+            hasError = true;
+        });
+        if (!hasError && balance < 25_000_000_000_000) {
+            clm.warn(`You need at least 250k DAG to run a validator node. Your account ${chalk.cyan(dagAddress)} has a balance of ${chalk.cyan(balance)} DAG.`);
+            hasError = true;
+        }
+        if (hasError) {
+            clm.echo('You may continue and skip this check in the future');
+            await promptHelper.doYouWishToContinue();
+        }
+        else {
+            clm.postStep('Collateral check PASSED');
+        }
+        configStore.setProjectFlag('skipCollateralCheck', true);
+    }
+};

package/dist/clm.d.ts

@@ -1,6 +1,7 @@
 export declare const clm: {
     debug(msg: string): void;
     echo(msg: string): void;
+    echoRepeatLine(char: string): void;
     error(msg: string, silent?: boolean): never;
     postStep(s: string): void;
     preStep(s: string): void;

package/dist/clm.js

@@ -11,6 +11,9 @@ export const clm = {
     echo(msg) {
         console.log(msg);
     },
+    echoRepeatLine(char) {
+        process.stdout.write('\r' + char);
+    },
     error(msg, silent = true) {
         console.error(chalk.red(msg));
         process.exit(silent ? 0 : 1);

package/dist/commands/config/get.d.ts

@@ -5,5 +5,11 @@ export default class ConfigGet extends Command {
     };
     static description: string;
     static examples: string[];
+    getKeyInfo(): {
+        KEY_ALIAS: string;
+        KEY_FILE: string;
+        NODE_ADDRESS: string;
+        NODE_ID: string;
+    };
     run(): Promise<void>;
 }

package/dist/commands/config/get.js

@@ -1,5 +1,6 @@
 import { Args, Command } from '@oclif/core';
-import { commonEnvNames, configStore, layerEnvNames } from "../../config-store.js";
+import { clm } from "../../clm.js";
+import { configStore, layerEnvNames, networkEnvNames } from "../../config-store.js";
 import { configHelper } from "../../helpers/config-helper.js";
 export default class ConfigGet extends Command {
     static args = {
@@ -11,27 +12,72 @@ export default class ConfigGet extends Command {
         '<%= config.bin %> <%= command.id %> CL_EXTERNAL_IP',
         '<%= config.bin %> <%= command.id %> gl0:CL_PUBLIC_HTTP_PORT',
     ];
+    getKeyInfo() {
+        const { dagAddress, nodeId } = configStore.getProjectInfo();
+        const { CL_KEYALIAS, CL_KEYSTORE } = configStore.getEnvInfo();
+        return {
+            KEY_ALIAS: CL_KEYALIAS,
+            KEY_FILE: CL_KEYSTORE,
+            NODE_ADDRESS: dagAddress,
+            NODE_ID: nodeId,
+        };
+    }
     async run() {
         configHelper.assertProject('No configuration found. ');
         const { args } = await this.parse(ConfigGet);
-        const info = configStore.getEnvInfo();
+        // const info = configStore.getEnvInfo();
         const { layersToRun } = configStore.getProjectInfo();
-        const common = info.common;
-        const layers = info.layers;
+        const { type: network } = configStore.getNetworkInfo();
+        const networkEnv = configStore.getEnvNetworkInfo(network);
+        // const networkProp = info.network as Record<string, string>;
+        // const layers = info.layers as Record<string, Record<string, string>>;
+        const gl = (l) => configStore.getEnvLayerInfo(network, l);
         if (Object.keys(args).length === 0 || args.name === undefined) {
-            const commonsList = Object.keys(commonEnvNames).sort().map(k => ({ name: k, value: common[k] }));
-            const layersList = layersToRun.map(l => (Object.keys(layerEnvNames).map(k => ({ name: `${l}:${k}`, value: layers[l][k] }))));
-            // const layersList = layersToRun.map(l => (Object.keys(layerEnvNames).map(k => `${l}:${k}="${green(layers[l][k] || '')}"`)))
-            configHelper.showEnvInfoList(commonsList);
+            const networkList = Object.keys(networkEnvNames).sort().map(k => ({ name: k, value: networkEnv[k] }));
+            const layersList = layersToRun.map(l => (Object.keys(layerEnvNames).map(k => ({ name: `${l}:${k}`, value: gl(l)[k] }))));
+            const keyInfo = this.getKeyInfo();
+            const keyInfoList = Object.keys(keyInfo).map(k => ({ name: 'key:' + k, value: keyInfo[k] }));
+            configHelper.showEnvInfoList(networkList);
+            configHelper.showEnvInfoList(keyInfoList);
             configHelper.showEnvInfoList(layersList.flat());
         }
         else if (args.name.includes(':')) {
             const [layer, name] = args.name.split(':');
-            configHelper.showEnvInfo(args.name, layers[layer][name]);
+            if (layer === 'key') {
+                const keyInfo = this.getKeyInfo();
+                if (Object.hasOwn(keyInfo, name)) {
+                    configHelper.showEnvInfo(args.name, keyInfo[name]);
+                }
+                else {
+                    clm.warn('Invalid key property. Valid properties are: ' + Object.keys(keyInfo).join(', '));
+                }
+            }
+            else if (!layersToRun.includes(layer)) {
+                clm.warn(`Layer ${layer} is not running. Valid layers are: ` + layersToRun.join(', '));
+            }
+            else if (Object.hasOwn(layerEnvNames, name)) {
+                configHelper.showEnvInfo(args.name, gl(layer)[name]);
+            }
+            else {
+                clm.warn('Invalid layer property. Valid properties are: ' + Object.keys(layerEnvNames).join(', '));
+            }
+        }
+        else if (args.name === 'key') {
+            const keyInfo = this.getKeyInfo();
+            const keyInfoList = Object.keys(keyInfo).map(k => ({ name: 'key:' + k, value: keyInfo[k] }));
+            configHelper.showEnvInfoList(keyInfoList);
+        }
+        else if (layersToRun.includes(args.name)) {
+            const layer = args.name;
+            const list = Object.keys(layerEnvNames).map(k => ({ name: `${layer}:${k}`, value: gl(layer)[k] }));
+            configHelper.showEnvInfoList(list);
         }
         else {
-            // const props = keyof EnvCommonInfo
-            configHelper.showEnvInfo(args.name, common[args.name]);
+            if (!Object.hasOwn(networkEnvNames, args.name)) {
+                clm.warn('Invalid network-wide property. Valid properties are: ' + Object.keys(networkEnvNames).join(', '));
+                return;
+            }
+            configHelper.showEnvInfo(args.name, networkEnv[args.name]);
         }
     }
 }

package/dist/commands/config/set.d.ts

@@ -6,6 +6,5 @@ export default class ConfigSet extends Command {
     };
     static description: string;
     static examples: string[];
-    logErrorAndExit(message: string): void;
     run(): Promise<void>;
 }