missing on step

Author: SimonRastikian

scripts/ops/dev-cluster/dev-common.sh

@@ -45,8 +45,8 @@ verify_nodes() {
         if [[ "$info" == *"release=\"${version}\""* ]]; then ok=1; else fail=1; fi
     done
     [[ "$fail" -eq 0 && "$ok" -eq 1 ]] \
-        && echo "All nodes report release=\"${version}\"." \
-        || echo "Not all nodes are on ${version} yet."
+        && ok "All nodes report release=\"${version}\"." \
+        || warn "Not all nodes are on ${version} yet."
 }
 
 # Submit a test signature request to the dev cluster contract (on-chain txn).
@@ -64,6 +64,6 @@ test_sign() {
     show_cmd "${cmd[@]}"
     confirm "Send it?" || return 0
     "${cmd[@]}" \
-        && echo "Signature returned — the cluster is signing." \
-        || echo "Test sign failed — investigate before proceeding."
+        && ok "Signature returned — the cluster is signing." \
+        || warn "Test sign failed — investigate before proceeding."
 }

scripts/ops/dev-cluster/dev-menu.sh

@@ -52,19 +52,16 @@ Upgrading the ${NETWORK} dev cluster to ${VERSION}
 EOF
 confirm "Proceed?" || { echo "Aborted."; exit 0; }
 
-echo
-echo "### Step 1 — nodes"
+step "### Step 1 — nodes"
 run_cmd "${SCRIPT_DIR}/migrate-dev-cluster.sh" "$VERSION" \
     || die "Node upgrade did not complete — stopping before the contract step."
 
-echo
-echo "### Verify"
+step "### Verify"
 # Subshells: a die() here must not skip the contract step below.
 ( verify_nodes "$VERSION" ) || true
 ( test_sign "$NETWORK" ) || true
 
-echo
-echo "### Step 2 — contract"
+step "### Step 2 — contract"
 echo "Only for releases that change crates/contract (diff it between the two tags)."
 if confirm "Upgrade the contract too?"; then
     run_cmd "${SCRIPT_DIR}/upgrade-dev-contract.sh" "$VERSION" "$NETWORK" || true
@@ -73,4 +70,4 @@ else
 fi
 
 echo
-echo "Done. Testnet first — upgrade the mainnet dev cluster only once this one is healthy."
+ok "Done. Testnet first — upgrade the mainnet dev cluster only once this one is healthy."

scripts/ops/dev-cluster/migrate-dev-cluster.sh

@@ -63,14 +63,14 @@ wait_for_alloc() {
             | jq -r --argjson v "$job_version" \
               '[.[] | select(.JobVersion == $v)] | sort_by(.CreateIndex) | last | .ClientStatus // "pending"')
         if [[ "$status" == "running" ]]; then
-            echo "running."
+            ok "running."
             return
         fi
         printf '.'
         sleep 5
     done
     echo
-    echo "    WARNING: allocation not running after 3m (last status: ${status}) — check the Nomad UI."
+    warn "    WARNING: allocation not running after 3m (last status: ${status}) — check the Nomad UI."
 }
 
 upgrade_nomad_job() {
@@ -81,14 +81,14 @@ upgrade_nomad_job() {
         | select(startswith("nearone/mpc-node-gcp:"))] | unique | join(", ")' <<<"$job")
 
     if [[ -z "$current" ]]; then
-        echo "==> ${job_id}: no nearone/mpc-node-gcp task found, skipping."
+        step "==> ${job_id}: no nearone/mpc-node-gcp task found, skipping."
         return
     fi
     if [[ "$current" == "$image" ]]; then
-        echo "==> ${job_id}: already on ${image}, skipping."
+        step "==> ${job_id}: already on ${image}, skipping."
         return
     fi
-    echo "==> ${job_id}: ${current} -> ${image}"
+    step "==> ${job_id}: ${current} -> ${image}"
 
     updated=$(jq --arg img "$image" '(.TaskGroups[].Tasks[].Config
         | select(.image != null and (.image | startswith("nearone/mpc-node-gcp:")))).image = $img' <<<"$job")
@@ -100,7 +100,7 @@ upgrade_nomad_job() {
     failed=$(jq -r '.FailedTGAllocs // {} | keys | join(", ")' <<<"$plan")
     warnings=$(jq -r '.Warnings // empty' <<<"$plan")
     [[ -z "$failed" ]] || die "Plan reports failed allocations for: ${failed}"
-    [[ -z "$warnings" ]] || echo "    plan warnings: ${warnings}"
+    [[ -z "$warnings" ]] || warn "    plan warnings: ${warnings}"
 
     confirm "    Apply to ${job_id} on ${NOMAD_ADDR}?" || { echo "    skipped."; return; }
     nomad_curl POST "/job/${job_id}" "$(jq -n --argjson job "$updated" '{Job: $job}')" >/dev/null \
@@ -123,7 +123,7 @@ if command -v skopeo >/dev/null 2>&1; then
     skopeo inspect --no-creds --format '{{.Digest}}' "docker://${IMAGE}" >/dev/null \
         || die "${IMAGE} not found on Docker Hub — is the release published?"
 else
-    echo "WARNING: skopeo not found, skipping existence check for ${IMAGE}."
+    warn "WARNING: skopeo not found, skipping existence check for ${IMAGE}."
 fi
 
 JOB_IDS=$(nomad_curl GET "/jobs?prefix=mpc-node" | jq -r '.[].ID') \

scripts/ops/dev-cluster/upgrade-dev-contract.sh

@@ -47,9 +47,9 @@ fetch_wasm() {
 
     if [[ "$source" == release ]]; then
         if [[ -f "$wasm" ]]; then
-            echo "==> Reusing ${wasm}" >&2
+            step "==> Reusing ${wasm}" >&2
         else
-            echo "==> Downloading contract WASM from release ${version}..." >&2
+            step "==> Downloading contract WASM from release ${version}..." >&2
             require_cmds gh tar
             run_cmd gh release download "$version" --repo near/mpc \
                 --pattern "mpc-contract-v${version}.tar.gz" --dir "$dir" --clobber >&2
@@ -60,7 +60,7 @@ fetch_wasm() {
         require_cmds cargo git
         local root built
         root=$(git -C "$SCRIPT_DIR" rev-parse --show-toplevel)
-        echo "==> Building the contract from ${root} (local build — not a released artifact)..." >&2
+        step "==> Building the contract from ${root} (local build — not a released artifact)..." >&2
         ( cd "$root" && run_cmd cargo near build non-reproducible-wasm --features abi \
             --profile=release-contract --manifest-path crates/contract/Cargo.toml --locked >&2 )
         built=$(find "${root}/target/near" -maxdepth 1 -name '*.wasm' -newermt '-10 minutes' \
@@ -94,24 +94,22 @@ WASM_SIZE=$(wc -c < "$WASM")
 } > "$SERIALIZED"
 [[ "$(wc -c < "$SERIALIZED")" -eq $((WASM_SIZE + 6)) ]] \
     || die "serialized.bin has an unexpected length."
-echo "==> ${SERIALIZED} ready ($(wc -c < "$SERIALIZED") bytes)"
+step "==> ${SERIALIZED} ready ($(wc -c < "$SERIALIZED") bytes)"
 
 PROPOSER=${MEMBER_ACCOUNTS%% *}
 PROPOSE_CMD=(near contract call-function as-transaction "$CONTRACT" propose_update
     file-args "$SERIALIZED" prepaid-gas '100.0 Tgas' attached-deposit "$PROPOSE_DEPOSIT"
     sign-as "$PROPOSER" network-config "$NEAR_NET" "$SIGN_WITH" send)
 
-echo
-echo "About to propose the ${VERSION} contract on ${CONTRACT} (${NEAR_NET})"
+step "About to propose the ${VERSION} contract on ${CONTRACT} (${NEAR_NET})"
 echo "  proposer: ${PROPOSER}, deposit ${PROPOSE_DEPOSIT}"
 show_cmd "${PROPOSE_CMD[@]}"
 confirm "Send propose_update?" || { echo "Aborted before proposing."; exit 0; }
 
 "${PROPOSE_CMD[@]}" \
     || die "propose_update failed (an account low on NEAR is the usual cause — top it up)."
 
-echo
-echo "==> Pending proposals:"
+step "==> Pending proposals:"
 run_cmd near contract call-function as-read-only "$CONTRACT" proposed_updates \
     json-args '{}' network-config "$NEAR_NET" now || true
 
@@ -122,7 +120,6 @@ read -rp "UpdateId to vote on: " UPDATE_ID
 
 # The vote that reaches threshold deploys + migrates inline, hence 300 Tgas.
 for account in $MEMBER_ACCOUNTS; do
-    echo
     vote_cmd=(near contract call-function as-transaction "$CONTRACT" vote_update
         json-args "{\"id\": ${UPDATE_ID}}" prepaid-gas '300.0 Tgas' attached-deposit '0 NEAR'
         sign-as "$account" network-config "$NEAR_NET" "$SIGN_WITH" send)
@@ -131,7 +128,6 @@ for account in $MEMBER_ACCOUNTS; do
     "${vote_cmd[@]}" || echo "    vote failed for ${account}."
 done
 
-echo
-echo "==> Contract version (expect ${VERSION} once threshold was reached):"
+step "==> Contract version (expect ${VERSION} once threshold was reached):"
 run_cmd near contract call-function as-read-only "$CONTRACT" version \
     json-args '{}' network-config "$NEAR_NET" now || true