ovtools 0.0.0-stage → 1.0.1

package/assets/common/node-setup.sh

@@ -0,0 +1,150 @@
+#!/usr/bin/env bash
+# ===================================================================
+# node-setup.sh — configure the Octra lite_node
+#
+# Two-step validator setup (by design — Octra protocol requirement):
+#
+#   STEP 1 (first run):  --role observer
+#     Run this on a fresh node. Builds binary, syncs 38 GB state,
+#     generates wallet.json + node.env.
+#     Then start the node, fund the wallet, and call node-enroll.sh.
+#
+#   STEP 2 (after bond is ready): --role validator
+#     Once enrollment state = "ready" (validator_scheduled or
+#     validator_active = true via stat.sh), run this script again
+#     with ROLE=validator to reconfigure node.env, then restart.
+#     The promote-validator.sh watcher handles this automatically.
+#
+# Usage:
+#   sudo bash node-setup.sh                      # interactive (asks role)
+#   sudo ROLE=observer   PUBLIC_HOST=1.2.3.4 NODE_NAME=mynode bash node-setup.sh
+#   sudo ROLE=validator  PUBLIC_HOST=1.2.3.4 NODE_NAME=mynode bash node-setup.sh
+#
+# ROLE defaults to 'observer' for first-time setup.
+# Set ROLE=validator only after enrollment state = ready.
+# ===================================================================
+
+set -euo pipefail
+source "$(dirname "$0")/config.sh"
+
+if [[ $EUID -ne 0 ]]; then
+  err "Run as root:  sudo bash $0"
+  exit 1
+fi
+
+# --- Gather inputs -------------------------------------------------
+PUBLIC_HOST="${PUBLIC_HOST:-}"
+NODE_NAME="${NODE_NAME:-}"
+ROLE="${ROLE:-observer}"
+
+if [[ -z "${PUBLIC_HOST}" ]]; then
+  PUBLIC_HOST=$(curl -s --max-time 5 https://api.ipify.org 2>/dev/null || hostname -I | awk '{print $1}')
+  warn "PUBLIC_HOST not set — auto-detected: ${PUBLIC_HOST}"
+fi
+
+if [[ -z "${NODE_NAME}" ]]; then
+  NODE_NAME="octra-node-$(hostname)"
+  warn "NODE_NAME not set — using: ${NODE_NAME}"
+fi
+
+if [[ "${ROLE}" != "observer" && "${ROLE}" != "validator" ]]; then
+  err "ROLE must be 'observer' or 'validator', got: ${ROLE}"
+  exit 1
+fi
+
+# --- Warn if switching to validator before membership is ready -----
+if [[ "${ROLE}" == "validator" ]]; then
+  log "Checking validator membership before reconfiguring…"
+  MEMBERSHIP=$(su - "${NODE_USER}" -c "cd ${NODE_SRC_DIR} && sh controls/stat.sh 2>/dev/null" 2>/dev/null | \
+    grep -E '^(validator_active|validator_scheduled|validator_enrollment)' || true)
+  ACTIVE=$(echo "${MEMBERSHIP}"    | grep '^validator_active'    | awk -F' = ' '{print $2}')
+  SCHEDULED=$(echo "${MEMBERSHIP}" | grep '^validator_scheduled' | awk -F' = ' '{print $2}')
+  ENROLL=$(echo "${MEMBERSHIP}"    | grep '^validator_enrollment' | awk -F' = ' '{print $2}')
+
+  if [[ "${ACTIVE}" != "true" && "${SCHEDULED}" != "true" ]]; then
+    err "Cannot set ROLE=validator: membership not yet active or scheduled"
+    warn "Current enrollment: ${ENROLL:-unknown}"
+    warn "Run 'sh controls/stat.sh' and wait until validator_active or validator_scheduled = true"
+    exit 1
+  fi
+  log "Membership confirmed (active=${ACTIVE} scheduled=${SCHEDULED}) — proceeding with validator config"
+fi
+
+log "Configuring node:"
+echo "  Role:       ${ROLE}"
+echo "  Host:       ${PUBLIC_HOST}"
+echo "  Name:       ${NODE_NAME}"
+echo "  API port:   ${API_PORT}"
+echo "  Consensus:  ${CONSENSUS_PORT}"
+echo "  P2P:        ${P2P_PORT}"
+echo "  Data dir:   ${NODE_DATA_DIR}"
+
+# --- Ensure data directories exist --------------------------------
+mkdir -p "${NODE_DATA_DIR}" "${NODE_SYNC_STAGE}"
+chown -R "${NODE_USER}:${NODE_USER}" "${NODE_DATA_ROOT}"
+
+# --- Verify network.env sha256 ------------------------------------
+(cd "${NODE_SRC_DIR}" && sha256sum -c config/network.env.sha256)
+NETWORK_SHA=$(awk '{print $1}' "${NODE_SRC_DIR}/config/network.env.sha256")
+
+# config_val.sh runs `opam switch link <switch> <repo>` and opam 2.3 cannot
+# re-create an existing <repo>/_opam: it dies with «"rmdir" failed ... Not a
+# directory» AND the failed call empties the switch prefix, which throws away the
+# whole build (seen 2026-11-02). install.sh already created that link, so drop it
+# here and let config_val.sh create it again - the switch itself is untouched.
+unlink_ocaml_switch_link "config_val.sh runs opam switch link next"
+# --- Run config_val.sh -------------------------------------------
+log "Running config_val.sh (role=${ROLE})…"
+
+# For observer (first run): include --build and --sync
+# For validator (re-config): skip both — binary + data already present
+if [[ "${ROLE}" == "observer" ]]; then
+  su - "${NODE_USER}" -c "cd ${NODE_SRC_DIR} && \
+    sh controls/config_val.sh \
+      --role observer \
+      --name '${NODE_NAME}' \
+      --advertise '${PUBLIC_HOST}:${CONSENSUS_PORT}' \
+      --api-port ${API_PORT} \
+      --consensus-port ${CONSENSUS_PORT} \
+      --p2p-port ${P2P_PORT} \
+      --data-dir ${NODE_DATA_DIR} \
+      --sync-stage ${NODE_SYNC_STAGE} \
+      --network config/network.env \
+      --network-sha '${NETWORK_SHA}' \
+      --build \
+      --sync \
+      --yes"
+else
+  # Validator re-config — node must be STOPPED before running this.
+  # We patch node.env directly (bypasses config_val.py's RPC membership check
+  # which fails when the node is stopped). Only two fields change:
+  #   OCTRA_OPERATOR_ROLE:   observer → validator
+  #   OCTRA_CONSENSUS_MODE:  observer → bft
+  NODE_ENV="${NODE_SRC_DIR}/.keys/validator/node.env"
+  if [[ ! -f "${NODE_ENV}" ]]; then
+    err "node.env not found — run observer setup first"
+    exit 1
+  fi
+  cp "${NODE_ENV}" "${NODE_ENV}.observer.bak"
+  sed -i "s/^OCTRA_OPERATOR_ROLE=.*/OCTRA_OPERATOR_ROLE=validator/" "${NODE_ENV}"
+  sed -i "s/^OCTRA_CONSENSUS_MODE=.*/OCTRA_CONSENSUS_MODE=bft/" "${NODE_ENV}"
+  log "node.env patched: ROLE=$(grep '^OCTRA_OPERATOR_ROLE=' "${NODE_ENV}" | cut -d= -f2)"
+fi
+
+log "Node configured as ${ROLE}."
+echo "  ${NODE_SRC_DIR}/.keys/validator/node.env     — node config"
+echo "  ${NODE_SRC_DIR}/.keys/validator/wallet.json  — validator wallet"
+echo "  ${NODE_DATA_DIR}/                             — blockchain data"
+echo
+
+if [[ "${ROLE}" == "observer" ]]; then
+  log "Next steps:"
+  echo "  1. Start node:    bash node-start.sh"
+  echo "  2. Fund wallet:   topup address in wallet.json"
+  echo "  3. Enroll:        bash node-enroll.sh join 1000000"
+  echo "  4. Wait for:      validator_scheduled = true (check: sh controls/stat.sh)"
+  echo "  5. Promote:       sudo ROLE=validator bash node-setup.sh && bash node-start.sh"
+else
+  log "Validator config applied. Restart the node to activate:"
+  echo "  bash node-start.sh"
+fi

package/assets/common/node-start.sh

@@ -0,0 +1,90 @@
+#!/usr/bin/env bash
+# ===================================================================
+# node-start.sh — start the Octra lite_node and check status
+#
+# Usage:  sudo bash node-start.sh
+# Idempotent — checks if already running before starting.
+# ===================================================================
+
+set -euo pipefail
+source "$(dirname "$0")/config.sh"
+
+if [[ $EUID -ne 0 ]]; then
+  err "Run as root:  sudo bash $0"
+  exit 1
+fi
+
+log "Starting Octra lite_node…"
+
+# --- is the node really online under pm2? ----------------------------
+# `pm2 pid <name>` is NOT a reliable probe: when the name does not exist (or the
+# pm2 daemon still has to be spawned) it prints a banner or a table separator
+# ("-------------"), and the old check took any non-empty line as a PID - so this
+# script reported "Node already running (PID -------------)", never started the
+# node, and the deploy waited 30 minutes for an rpc that could never answer
+# (2026-11-02). The JSON process list only reports processes that exist, and the
+# pid must be a number.
+pm2_online_pid() {  # pm2_online_pid [<pm2 name hint>]
+  local want="${1:-}" json pid node_env
+  # the name the node really uses is in node.env (OCTRA_OPERATOR_PM2_NAME); the
+  # hint is only a fallback, and any "octra*" pm2 process counts as our node
+  node_env="${NODE_ENV:-${NODE_SRC_DIR}/.keys/validator/node.env}"
+  if [[ -f "${node_env}" ]]; then
+    want=$(grep -m1 '^OCTRA_OPERATOR_PM2_NAME=' "${node_env}" 2>/dev/null | cut -d= -f2- || true)
+    want="${want:-${1:-}}"
+  fi
+  if command -v jq >/dev/null 2>&1; then
+    json=$(su - "${NODE_USER}" -c "pm2 jlist" 2>/dev/null || true)
+    pid=$(printf '%s' "${json}" | jq -r --arg want "${want}" \
+      '.[]? | select(.pm2_env.status == "online")
+           | select($want == "" or (.name | startswith($want)) or (.name | startswith("octra")))
+           | .pid' 2>/dev/null | head -1)
+    if [[ -n "${pid}" && "${pid}" != "null" ]]; then
+      printf '%s\n' "${pid}"
+      return 0
+    fi
+  fi
+  # no jq (or pm2 not answering): the node process itself is proof enough
+  pgrep -f '[o]ctra_node\.exe' | head -1
+  return 0
+}
+
+node_log_tail() {  # node_log_tail [<lines>]
+  local lines="${1:-20}" logdir
+  logdir=$(su - "${NODE_USER}" -c "grep -m1 '^OCTRA_OPERATOR_LOG_DIR=' ${NODE_SRC_DIR}/.keys/validator/node.env" 2>/dev/null \
+           | cut -d= -f2- || true)
+  logdir="${logdir:-${NODE_SRC_DIR}/data}"
+  tail -n "${lines}" "${logdir}/node.log" 2>/dev/null | sed 's/^/    /' || true
+}
+
+RUNNING=$(pm2_online_pid "${NODE_PM2_NAME:-octra-node-1}")
+if [[ -n "${RUNNING}" ]]; then
+  warn "Node already running (PID ${RUNNING}) - not starting it twice"
+  su - "${NODE_USER}" -c "cd ${NODE_SRC_DIR} && sh controls/stat.sh" || true
+  exit 0
+fi
+
+# Start the node
+su - "${NODE_USER}" -c "cd ${NODE_SRC_DIR} && sh controls/run.sh"
+
+sleep 3
+
+# --- the node must really be running now -----------------------------
+# Say it HERE, with the node's own log, instead of letting the deploy step wait
+# half an hour for an rpc that will never come.
+RUNNING=$(pm2_online_pid "${NODE_PM2_NAME:-octra-node-1}")
+if [[ -z "${RUNNING}" ]]; then
+  err "the node did not come up under pm2 (no online process) - node log:"
+  node_log_tail 20
+  err "pm2 list:"
+  su - "${NODE_USER}" -c "pm2 list" 2>/dev/null | sed 's/^/    /' || true
+  exit 1
+fi
+log "node process online (PID ${RUNNING})"
+
+# Show status
+log "Node status:"
+su - "${NODE_USER}" -c "cd ${NODE_SRC_DIR} && sh controls/stat.sh"
+
+echo
+log "Node started. Dashboard API: http://$(curl -s --max-time 3 https://api.ipify.org 2>/dev/null || echo 'localhost'):${API_PORT}/"

package/assets/common/node-stop.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# ===================================================================
+# node-stop.sh — stop the Octra lite_node gracefully
+#
+# Usage:  sudo bash node-stop.sh
+# ===================================================================
+
+set -euo pipefail
+source "$(dirname "$0")/config.sh"
+
+if [[ $EUID -ne 0 ]]; then
+  err "Run as root:  sudo bash $0"
+  exit 1
+fi
+
+log "Stopping Octra lite_node…"
+su - "${NODE_USER}" -c "cd ${NODE_SRC_DIR} && sh controls/stop.sh"
+log "Node stopped."

package/assets/common/node-upgrade.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# ===================================================================
+# node-upgrade.sh — upgrade the Octra lite_node to the latest release
+#
+# Uses the official upgrade.sh which monitors the repo, builds a
+# fresh binary, restarts the node, and verifies it's operational.
+#
+# Usage:
+#   sudo bash node-upgrade.sh             # dry-run (test only, no changes)
+#   sudo bash node-upgrade.sh --apply       # apply the upgrade
+#
+# This is a thin wrapper around controls/upgrade.sh.
+# ===================================================================
+
+set -euo pipefail
+source "$(dirname "$0")/config.sh"
+
+if [[ $EUID -ne 0 ]]; then
+  err "Run as root:  sudo bash $0"
+  exit 1
+fi
+
+if [[ ! -d "${NODE_SRC_DIR}/.git" ]]; then
+  err "Node source not found at ${NODE_SRC_DIR}"
+  err "Run install-deps.sh first."
+  exit 1
+fi
+
+MODE="${1:---dry-run}"
+
+log "Running upgrade (${MODE})…"
+log "Pulling latest source…"
+
+# Pull latest code first
+su - "${NODE_USER}" -c "cd ${NODE_SRC_DIR} && git pull --ff-only"
+
+if [[ "${MODE}" == "--apply" ]]; then
+  su - "${NODE_USER}" -c "cd ${NODE_SRC_DIR} && sh controls/upgrade.sh --apply"
+else
+  log "Dry-run mode — testing only (no changes applied)"
+  su - "${NODE_USER}" -c "cd ${NODE_SRC_DIR} && sh controls/upgrade.sh"
+  echo
+  log "Dry-run complete. If everything looks good, run:"
+  echo "  sudo bash node-upgrade.sh --apply"
+fi