Fixed replace-operator flow

Author: pinebit

.claude/skills/replace-operator/SKILL.md

@@ -51,7 +51,7 @@ After completion, the script will print commands to start containers manually. R
 
 **Script**: `scripts/edit/replace-operator/new-operator.sh`
 
-This is a **three-step process**:
+This is a **two-step process**:
 
 #### Step 1: Generate ENR
 
@@ -79,14 +79,9 @@ After receiving the current `cluster-lock.json` from remaining operators (BEFORE
 
 The new operator runs this **at the same time** as the remaining operators run their ceremony. All operators must participate together.
 
-#### Step 3: Install New Cluster Lock
+After the ceremony completes, the script automatically:
+- Backs up the old `.charon` directory
+- Moves the output directory to `.charon` (contains complete configuration)
+- Prints commands to start containers
 
-After the ceremony completes, install the new cluster-lock:
-
-```bash
-./scripts/edit/replace-operator/new-operator.sh \
-    --install-lock ./output/cluster-lock.json \
-    [--dry-run]
-```
-
-The script will verify the ENR is present in the cluster-lock, install the configuration, and print commands to start containers manually. Note: the new operator does NOT have slashing protection history (fresh start).
+Note: the new operator does NOT have slashing protection history (fresh start).

scripts/edit/replace-operator/README.md

@@ -60,7 +60,7 @@ Automates the complete workflow for operators staying in the cluster:
 
 ## For New Operators
 
-Three-step workflow for the new operator joining the cluster.
+Two-step workflow for the new operator joining the cluster.
 
 **Step 1:** Generate ENR and share with remaining operators:
 
@@ -76,19 +76,14 @@ Three-step workflow for the new operator joining the cluster.
     --old-enr "enr:-..."
 ```
 
-**Step 3:** After the ceremony completes, install the new cluster-lock:
-
-```bash
-./scripts/edit/replace-operator/new-operator.sh --install-lock ./output/cluster-lock.json
-```
+After the ceremony completes, the script automatically backs up the old `.charon` directory and installs the new configuration from the output directory.
 
 ### Options
 
 | Option | Required | Description |
 |--------|----------|-------------|
 | `--cluster-lock <path>` | No | Path to cluster-lock.json (for ceremony) |
 | `--old-enr <enr>` | No | ENR of the operator being replaced (for ceremony) |
-| `--install-lock <path>` | No | Install the new cluster-lock after ceremony |
 | `--generate-enr` | No | Generate new ENR private key |
 | `--dry-run` | No | Preview without executing |
 | `-h, --help` | No | Show help message |

scripts/edit/replace-operator/new-operator.sh

@@ -2,6 +2,7 @@
 
 # Replace-Operator Script for NEW Operator - See README.md for documentation
 # The new operator participates in the ceremony together with remaining operators.
+# Both run the same `charon alpha edit replace-operator` command.
 
 set -euo pipefail
 
@@ -11,7 +12,6 @@ cd "$REPO_ROOT"
 
 # Default values
 CLUSTER_LOCK_PATH=""
-INSTALL_LOCK_PATH=""
 OLD_ENR=""
 GENERATE_ENR=false
 DRY_RUN=false
@@ -38,11 +38,11 @@ Usage: ./scripts/edit/replace-operator/new-operator.sh [OPTIONS]
 
 Helps a new operator join an existing cluster by participating in the
 replace-operator ceremony together with the remaining operators.
+Both remaining and new operators run the same ceremony command.
 
 Options:
   --cluster-lock <path>   Path to the current cluster-lock.json (for ceremony)
   --old-enr <enr>         ENR of the operator being replaced (for ceremony)
-  --install-lock <path>   Install the new cluster-lock after ceremony
   --generate-enr          Generate a new ENR private key if not present
   --dry-run               Show what would be done without executing
   -h, --help              Show this help message
@@ -56,9 +56,6 @@ Examples:
       --cluster-lock ./received-cluster-lock.json \
       --old-enr "enr:-..."
 
-  # Step 3: Install the new cluster-lock after ceremony completes
-  ./scripts/edit/replace-operator/new-operator.sh --install-lock ./output/cluster-lock.json
-
 Prerequisites:
   - .env file with NETWORK and VC variables set
   - For --generate-enr: Docker installed
@@ -74,10 +71,6 @@ while [[ $# -gt 0 ]]; do
             CLUSTER_LOCK_PATH="$2"
             shift 2
             ;;
-        --install-lock)
-            INSTALL_LOCK_PATH="$2"
-            shift 2
-            ;;
         --old-enr)
             OLD_ENR="$2"
             shift 2
@@ -297,91 +290,29 @@ if [ -n "$CLUSTER_LOCK_PATH" ] && [ -n "$OLD_ENR" ]; then
         echo "  [DRY-RUN] docker run --rm ... charon alpha edit replace-operator ..."
     fi
 
-    echo ""
-    echo "╔════════════════════════════════════════════════════════════════╗"
-    echo "║     Ceremony COMPLETED                                         ║"
-    echo "╚════════════════════════════════════════════════════════════════╝"
-    echo ""
-    log_info "New cluster-lock generated at $OUTPUT_DIR/cluster-lock.json"
-    echo ""
-    log_info "Now install the new cluster-lock with:"
-    echo "  ./scripts/edit/replace-operator/new-operator.sh --install-lock $OUTPUT_DIR/cluster-lock.json"
-    echo ""
-    
-    exit 0
-fi
-
-# Install-lock mode: --install-lock
-if [ -n "$INSTALL_LOCK_PATH" ]; then
-    log_step "Step 1: Checking prerequisites..."
-    
-    if [ "$DRY_RUN" = false ]; then
-        if [ ! -d .charon ]; then
-            log_error ".charon directory not found"
-            log_info "First generate your ENR with: ./scripts/edit/replace-operator/new-operator.sh --generate-enr"
-            exit 1
-        fi
-
-        if [ ! -f .charon/charon-enr-private-key ]; then
-            log_error ".charon/charon-enr-private-key not found"
-            log_info "First generate your ENR with: ./scripts/edit/replace-operator/new-operator.sh --generate-enr"
-            exit 1
-        fi
-        
-        if [ ! -f "$INSTALL_LOCK_PATH" ]; then
-            log_error "Cluster-lock file not found: $INSTALL_LOCK_PATH"
-            exit 1
-        fi
-    fi
-    
-    log_info "Prerequisites OK"
+    log_info "Ceremony completed successfully"
 
     echo ""
 
-    # Step 2: Stop any running containers
-    log_step "Step 2: Stopping any running containers..."
+    # Step 4: Backup and install new .charon directory
+    log_step "Step 4: Installing new cluster configuration..."
 
-    run_cmd docker compose stop "$VC" charon 2>/dev/null || true
+    TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+    mkdir -p "$BACKUP_DIR"
 
-    log_info "Containers stopped"
+    run_cmd mv .charon "$BACKUP_DIR/.charon.$TIMESTAMP"
+    log_info "Old .charon backed up to $BACKUP_DIR/.charon.$TIMESTAMP"
 
-    echo ""
-    
-    # Step 3: Install new cluster-lock
-    log_step "Step 3: Installing new cluster-lock..."
-    
-    if [ -f .charon/cluster-lock.json ]; then
-        TIMESTAMP=$(date +%Y%m%d_%H%M%S)
-        mkdir -p "$BACKUP_DIR"
-        run_cmd cp .charon/cluster-lock.json "$BACKUP_DIR/cluster-lock.json.$TIMESTAMP"
-        log_info "Old cluster-lock backed up to $BACKUP_DIR/cluster-lock.json.$TIMESTAMP"
-    fi
-    
-    # Remove existing file first (may be read-only from Charon)
-    rm -f .charon/cluster-lock.json
-    run_cmd cp "$INSTALL_LOCK_PATH" .charon/cluster-lock.json
-    log_info "New cluster-lock installed"
-    
-    echo ""
-    
-    # Step 4: Verify cluster-lock matches our ENR
-    log_step "Step 4: Verifying cluster-lock configuration..."
+    run_cmd mv "$OUTPUT_DIR" .charon
+    log_info "New configuration installed to .charon/"
 
+    # Verify our ENR is in the new cluster-lock
     if [ "$DRY_RUN" = false ] && [ -f .charon/cluster-lock.json ]; then
-        # Get our ENR
-        OUR_ENR=$(docker run --rm \
-            -v "$REPO_ROOT/.charon:/opt/charon/.charon" \
-            "obolnetwork/charon:${CHARON_VERSION:-v1.9.0-rc3}" \
-            enr 2>/dev/null || echo "")
-        
-        if [ -n "$OUR_ENR" ]; then
-            # Check if our ENR is in the cluster-lock
-            if grep -q "${OUR_ENR:0:50}" .charon/cluster-lock.json 2>/dev/null; then
-                log_info "Verified: Your ENR is present in the cluster-lock"
-            else
-                log_warn "Your ENR may not be in this cluster-lock."
-                log_warn "Make sure you received the correct cluster-lock from the ceremony."
-            fi
+        if grep -q "${OUR_ENR:0:50}" .charon/cluster-lock.json 2>/dev/null; then
+            log_info "Verified: Your ENR is present in the new cluster-lock"
+        else
+            log_warn "Your ENR may not be in this cluster-lock."
+            log_warn "Please verify the ceremony completed successfully."
         fi
 
         # Show cluster info
@@ -394,11 +325,12 @@ if [ -n "$INSTALL_LOCK_PATH" ]; then
 
     echo ""
     echo "╔════════════════════════════════════════════════════════════════╗"
-    echo "║     New Operator Setup COMPLETED                               ║"
+    echo "║     Replace-Operator Workflow COMPLETED                        ║"
     echo "╚════════════════════════════════════════════════════════════════╝"
     echo ""
     log_info "Summary:"
-    log_info "  - Cluster-lock installed in: .charon/cluster-lock.json"
+    log_info "  - Old .charon backed up to: $BACKUP_DIR/.charon.$TIMESTAMP"
+    log_info "  - New configuration installed to: .charon/"
     echo ""
     log_warn "╔════════════════════════════════════════════════════════════════╗"
     log_warn "║  IMPORTANT: Wait at least 2 epochs (~13 min) before starting   ║"
@@ -416,16 +348,17 @@ if [ -n "$INSTALL_LOCK_PATH" ]; then
     log_warn "Note: As a new operator, you do NOT have any slashing protection history."
     log_warn "Your VC will start fresh."
     echo ""
+    log_warn "Keep the backup until you've verified normal operation for several epochs."
+    echo ""
 
     exit 0
 fi
 
 # Error: missing required arguments
 log_error "Missing required arguments."
 echo ""
-echo "To generate ENR:           --generate-enr"
-echo "To run ceremony:           --cluster-lock <path> --old-enr <enr>"
-echo "To install after ceremony: --install-lock <path>"
+echo "To generate ENR:  --generate-enr"
+echo "To run ceremony:  --cluster-lock <path> --old-enr <enr>"
 echo ""
 echo "Use --help for full usage information."
 exit 1

scripts/edit/test/e2e_test.sh

@@ -753,22 +753,15 @@ EOF
         return 1
     fi
 
-    # Post-ceremony: run new-operator.sh to install the cluster-lock
-    local new_lock="$new_op_dir/output/cluster-lock.json"
-    if [ ! -f "$new_lock" ]; then
-        # Fall back to a remaining operator's output
-        new_lock="$TMP_DIR/operator0/.charon/cluster-lock.json"
-    fi
-    (
-        WORK_DIR="$new_op_dir" \
-        COMPOSE_FILE="$new_op_dir/docker-compose.e2e.yml" \
-        COMPOSE_PROJECT_NAME="e2e-op-replace-new" \
-            "$REPO_ROOT/scripts/edit/replace-operator/new-operator.sh" \
-            --install-lock "$new_lock"
-    ) < /dev/null > "$logs_dir/new-operator-setup.log" 2>&1
-    if [ $? -ne 0 ]; then
-        log_error "New operator post-ceremony setup failed. Log:"
-        sed 's/\r$//' "$logs_dir/new-operator-setup.log" | while IFS= read -r line; do echo "                $line"; done || true
+    # Post-ceremony: install the new .charon directory for the new operator
+    # (The script now does this automatically, but since we ran raw docker for the test,
+    # we do it manually here)
+    if [ -d "$new_op_dir/output" ]; then
+        mv "$new_op_dir/.charon" "$new_op_dir/.charon-backup" 2>/dev/null || true
+        mv "$new_op_dir/output" "$new_op_dir/.charon"
+        log_info "New operator: installed output to .charon"
+    else
+        log_error "New operator: output directory not found after ceremony"
         all_ok=false
     fi