Fixed replace-operator flow

Author: pinebit

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

@@ -6,15 +6,17 @@ user-invokable: true
 
 # Replace Operator
 
-Replace a single operator in a Charon cluster with a new one. Remaining operators run a `charon alpha edit replace-operator` ceremony (P2P via relay), then share the new cluster-lock with the new operator.
+Replace a single operator in a Charon cluster with a new one. All participating operators (remaining + new) run a `charon alpha edit replace-operator` ceremony together (P2P via relay). The new operator must receive the current cluster-lock.json before the ceremony begins.
 
 ## Prerequisites
 
 Read `scripts/edit/replace-operator/README.md` for full details if needed.
 
 Common prerequisites:
 1. `.env` file exists with `NETWORK` and `VC` variables set
-2. Docker is running
+2. `.charon` directory with `cluster-lock.json` and `charon-enr-private-key`
+3. Docker is running
+4. `jq` installed
 
 ## Role Selection
 
@@ -43,13 +45,13 @@ Ask the user: **"Are you a remaining operator (performing the replacement) or th
     [--dry-run]
 ```
 
-After completion, the script will print commands to start containers manually. Remind the user to **share the new cluster-lock.json with the new operator** and to **wait ~2 epochs before starting** containers.
+After completion, the script will print commands to start containers manually. Remind the user to **wait ~2 epochs before starting** containers.
 
 ### If New Operator
 
 **Script**: `scripts/edit/replace-operator/new-operator.sh`
 
-This is a **two-step process**:
+This is a **three-step process**:
 
 #### Step 1: Generate ENR
 
@@ -61,15 +63,29 @@ Ask if the user needs to generate an ENR:
 
 This creates `.charon/charon-enr-private-key` and displays the ENR. Tell the user to **share this ENR with the remaining operators**.
 
-#### Step 2: Install Cluster Lock
+#### Step 2: Run the Ceremony
 
-After receiving the new `cluster-lock.json` from remaining operators:
+After receiving the current `cluster-lock.json` from remaining operators (BEFORE the ceremony):
 - `--cluster-lock`: Path to the received `cluster-lock.json`
+- `--old-enr`: ENR of the operator being replaced
 - Whether to use `--dry-run` first
 
 ```bash
 ./scripts/edit/replace-operator/new-operator.sh \
     --cluster-lock ./received-cluster-lock.json \
+    --old-enr "enr:-..." \
+    [--dry-run]
+```
+
+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, install the new cluster-lock:
+
+```bash
+./scripts/edit/replace-operator/new-operator.sh \
+    --install-lock ./output/cluster-lock.json \
     [--dry-run]
 ```
 

scripts/edit/replace-operator/README.md

@@ -14,9 +14,11 @@ These scripts help operators replace a single operator in an existing distribute
 
 There are two scripts for the two roles involved:
 
-- **`remaining-operator.sh`** - For operators staying in the cluster (runs the ceremony)
+- **`remaining-operator.sh`** - For operators staying in the cluster
 - **`new-operator.sh`** - For the new operator joining the cluster
 
+**Important**: All participating operators (remaining + new) run the `charon alpha edit replace-operator` ceremony together. The new operator must receive the current `cluster-lock.json` BEFORE the ceremony begins.
+
 ## Prerequisites
 
 - `.env` file with `NETWORK` and `VC` variables set
@@ -34,6 +36,8 @@ Automates the complete workflow for operators staying in the cluster:
     --old-enr "enr:-..."
 ```
 
+**Before running**: Share your current `cluster-lock.json` with the new operator so they can participate in the ceremony.
+
 ### Options
 
 | Option | Required | Description |
@@ -56,25 +60,35 @@ Automates the complete workflow for operators staying in the cluster:
 
 ## For New Operators
 
-Two-step workflow for the new operator joining the cluster.
+Three-step workflow for the new operator joining the cluster.
 
 **Step 1:** Generate ENR and share with remaining operators:
 
 ```bash
 ./scripts/edit/replace-operator/new-operator.sh --generate-enr
 ```
 
-**Step 2:** After receiving cluster-lock from remaining operators:
+**Step 2:** After receiving `cluster-lock.json` from remaining operators (BEFORE the ceremony), run the ceremony together with all other operators:
+
+```bash
+./scripts/edit/replace-operator/new-operator.sh \
+    --cluster-lock ./received-cluster-lock.json \
+    --old-enr "enr:-..."
+```
+
+**Step 3:** After the ceremony completes, install the new cluster-lock:
 
 ```bash
-./scripts/edit/replace-operator/new-operator.sh --cluster-lock ./received-cluster-lock.json
+./scripts/edit/replace-operator/new-operator.sh --install-lock ./output/cluster-lock.json
 ```
 
 ### Options
 
 | Option | Required | Description |
 |--------|----------|-------------|
-| `--cluster-lock <path>` | No | Path to new cluster-lock.json |
+| `--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 |