@constellation-network/node-pilot 0.0.8 → 0.0.10

package/dist/config-store.js

@@ -15,12 +15,12 @@ class ConfigStore {
     constructor() {
         const appDir = path.join(os.homedir(), '.node-pilot');
         if (!fs.existsSync(appDir)) {
-            fs.mkdirSync(appDir, { recursive: true });
+            fs.mkdirSync(path.join(appDir, 'logs'), { recursive: true });
         }
         this.pilotStore = new JSONStorage(path.join(appDir, 'config'));
         const appInfo = this.pilotStore.getItem('pilot');
         if (!appInfo) {
-            this.pilotStore.setItem('pilot', { appDir, project: 'undefined', projects: [] });
+            this.pilotStore.setItem('pilot', { appDir, project: 'undefined', projects: [], running: [] });
         }
         const { project } = this.pilotStore.getItem('pilot');
         this.projectStore = project === 'undefined' ? new EmptyStorage() : new JSONStorage(path.join(appDir, project, 'config'));
@@ -41,83 +41,106 @@ class ConfigStore {
             }
         }
         else {
-            this.pilotStore.setItem('pilot', { appDir, project: name, projects: [...projects, name] });
+            this.setPilotInfo({ project: name, projects: [...projects, name] });
         }
         fs.mkdirSync(path.join(projectDir, 'config'), { recursive: true });
         this.projectStore = new JSONStorage(path.join(projectDir, 'config'));
         this.setDockerEnvInfo({ DOCKER_IMAGE_VERSION: 'test' });
         this.setProjectInfo({ name, projectDir });
-        this.setEnvInfo({ common: { CL_GLOBAL_L0_PEER_HTTP_PORT: '9000' }, layers: { gl0: { CL_PUBLIC_HTTP_PORT: "9000" } } });
     }
-    changeProjectStore(name) {
-        const { appDir, projects } = this.pilotStore.getItem('pilot');
-        if (projects && projects.includes(name)) {
-            this.projectStore = new JSONStorage(path.join(appDir, name, 'config'));
-        }
-        else {
-            throw new Error(`Project ${name} doesn't exist.`);
-        }
+    getActiveProject() {
+        const { project } = this.pilotStore.getItem('pilot');
+        return project;
+    }
+    getAppDir() {
+        const { appDir } = this.pilotStore.getItem('pilot');
+        return appDir;
     }
     getDockerEnvInfo() {
         return this.projectStore.getItem('docker');
     }
-    getEnvCommonInfo() {
-        return this.projectStore.getItem('env')?.common;
-    }
     getEnvInfo() {
-        return this.projectStore.getItem('env');
+        return this.projectStore.getItem('env') || {};
+    }
+    getEnvLayerInfo(network, layer) {
+        const envInfo = this.projectStore.getItem('layer-env');
+        if (!envInfo)
+            return { [network]: {} };
+        return envInfo[network][layer] || {};
     }
-    getEnvLayerInfo(layer) {
-        const envInfo = this.projectStore.getItem('env');
+    getEnvNetworkInfo(network) {
+        const envInfo = this.projectStore.getItem('network-env');
         if (!envInfo)
             return {};
-        return { ...envInfo.common, ...envInfo.layers[layer] };
+        return envInfo[network];
     }
     getLayerPortInfo(layer) {
-        const layerInfo = this.getEnvLayerInfo(layer);
+        const { type: network } = this.getNetworkInfo();
+        const layerInfo = this.getEnvLayerInfo(network, layer);
         return { CLI: layerInfo.CL_CLI_HTTP_PORT, P2P: layerInfo.CL_P2P_HTTP_PORT, PUBLIC: layerInfo.CL_PUBLIC_HTTP_PORT };
     }
-    getNetworkEnvInfo(network) {
-        const info = this.projectStore.getItem('network-env');
-        return info ? info[network] : {};
-    }
     getNetworkInfo() {
         return this.projectStore.getItem('network');
     }
     getProjectInfo() {
         return this.projectStore.getItem('project');
     }
+    getProjects() {
+        const { projects } = this.pilotStore.getItem('pilot');
+        return projects;
+    }
+    getRunningProjects() {
+        const { running } = this.pilotStore.getItem('pilot');
+        return running;
+    }
     getSystemInfo() {
         return this.pilotStore.getItem('system');
     }
     hasProjectFlag(name) {
         const flags = this.projectStore.getItem('flags') || {};
-        return flags[name] !== undefined;
+        return flags[name] || false;
     }
     hasProjects() {
         const { projects } = this.pilotStore.getItem('pilot');
         return projects.length > 0;
     }
+    setActiveProject(name) {
+        const { appDir, project, projects } = this.pilotStore.getItem('pilot');
+        if (projects && projects.includes(name)) {
+            if (project === name)
+                return;
+            this.projectStore = new JSONStorage(path.join(appDir, name, 'config'));
+            this.setPilotInfo({ project: name });
+        }
+        else {
+            throw new Error(`Project ${name} doesn't exist.`);
+        }
+    }
+    setClusterStats(info) {
+        const oldInfo = this.projectStore.getItem('cluster-stats');
+        this.projectStore.setItem('cluster-stats', { ...oldInfo, ...info });
+    }
     setDockerEnvInfo(info) {
         const oldInfo = this.projectStore.getItem('docker');
         this.projectStore.setItem('docker', { ...oldInfo, ...info });
     }
-    setEnvCommonInfo(info) {
-        const oldInfo = this.projectStore.getItem('env');
-        this.projectStore.setItem('env', { common: { ...oldInfo.common, ...info }, layers: oldInfo.layers });
-    }
     setEnvInfo(info) {
         const oldInfo = this.projectStore.getItem('env');
         this.projectStore.setItem('env', { ...oldInfo, ...info });
     }
-    setEnvLayerInfo(layer, info) {
-        const envInfo = this.projectStore.getItem('env');
-        const { common, layers } = envInfo;
-        this.projectStore.setItem('env', { common, layers: { ...layers, [layer]: { ...layers[layer], ...info } } });
+    setEnvLayerInfo(network, layer, info) {
+        let layers = this.projectStore.getItem('layer-env');
+        if (!layers)
+            layers = {};
+        if (!layers[network])
+            layers[network] = {};
+        this.projectStore.setItem('layer-env', { ...layers, [network]: { ...layers[network], [layer]: { ...layers[network][layer], ...info } } });
     }
-    setNetworkEnvInfo(info) {
-        const oldInfo = this.projectStore.getItem('network-env');
-        this.projectStore.setItem('network-env', { ...oldInfo, ...info });
+    setEnvNetworkInfo(network, info) {
+        let networks = this.projectStore.getItem('network-env');
+        if (!networks)
+            networks = {};
+        this.projectStore.setItem('network-env', { ...networks, [network]: { ...networks[network], ...info } });
     }
     setNetworkInfo(info) {
         const oldInfo = this.projectStore.getItem('network');
@@ -133,29 +156,62 @@ class ConfigStore {
         const oldInfo = this.projectStore.getItem('project');
         this.projectStore.setItem('project', { ...oldInfo, ...info });
     }
+    setProjectStatusToRunning(isRunning) {
+        const { project, running } = this.pilotStore.getItem('pilot');
+        if (isRunning) {
+            if (running.includes(project))
+                return;
+            this.setPilotInfo({ running: [...running, project] });
+        }
+        else {
+            if (!running.includes(project))
+                return;
+            running.splice(running.indexOf(project), 1);
+            this.setPilotInfo({ running });
+        }
+    }
     setSystemInfo(info) {
         const oldInfo = this.projectStore.getItem('system');
         this.pilotStore.setItem('system', { ...oldInfo, ...info });
     }
+    getPilotInfo() {
+        return this.pilotStore.getItem('pilot');
+    }
+    setPilotInfo(info) {
+        const oldInfo = this.pilotStore.getItem('pilot');
+        this.pilotStore.setItem('pilot', { ...oldInfo, ...info });
+    }
 }
 export const configStore = new ConfigStore();
-export const commonEnvNames = {
-    CL_APP_ENV: 1,
+export const envNames = {
     CL_EXTERNAL_IP: 1,
+    CL_KEYALIAS: 1,
+    CL_KEYSTORE: 1,
+    CL_PASSWORD: 1
+};
+export const networkEnvNames = {
+    CL_APP_ENV: 1,
     CL_GLOBAL_L0_PEER_HOST: 1,
     CL_GLOBAL_L0_PEER_HTTP_PORT: 1,
     CL_GLOBAL_L0_PEER_ID: 1,
-    CL_KEYALIAS: 1,
-    CL_KEYSTORE: 1,
     CL_L0_PEER_HTTP_HOST: 1,
     CL_L0_PEER_HTTP_PORT: 1,
     CL_L0_PEER_ID: 1,
+    CL_L0_PEER_P2P_PORT: 1,
     CL_L0_TOKEN_IDENTIFIER: 1,
-    CL_PASSWORD: 1
 };
+// NETWORK LAYER
 export const layerEnvNames = {
     CL_CLI_HTTP_PORT: 1,
     CL_DOCKER_JAVA_OPTS: 1,
+    CL_GLOBAL_L0_PEER_HOST: 1,
+    CL_GLOBAL_L0_PEER_HTTP_PORT: 1,
+    CL_GLOBAL_L0_PEER_ID: 1,
+    CL_L0_PEER_HTTP_HOST: 1,
+    CL_L0_PEER_HTTP_PORT: 1,
+    CL_L0_PEER_ID: 1,
+    CL_L0_PEER_P2P_PORT: 1,
+    CL_LB: 1,
     CL_P2P_HTTP_PORT: 1,
-    CL_PUBLIC_HTTP_PORT: 1,
+    CL_PUBLIC_HTTP_PORT: 1
 };

package/dist/helpers/config-helper.js

@@ -18,8 +18,8 @@ export const configHelper = {
         }
         const versionObj = this.parseEnvFile(lastInstallVersion);
         return {
-            network: versionObj.RELEASE_NETWORK_TYPE,
-            version: versionObj.RELEASE_NETWORK_VERSION
+            network: versionObj.INSTALLED_NETWORK_TYPE,
+            version: versionObj.INSTALLED_NETWORK_VERSION
         };
     },
     parseEnvFile(filePath) {

package/dist/helpers/env-templates.d.ts

@@ -1,4 +1,5 @@
-import { EnvCommonInfo, EnvLayerInfo, NetworkType } from "../config-store.js";
+import { EnvCombinedInfo, EnvInfo } from "../config-store.js";
 import { TessellationLayer } from "../types.js";
-export declare function getLayerEnvFileContent(layer: TessellationLayer, network: NetworkType, commonInfo: EnvCommonInfo, layerInfo: EnvLayerInfo): string;
-export declare function getKeyFileContent(commonInfo: EnvCommonInfo): string;
+export declare function getLayerEnvFileContent(layer: TessellationLayer, env: EnvCombinedInfo): string;
+export declare function getKeyFileContent(env: EnvInfo): string;
+export declare function getObjectToEnvContent(obj: object): string;

package/dist/helpers/env-templates.js

@@ -1,33 +1,41 @@
-export function getLayerEnvFileContent(layer, network, commonInfo, layerInfo) {
+export function getLayerEnvFileContent(layer, env) {
     return `
+DEBUG=${process.env.DEBUG || ''}
+NODE_PILOT_SESSION=${Date.now()}
+
 # Node
-CL_EXTERNAL_IP=${commonInfo.CL_EXTERNAL_IP}
-CL_DOCKER_JAVA_OPTS='${layerInfo.CL_DOCKER_JAVA_OPTS}'
+CL_ARCHIVE_NODE=${env.CL_ARCHIVE_NODE || ''}
+CL_EXTERNAL_IP=${env.CL_EXTERNAL_IP}
+CL_DOCKER_JAVA_OPTS='${env.CL_DOCKER_JAVA_OPTS}'
 CL_KEYSTORE='/app/key.p12'
-CL_KEYALIAS='${commonInfo.CL_KEYALIAS}'
-CL_PASSWORD='${commonInfo.CL_PASSWORD}'
+CL_KEYALIAS='${env.CL_KEYALIAS}'
+CL_PASSWORD='${env.CL_PASSWORD}'
 CL_TESSELATION_LAYER=${layer}
 
 # NETWORK
-CL_APP_ENV=${commonInfo.CL_APP_ENV}
-CL_COLLATERAL=${network === 'mainnet' ? 25000000000000 : 0}
-CL_L0_PEER_HTTP_PORT=${commonInfo.CL_L0_PEER_HTTP_PORT}
-CL_L0_PEER_HTTP_HOST=${commonInfo.CL_L0_PEER_HTTP_HOST}
-CL_L0_PEER_ID=${commonInfo.CL_L0_PEER_ID}
-CL_GLOBAL_L0_PEER_HTTP_PORT=${commonInfo.CL_GLOBAL_L0_PEER_HTTP_PORT}
-CL_GLOBAL_L0_PEER_HOST=${commonInfo.CL_GLOBAL_L0_PEER_HOST}
-CL_GLOBAL_L0_PEER_ID=${commonInfo.CL_GLOBAL_L0_PEER_ID}
+CL_LB=${env.CL_LB}
+CL_APP_ENV=${env.CL_APP_ENV}
+CL_COLLATERAL=${env.CL_COLLATERAL}
+CL_L0_PEER_HTTP_PORT=${env.CL_L0_PEER_HTTP_PORT}
+CL_L0_PEER_HTTP_HOST=${env.CL_L0_PEER_HTTP_HOST}
+CL_L0_PEER_ID=${env.CL_L0_PEER_ID}
+CL_GLOBAL_L0_PEER_HTTP_PORT=${env.CL_GLOBAL_L0_PEER_HTTP_PORT}
+CL_GLOBAL_L0_PEER_HOST=${env.CL_GLOBAL_L0_PEER_HOST}
+CL_GLOBAL_L0_PEER_ID=${env.CL_GLOBAL_L0_PEER_ID}
 
 # LAYER
-CL_PUBLIC_HTTP_PORT=${layerInfo.CL_PUBLIC_HTTP_PORT}
-CL_P2P_HTTP_PORT=${layerInfo.CL_P2P_HTTP_PORT}
-CL_CLI_HTTP_PORT=${layerInfo.CL_CLI_HTTP_PORT}
+CL_PUBLIC_HTTP_PORT=${env.CL_PUBLIC_HTTP_PORT}
+CL_P2P_HTTP_PORT=${env.CL_P2P_HTTP_PORT}
+CL_CLI_HTTP_PORT=${env.CL_CLI_HTTP_PORT}
 `;
 }
-export function getKeyFileContent(commonInfo) {
+export function getKeyFileContent(env) {
     return `
-export CL_KEYSTORE='${commonInfo.CL_KEYSTORE}'
-export CL_KEYALIAS='${commonInfo.CL_KEYALIAS}'
-export CL_PASSWORD='${commonInfo.CL_PASSWORD}'
+export CL_KEYSTORE='${env.CL_KEYSTORE}'
+export CL_KEYALIAS='${env.CL_KEYALIAS}'
+export CL_PASSWORD='${env.CL_PASSWORD}'
 `;
 }
+export function getObjectToEnvContent(obj) {
+    return Object.entries(obj).map(([k, v]) => `${k}='${v}'`).join('\n') + '\n';
+}

package/dist/helpers/key-file-helper.d.ts

@@ -1,9 +1,11 @@
 export declare const keyFileHelper: {
+    changePassword(newPassword: string): Promise<void>;
     generate(): Promise<void>;
     getAddress(): Promise<string>;
     getId(): Promise<string>;
     importKeyFile(): Promise<void>;
     promptForKeyFile(): Promise<void>;
     promptIfNoKeyFile(): Promise<void>;
+    promptSaveBackup(env: object): Promise<void>;
     showKeyFileInfo(prompt4ShowPassword?: boolean): Promise<void>;
 };

package/dist/helpers/key-file-helper.js

@@ -7,12 +7,27 @@ import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
 import { shellService } from "../services/shell-service.js";
 import { configHelper } from "./config-helper.js";
-import { getKeyFileContent } from "./env-templates.js";
+import { getObjectToEnvContent } from "./env-templates.js";
 export const keyFileHelper = {
+    async changePassword(newPassword) {
+        const { projectDir } = configStore.getProjectInfo();
+        const keyFilePath = path.join(projectDir, "key.p12");
+        if (!fs.existsSync(keyFilePath)) {
+            clm.error('No key file found. Please generate a new key file first.');
+        }
+        const { CL_PASSWORD: currentPassword } = configStore.getEnvInfo();
+        if (currentPassword === newPassword) {
+            clm.error('The new password is the same as the current password. Please try again with a different password.');
+        }
+        await shellService.runCommand(`keytool -importkeystore -srckeystore ${keyFilePath} -srcstoretype PKCS12 -srcstorepass '${currentPassword}' -destkeystore ${path.join(projectDir, "temp.p12")} -deststoretype PKCS12 -deststorepass '${newPassword}' -destkeypass '${newPassword}'`);
+        await this.promptSaveBackup({ CL_KEYALIAS: 'alias', CL_KEYSTORE: keyFilePath, CL_PASSWORD: newPassword });
+    },
     async generate() {
         const { projectDir } = configStore.getProjectInfo();
         const keyFilePath = path.join(projectDir, "key.p12");
+        let modifier = '';
         if (fs.existsSync(keyFilePath)) {
+            modifier = 'new ';
             const answer = await input({ default: 'n', message: 'A key file already exists. Do you want to overwrite it? (y/n): ' });
             if (answer.toLowerCase() === 'y') {
                 fs.rmSync(keyFilePath, { force: true });
@@ -22,31 +37,26 @@ export const keyFileHelper = {
                 process.exit(0);
             }
         }
-        const keyPassword = await password({ message: 'Enter the key file password:', validate: value => value.length > 0 });
+        const keyPassword = await password({ message: `Enter the ${modifier}key file password:`, validate: value => value.length > 0 });
         const env = {
             CL_KEYALIAS: "alias", CL_KEYSTORE: keyFilePath, CL_PASSWORD: keyPassword
         };
         await shellService.runCommand(`java -jar ${projectDir}/dist/keytool.jar generate`, env);
-        configStore.setEnvCommonInfo(env);
+        configStore.setEnvInfo(env);
         const dagAddress = await this.getAddress();
         const nodeId = await this.getId();
         configStore.setProjectInfo({ dagAddress, nodeId });
         clm.postStep('Key file generated successfully.\n');
-        const answer = await input({ default: 'y', message: 'Would you like to save a backup of the key file to your home directory? (y/n): ' });
-        if (answer.toLowerCase() === 'y') {
-            fs.cpSync(keyFilePath, path.join(os.homedir(), 'key.p12'));
-            fs.writeFileSync(path.join(os.homedir(), 'key-env.sh'), getKeyFileContent({ ...env, CL_KEYSTORE: 'key.p12' }));
-            clm.postStep(`A copy of the Key file has been saved to your home directory - ${chalk.cyan(path.join(os.homedir(), 'key.p12'))}`);
-        }
+        await this.promptSaveBackup(env);
     },
     async getAddress() {
         const { projectDir } = configStore.getProjectInfo();
-        const env = configStore.getEnvCommonInfo();
+        const env = configStore.getEnvInfo();
         return shellService.runCommandWithOutput(`java -jar ${projectDir}/dist/wallet.jar show-address`, env);
     },
     async getId() {
         const { projectDir } = configStore.getProjectInfo();
-        const env = configStore.getEnvCommonInfo();
+        const env = configStore.getEnvInfo();
         return shellService.runCommandWithOutput(`java -jar ${projectDir}/dist/wallet.jar show-id`, env);
     },
     async importKeyFile() {
@@ -72,17 +82,17 @@ export const keyFileHelper = {
         // 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: keyStorePath, CL_PASSWORD: keyPassword });
+        configStore.setEnvInfo({ CL_KEYALIAS: keyAlias, CL_KEYSTORE: keyStorePath, CL_PASSWORD: keyPassword });
         try {
             const dagAddress = await this.getAddress();
             const nodeId = await this.getId();
             configStore.setProjectInfo({ dagAddress, nodeId });
         }
         catch {
-            clm.warn('Failed to unlock the key file. Please check your key file information and try again.');
             fs.rmSync(keyStorePath);
-            await this.promptForKeyFile();
-            return;
+            clm.error('Failed to unlock the key file. Please check your key file information and try again.');
+            // await this.promptForKeyFile();
+            // return;
         }
         clm.postStep('Key file imported successfully.\n');
     },
@@ -108,6 +118,8 @@ export const keyFileHelper = {
             await this.importKeyFile();
             await this.showKeyFileInfo(false);
         }
+        configStore.setProjectFlag('duplicateNodeIdChecked', false);
+        configStore.setProjectFlag('seedListChecked', false);
     },
     async promptIfNoKeyFile() {
         const { projectDir } = configStore.getProjectInfo();
@@ -117,12 +129,35 @@ export const keyFileHelper = {
         }
         await this.promptForKeyFile();
     },
+    async promptSaveBackup(env) {
+        const { projectDir } = configStore.getProjectInfo();
+        const keyFilePath = path.join(projectDir, "key.p12");
+        const { dagAddress, nodeId } = configStore.getProjectInfo();
+        const answer = await input({ default: 'y', message: 'Would you like to save a backup of the key file to your home directory? (y/n): ' });
+        if (answer.toLowerCase() === 'y') {
+            const homeKeyPath = path.join(os.homedir(), 'key.p12');
+            const homeKeyInfoPath = path.join(os.homedir(), 'key-info');
+            if (fs.existsSync(homeKeyPath)) {
+                const backupUniqueName = new Date().toISOString().replaceAll(':', '-');
+                const backupKeyName = `key-${backupUniqueName}.p12`;
+                const backupKeyPath = path.join(os.homedir(), backupKeyName);
+                fs.renameSync(homeKeyPath, backupKeyPath);
+                clm.postStep(`An existing key file was found in your home directory and has been renamed to ${chalk.cyan(backupKeyName)}`);
+                if (fs.existsSync(homeKeyInfoPath)) {
+                    fs.renameSync(homeKeyInfoPath, path.join(os.homedir(), `key-info-${backupUniqueName}`));
+                }
+            }
+            fs.cpSync(keyFilePath, homeKeyPath);
+            fs.writeFileSync(path.join(os.homedir(), 'key-info'), getObjectToEnvContent({ ...env, CL_KEYSTORE: 'key.p12', CL_PASSWORD: '****', NODE_ADDRESS: dagAddress, NODE_ID: nodeId }));
+            clm.postStep(`A copy of the Key file has been saved to your home directory - ${chalk.cyan(homeKeyPath)}`);
+        }
+    },
     async showKeyFileInfo(prompt4ShowPassword = true) {
         clm.preStep('Current key file information:');
         const { dagAddress, nodeId } = configStore.getProjectInfo();
         configHelper.showEnvInfo('Node ID', nodeId);
         configHelper.showEnvInfo('DAG Address', dagAddress);
-        const { CL_KEYALIAS, CL_KEYSTORE, CL_PASSWORD } = configStore.getEnvCommonInfo();
+        const { CL_KEYALIAS, CL_KEYSTORE, CL_PASSWORD } = configStore.getEnvInfo();
         configHelper.showEnvInfo('CL_KEYSTORE', CL_KEYSTORE || '');
         configHelper.showEnvInfo('CL_KEYALIAS', CL_KEYALIAS || '');
         configHelper.showEnvInfo('CL_PASSWORD', '*********');

package/dist/helpers/project-helper.d.ts

@@ -1,10 +1,10 @@
 import { TessellationLayer } from "../types.js";
 export declare const projectHelper: {
     generateLayerEnvFiles(layers?: TessellationLayer[]): Promise<void>;
-    importLayerEnvFiles(): Promise<void>;
-    importNetworkEnvFiles(): Promise<void>;
+    importEnvFiles(): void;
     installEmbedded(name: string): Promise<void>;
     installFromGithub(_repo: string): Promise<never>;
     installHypergraph(): Promise<void>;
+    installProject(name: string, projectFolder: string): Promise<void>;
     selectProject(): Promise<void>;
 };

package/dist/helpers/project-helper.js

@@ -5,50 +5,46 @@ import path from "node:path";
 import { fileURLToPath } from 'node:url';
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
+import { githubService } from "../services/github-service.js";
 import { configHelper } from "./config-helper.js";
 import { getLayerEnvFileContent } from "./env-templates.js";
-import { githubHelper } from "./github-helper.js";
 export const projectHelper = {
     async generateLayerEnvFiles(layers) {
         const { layersToRun, projectDir } = configStore.getProjectInfo();
-        const { type } = configStore.getNetworkInfo();
-        const commonInfo = configStore.getEnvCommonInfo();
+        const { type: network } = configStore.getNetworkInfo();
+        const envInfo = configStore.getEnvInfo();
+        const envNetworkInfo = configStore.getEnvNetworkInfo(network);
         layers = layers || layersToRun;
-        for (const n of layers) {
-            const filePath = path.join(projectDir, `${n}.env`);
-            const envInfo = configStore.getEnvLayerInfo(n);
-            const fileContents = getLayerEnvFileContent(n, type, commonInfo, envInfo);
+        for (const layer of layers) {
+            const filePath = path.join(projectDir, `${layer}.env`);
+            const envLayerInfo = configStore.getEnvLayerInfo(network, layer);
+            const fileContents = getLayerEnvFileContent(layer, { ...envInfo, ...envNetworkInfo, ...envLayerInfo });
             clm.debug(`Writing layer env file: ${filePath}`);
             fs.writeFileSync(filePath, fileContents);
         }
     },
-    async importLayerEnvFiles() {
-        const { projectDir } = configStore.getProjectInfo();
-        const possibleLayers = ['gl0', 'gl1', 'ml0', 'cl1', 'dl1'];
-        for (const n of possibleLayers) {
-            const filePath = path.join(projectDir, 'layers', `${n}.env`);
-            if (fs.existsSync(filePath)) {
-                configStore.setEnvLayerInfo(n, configHelper.parseEnvFile(filePath));
-            }
-        }
-    },
-    async importNetworkEnvFiles() {
+    importEnvFiles() {
         const { projectDir } = configStore.getProjectInfo();
         const possibleNetworks = ['mainnet', 'testnet', 'integrationnet'];
+        const possibleLayers = ['gl0', 'gl1', 'ml0', 'cl1', 'dl1'];
         const supportedTypes = [];
-        const networkEnvInfo = {};
-        for (const n of possibleNetworks) {
-            const filePath = path.join(projectDir, 'networks', `${n}.env`);
+        for (const network of possibleNetworks) {
+            const filePath = path.join(projectDir, 'networks', network, 'network.env');
             if (fs.existsSync(filePath)) {
-                supportedTypes.push(n);
-                networkEnvInfo[n] = configHelper.parseEnvFile(filePath);
+                supportedTypes.push(network);
+                configStore.setEnvNetworkInfo(network, configHelper.parseEnvFile(filePath));
+            }
+            for (const layer of possibleLayers) {
+                const filePath = path.join(projectDir, 'networks', network, `${layer}.env`);
+                if (fs.existsSync(filePath)) {
+                    configStore.setEnvLayerInfo(network, layer, configHelper.parseEnvFile(filePath));
+                }
             }
         }
         if (supportedTypes.length === 0) {
             clm.error('No supported networks found in the project folder.');
         }
         configStore.setNetworkInfo({ supportedTypes });
-        configStore.setNetworkEnvInfo(networkEnvInfo);
         // eslint-disable-next-line no-warning-comments
         // TODO: verify all required env variables are present
     },
@@ -57,10 +53,7 @@ export const projectHelper = {
         if (!fs.existsSync(projectFolder)) {
             clm.error(`Project folder not found: ${projectFolder}`);
         }
-        await configStore.applyNewProjectStore(name);
-        const { projectDir } = configStore.getProjectInfo();
-        clm.debug(`Installing project from ${projectFolder} to ${projectDir}`);
-        fs.cpSync(projectFolder, projectDir, { recursive: true });
+        await this.installProject(name, projectFolder);
     },
     //  curl -s https://api.github.com/repos/Constellation-Labs/pacaswap-metagraph/releases/latest | jq -r '.assets[] | select(.name | contains("node-pilot"))'
     //  use .tag_name for the release version
@@ -75,15 +68,21 @@ export const projectHelper = {
         fs.mkdirSync(path.join(gl0DataDir, 'incremental_snapshot'), { recursive: true });
         fs.mkdirSync(path.join(gl0DataDir, 'snapshot_info'));
         fs.mkdirSync(path.join(gl0DataDir, 'tmp'));
-        // Set hypergraph layer defaults
-        configStore.setEnvLayerInfo('gl0', {
-            CL_CLI_HTTP_PORT: '9002', CL_DOCKER_JAVA_OPTS: '-Xms1024M -Xmx7G -Xss256K', CL_P2P_HTTP_PORT: '9001', CL_PUBLIC_HTTP_PORT: '9000'
-        });
-        configStore.setEnvLayerInfo('gl1', {
-            CL_CLI_HTTP_PORT: '9102', CL_DOCKER_JAVA_OPTS: '-Xms1024M -Xmx3G -Xss256K', CL_P2P_HTTP_PORT: '9101', CL_PUBLIC_HTTP_PORT: '9100'
-        });
-        await this.importNetworkEnvFiles();
-        await this.importLayerEnvFiles();
+        this.importEnvFiles();
+    },
+    async installProject(name, projectFolder) {
+        if (!configStore.hasProjects()) {
+            // On first install, copy scripts
+            const scriptsFolder = path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../scripts`);
+            const projectDir = path.join(configStore.getAppDir(), 'scripts');
+            clm.debug(`Installing node pilot scripts from ${scriptsFolder} to ${projectDir}`);
+            fs.mkdirSync(projectDir, { recursive: true });
+            fs.cpSync(scriptsFolder, projectDir, { recursive: true });
+        }
+        await configStore.applyNewProjectStore(name);
+        const { projectDir } = configStore.getProjectInfo();
+        clm.debug(`Installing project from ${projectFolder} to ${projectDir}`);
+        fs.cpSync(projectFolder, projectDir, { recursive: true });
     },
     async selectProject() {
         // prompt user to install hypergraph or metagraph
@@ -124,7 +123,7 @@ export const projectHelper = {
                 const m = repo.trim().match(ghRepoRegex);
                 const userRepo = `${m[1]}/${m[2]}`; // owner/repo
                 clm.preStep(`Installing from Github repository: ${chalk.cyan(userRepo)}`);
-                if (await githubHelper.hasAssetInRelease('node-pilot', userRepo)) {
+                if (await githubService.hasAssetInRelease('node-pilot', userRepo)) {
                     await this.installFromGithub(userRepo);
                 }
                 else {

package/dist/helpers/prompt-helper.d.ts

@@ -1,5 +1,4 @@
 export declare const promptHelper: {
-    configureAutoRestart(): Promise<void>;
     configureJavaMemoryArguments(): Promise<void>;
     doYouWishToContinue(defaultAnswer?: "n" | "y"): Promise<void>;
     selectLayers(): Promise<void>;