@constellation-network/node-pilot 0.24.0-devnet → 0.24.0-devnet.1

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.24.0-devnet darwin-arm64 node-v22.15.0
+@constellation-network/node-pilot/0.24.0-devnet.1 darwin-arm64 node-v22.15.0
 $ cpilot --help [COMMAND]
 USAGE
   $ cpilot COMMAND
@@ -72,7 +72,7 @@ EXAMPLES
   $ cpilot clean
 ```
 
-_See code: [src/commands/clean.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet/src/commands/clean.ts)_
+_See code: [src/commands/clean.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet.1/src/commands/clean.ts)_
 
 ## `cpilot config`
 
@@ -89,7 +89,7 @@ EXAMPLES
   $ cpilot config
 ```
 
-_See code: [src/commands/config.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet.1/src/commands/config.ts)_
 
 ## `cpilot config get [NAME]`
 
@@ -113,7 +113,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.24.0-devnet/src/commands/config/get.ts)_
+_See code: [src/commands/config/get.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet.1/src/commands/config/get.ts)_
 
 ## `cpilot config set NAME VALUE`
 
@@ -136,7 +136,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.24.0-devnet/src/commands/config/set.ts)_
+_See code: [src/commands/config/set.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet.1/src/commands/config/set.ts)_
 
 ## `cpilot help [COMMAND]`
 
@@ -173,7 +173,7 @@ EXAMPLES
   $ cpilot info
 ```
 
-_See code: [src/commands/info.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet.1/src/commands/info.ts)_
 
 ## `cpilot logs LAYER`
 
@@ -199,7 +199,7 @@ EXAMPLES
   $ cpilot logs
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet.1/src/commands/logs.ts)_
 
 ## `cpilot restart [LAYER]`
 
@@ -223,7 +223,7 @@ EXAMPLES
   $ cpilot restart
 ```
 
-_See code: [src/commands/restart.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet/src/commands/restart.ts)_
+_See code: [src/commands/restart.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet.1/src/commands/restart.ts)_
 
 ## `cpilot shutdown`
 
@@ -240,7 +240,7 @@ EXAMPLES
   $ cpilot shutdown
 ```
 
-_See code: [src/commands/shutdown.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet/src/commands/shutdown.ts)_
+_See code: [src/commands/shutdown.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet.1/src/commands/shutdown.ts)_
 
 ## `cpilot status`
 
@@ -254,7 +254,7 @@ DESCRIPTION
   Display node status and configuration settings
 ```
 
-_See code: [src/commands/status.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet.1/src/commands/status.ts)_
 
 ## `cpilot uninstall`
 
@@ -271,5 +271,5 @@ EXAMPLES
   $ cpilot uninstall
 ```
 
-_See code: [src/commands/uninstall.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet/src/commands/uninstall.ts)_
+_See code: [src/commands/uninstall.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.24.0-devnet.1/src/commands/uninstall.ts)_
 <!-- commandsstop -->

package/dist/services/docker-service.js

@@ -16,7 +16,9 @@ export const dockerService = {
             else {
                 clm.preStep('Building the node container...');
             }
-            await shellService.runProjectCommand('bash scripts/docker-build.sh', undefined, silent);
+            const { type: network } = configStore.getNetworkInfo();
+            const JAVA_VERSION = network === 'mainnet' ? '11' : '21';
+            await shellService.runProjectCommand('bash scripts/docker-build.sh', { JAVA_VERSION }, silent);
             if (silent) {
                 spinner.stop();
             }

package/dist/services/migration-service.js

@@ -2,18 +2,25 @@ import semver from "semver";
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
 import { projectHelper } from "../helpers/project-helper.js";
+import { dockerService } from "./docker-service.js";
+import { nodeService } from "./node-service.js";
 import { shellService } from "./shell-service.js";
+const migrations = {
+    '0.24.0-0': {
+        description: 'host Java 21; container Java is network-aware (11 for mainnet, 21 elsewhere)',
+        requiresNodeRestart: true,
+        async run() {
+            configStore.setProjectFlag('javaMemoryChecked', false);
+            projectHelper.upgradeHypergraph();
+            const { type: network } = configStore.getNetworkInfo();
+            const JAVA_VERSION = network === 'mainnet' ? '11' : '21';
+            await shellService.runProjectCommand('bash scripts/install-dependencies.sh', { JAVA_VERSION });
+            await refreshJavaHome();
+        }
+    }
+};
 export const migrationService = {
     async runMigrations() {
-        const migrations = {
-            '0.12.5': m0125,
-            '0.13.9': m0139,
-            '0.14.0-intnet.1': m0140intnet1,
-            '0.18.7-intnet': m01807,
-            '0.19.2-intnet': m0192intnet,
-            '0.24.0-0': m0240
-            // add more migrations as needed
-        };
         const { version = '0.0.0' } = configStore.getProjectInfo();
         const { version: pilotVersion } = configStore.getPilotReleaseInfo();
         const lastMigratedVersion = semver.parse(version);
@@ -22,27 +29,46 @@ export const migrationService = {
             return;
         }
         clm.debug(`Running migrations from ${lastMigratedVersion.version} to ${currentVersion.version}`);
-        clm.debug(`semver.gt(v, version): ${semver.gt('0.8.0', version)}`);
-        clm.debug(`semver.lte(v, currentVersion.version): ${semver.lte('0.8.0', currentVersion.version)}`);
-        const migrationVersions = Object.keys(migrations)
+        const migrationKeys = Object.keys(migrations)
             .filter(v => semver.gt(v, version) && semver.lte(v, currentVersion.version))
             .sort(semver.compare);
-        if (migrationVersions.length > 0) {
-            clm.preStep(`Migration versions to run: ${migrationVersions}`);
-            for (const version of migrationVersions) {
-                // eslint-disable-next-line no-await-in-loop
-                await migrations[version]();
-            }
+        if (migrationKeys.length === 0) {
+            clm.debug('No migrations applicable.');
+            configStore.setProjectInfo({ version: currentVersion.toString() });
+            return;
+        }
+        const summary = migrationKeys.map(k => `${k} (${migrations[k].description})`).join(', ');
+        clm.preStep(`Migration versions to run: ${summary}`);
+        for (const key of migrationKeys) {
+            // eslint-disable-next-line no-await-in-loop
+            await runMigration(key, migrations[key]);
+            // Stamp per-migration so a later failure doesn't re-run earlier ones.
+            configStore.setProjectInfo({ version: key });
         }
         configStore.setProjectInfo({ version: currentVersion.toString() });
     }
 };
-async function m0240() {
-    clm.step('Running migration 0.24.0 — refreshing project files for Java 21 unified runtime...');
-    configStore.setProjectFlag('javaMemoryChecked', false);
-    projectHelper.upgradeHypergraph();
-    await shellService.runProjectCommand('bash scripts/install-dependencies.sh');
-    await refreshJavaHome();
+async function runMigration(key, migration) {
+    clm.step(`Running migration ${key} — ${migration.description}...`);
+    if (!migration.requiresNodeRestart) {
+        await migration.run();
+        return;
+    }
+    const wasRunning = await dockerService.isRunning();
+    if (wasRunning) {
+        clm.preStep('Shutting down node to apply migration changes...');
+        const { layersToRun } = configStore.getProjectInfo();
+        await nodeService.leaveClusterAllLayers();
+        await nodeService.pollForLayersState(layersToRun, 'Offline');
+        await dockerService.dockerDown();
+    }
+    await migration.run();
+    if (wasRunning) {
+        clm.preStep('Rebuilding container with refreshed Dockerfile...');
+        await dockerService.dockerBuild();
+        clm.preStep('Restarting node...');
+        await dockerService.dockerRestartAll();
+    }
 }
 async function refreshJavaHome() {
     if (process.platform !== 'linux')
@@ -55,36 +81,3 @@ async function refreshJavaHome() {
         clm.debug(`JAVA_HOME refreshed to ${javaHome} for current process`);
     }
 }
-function m0192intnet() {
-    clm.step('Running migration 0.19.2-intnet...');
-    projectHelper.upgradeHypergraph();
-}
-function m01807() {
-    clm.step('Running migration 0.18.7...');
-    projectHelper.upgradeHypergraph();
-}
-function m0140intnet1() {
-    configStore.setProjectFlag('javaMemoryChecked', false);
-}
-function m0139() {
-    clm.step('Running migration 0.13.9...');
-    configStore.setProjectFlag('javaMemoryChecked', false);
-    projectHelper.upgradeHypergraph();
-}
-function m0125() {
-    clm.step('Running migration 0.12.5...');
-    configStore.setProjectFlag('javaMemoryChecked', false);
-    // projectHelper.upgradeHypergraph();
-    // installJava21();
-}
-// function installJava21() {
-//     const pilotDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../..`);
-//     clm.debug(`Running install-java-21.sh from ${pilotDir}`);
-//
-//     const result = shell.exec('bash install-java-21.sh', {cwd: pilotDir});
-//
-//     if (result.code > 0) {
-//         console.log(result.stderr);
-//         clm.error(`Failed to install dependencies. Please try again after resolving any errors.`);
-//     }
-// }

package/oclif.manifest.json

@@ -449,5 +449,5 @@
       ]
     }
   },
-  "version": "0.24.0-devnet"
+  "version": "0.24.0-devnet.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@constellation-network/node-pilot",
   "description": "An easy deployment and monitoring tool for Constellation nodes.",
-  "version": "0.24.0-devnet",
+  "version": "0.24.0-devnet.1",
   "author": "Frank Fox",
   "bin": {
     "cpilot": "bin/run.js"

package/projects/hypergraph/Dockerfile

@@ -1,6 +1,8 @@
 FROM ubuntu:22.04
 
-RUN apt update && apt install -y openjdk-21-jre
+ARG JAVA_VERSION=21
+
+RUN apt update && apt install -y openjdk-${JAVA_VERSION}-jre
 
 RUN apt install -y curl jq wget
 

package/projects/hypergraph/scripts/docker-build.sh

@@ -3,5 +3,6 @@ SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 
 # --- build image ---
 DOCKER_IMAGE_VERSION="${DOCKER_IMAGE_VERSION:-test}"
-echo "Building tessellation image: constellationnetwork/tessellation:$DOCKER_IMAGE_VERSION"
-docker build -t "constellationnetwork/tessellation:$DOCKER_IMAGE_VERSION" -f "$SCRIPT_DIR/../Dockerfile" .
+JAVA_VERSION="${JAVA_VERSION:-21}"
+echo "Building tessellation image: constellationnetwork/tessellation:$DOCKER_IMAGE_VERSION (Java $JAVA_VERSION)"
+docker build --build-arg JAVA_VERSION="$JAVA_VERSION" -t "constellationnetwork/tessellation:$DOCKER_IMAGE_VERSION" -f "$SCRIPT_DIR/../Dockerfile" .

package/projects/hypergraph/scripts/install-dependencies.sh

@@ -21,57 +21,66 @@ check_java_home() {
     
 }
 
-# Check and install Java 21
+# Check and install Java. Version is controlled by the JAVA_VERSION env
+# var (default 21). For mainnet (JAVA_VERSION=11), accept any existing
+# Java install — host utilities (keytool.jar, wallet.jar) work fine on
+# 11 or newer, so don't force-upgrade users who already have a JDK.
 check_java() {
-#  echo "Checking for Java 21..."
+  JAVA_VERSION="${JAVA_VERSION:-21}"
+
   if command -v java >/dev/null 2>&1; then
-    java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
-#    echo "Found Java version: $java_version"
-    if [[ "$java_version" == 21* ]] || [[ "$java_version" == 1.21* ]]; then
-      echo "✅ Java 21 is installed."
+    java_version_str=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
+
+    if [[ "$JAVA_VERSION" == "11" ]]; then
+      # Mainnet: accept whatever's installed (don't force-upgrade)
+      echo "✅ Java is installed: $java_version_str (mainnet — keeping existing JDK)"
+      return 0
+    fi
+
+    if [[ "$java_version_str" == "$JAVA_VERSION"* ]] || [[ "$java_version_str" == "1.$JAVA_VERSION"* ]]; then
+      echo "✅ Java $JAVA_VERSION is installed."
       return 0
-    else
-      echo "⚠️ Java is installed but not version 21. Will attempt to install Java 21."
     fi
+
+    echo "⚠️ Java is installed but not version $JAVA_VERSION. Will attempt to install Java $JAVA_VERSION."
   else
-    echo "⚠️ Java not found. Will attempt to install Java 21."
+    echo "⚠️ Java not found. Will attempt to install Java $JAVA_VERSION."
   fi
 
 
   case "$(uname)" in
     Linux)
       if command -v apt >/dev/null 2>&1; then
-        echo "Installing Java 21 using apt..."
-        sudo apt install -y openjdk-21-jdk
+        echo "Installing Java $JAVA_VERSION using apt..."
+        sudo apt install -y "openjdk-${JAVA_VERSION}-jdk"
       elif command -v yum >/dev/null 2>&1; then
-        echo "Installing Java 21 using yum..."
-        sudo yum install -y java-21-openjdk-devel
+        echo "Installing Java $JAVA_VERSION using yum..."
+        sudo yum install -y "java-${JAVA_VERSION}-openjdk-devel"
       else
-        echo "⚠️ Unsupported Linux distribution. Please install Java 21 manually."
+        echo "⚠️ Unsupported Linux distribution. Please install Java $JAVA_VERSION manually."
         return 1
       fi
       ;;
     Darwin)
       if command -v brew >/dev/null 2>&1; then
-        echo "Installing Java 21 using Homebrew..."
-#        if brew tap | grep -q '^adoptopenjdk/openjdk$'; then brew untap adoptopenjdk/openjdk; fi
-        brew install --cask temurin@21
+        echo "Installing Java $JAVA_VERSION using Homebrew..."
+        brew install --cask "temurin@${JAVA_VERSION}"
       else
-        echo "⚠️ Homebrew not found. Please install Java 21 manually."
+        echo "⚠️ Homebrew not found. Please install Java $JAVA_VERSION manually."
         return 1
       fi
       ;;
     MINGW*|MSYS*|CYGWIN*)
-      echo "On Windows, please install Java 21 manually from https://adoptopenjdk.net/"
+      echo "On Windows, please install Java $JAVA_VERSION manually from https://adoptium.net/"
       return 1
       ;;
     *)
-      echo "⚠️ Unsupported OS: $(uname). Please install Java 21 manually."
+      echo "⚠️ Unsupported OS: $(uname). Please install Java $JAVA_VERSION manually."
       return 1
       ;;
   esac
 
-  echo "✅ Java 21 installation complete."
+  echo "✅ Java $JAVA_VERSION installation complete."
   return 0
 }
 

package/projects/hypergraph/scripts/install.sh

@@ -44,7 +44,11 @@ if [ -f "$OUTPUT_DIR/version.sh" ]; then
   fi
 else
   [[ -z "${NETWORK}" ]] && { echo "No network specified."; usage; }
-  bash "$SCRIPT_DIR/install-dependencies.sh"
+  if [ "$NETWORK" = "mainnet" ]; then
+    JAVA_VERSION=11 bash "$SCRIPT_DIR/install-dependencies.sh"
+  else
+    JAVA_VERSION=21 bash "$SCRIPT_DIR/install-dependencies.sh"
+  fi
   INSTALLED_NETWORK_TYPE=""
 fi