Sync workspace: config, docs, scripts, CI, operator rules, and submodule pointers.
- Update dbis_core, cross-chain-pmm-lps, explorer-monorepo, metamask-integration, pr-workspace/chains - Omit embedded publish git dirs and empty placeholders from index Made-with: Cursor
This commit is contained in:
@@ -23,14 +23,14 @@ STATIC_FILE="${PROJECT_ROOT}/config/besu-node-lists/static-nodes.json"
|
||||
PERM_FILE="${PROJECT_ROOT}/config/besu-node-lists/permissions-nodes.toml"
|
||||
SSH_OPTS="-o ConnectTimeout=8 -o StrictHostKeyChecking=accept-new"
|
||||
|
||||
# All 32 Besu VMIDs in stable order (validators, sentries, RPCs)
|
||||
BESU_VMIDS=(1000 1001 1002 1003 1004 1500 1501 1502 1503 1504 1505 1506 1507 1508 2101 2102 2201 2301 2303 2304 2305 2306 2400 2401 2402 2403 2500 2501 2502 2503 2504 2505)
|
||||
# All Besu VMIDs in stable order (validators, sentries, RPCs)
|
||||
BESU_VMIDS=(1000 1001 1002 1003 1004 1500 1501 1502 1503 1504 1505 1506 1507 1508 2101 2102 2103 2201 2301 2303 2304 2305 2306 2400 2401 2402 2403 2500 2501 2502 2503 2504 2505)
|
||||
|
||||
# VMID -> Proxmox host
|
||||
declare -A HOST_BY_VMID
|
||||
for v in 1000 1001 1002 1500 1501 1502 2101 2500 2501 2502 2503 2504 2505; do HOST_BY_VMID[$v]="${PROXMOX_R630_01:-192.168.11.11}"; done
|
||||
for v in 2201 2303 2401; do HOST_BY_VMID[$v]="${PROXMOX_R630_02:-192.168.11.12}"; done
|
||||
for v in 1003 1004 1503 1504 1505 1506 1507 1508 2102 2301 2304 2305 2306 2400 2402 2403; do HOST_BY_VMID[$v]="${PROXMOX_ML110:-192.168.11.10}"; done
|
||||
for v in 1000 1001 1002 1500 1501 1502 2101 2103 2500 2501 2502 2503 2504 2505; do HOST_BY_VMID[$v]="${PROXMOX_R630_01:-192.168.11.11}"; done
|
||||
for v in 2201 2303 2305 2306 2307 2308 2401; do HOST_BY_VMID[$v]="${PROXMOX_R630_02:-192.168.11.12}"; done
|
||||
for v in 1003 1004 1503 1504 1505 1506 1507 1508 2102 2301 2304 2400 2402 2403; do HOST_BY_VMID[$v]="${PROXMOX_R630_03:-192.168.11.13}"; done
|
||||
|
||||
# VMID -> canonical IP (all 32)
|
||||
declare -A IP_BY_VMID
|
||||
@@ -50,6 +50,7 @@ IP_BY_VMID[1507]=192.168.11.244
|
||||
IP_BY_VMID[1508]=192.168.11.245
|
||||
IP_BY_VMID[2101]=192.168.11.211
|
||||
IP_BY_VMID[2102]=192.168.11.212
|
||||
IP_BY_VMID[2103]=192.168.11.217
|
||||
IP_BY_VMID[2201]=192.168.11.221
|
||||
IP_BY_VMID[2301]=192.168.11.232
|
||||
IP_BY_VMID[2303]=192.168.11.233
|
||||
@@ -132,7 +133,7 @@ if $MISSING_ONLY; then
|
||||
[[ ${#VMIDS_TO_TRY[@]} -eq 0 ]] && echo "All 32 IPs already present. Nothing to collect." && exit 0
|
||||
else
|
||||
VMIDS_TO_TRY=( "${BESU_VMIDS[@]}" )
|
||||
echo "Collecting enodes from 32 Besu nodes..."
|
||||
echo "Collecting enodes from ${#BESU_VMIDS[@]} Besu nodes..."
|
||||
fi
|
||||
|
||||
declare -A COLLECTED_BY_VMID
|
||||
@@ -188,10 +189,10 @@ for vmid in "${BESU_VMIDS[@]}"; do
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Merged total: ${#FINAL_ENODES[@]} unique enodes (target 32)."
|
||||
echo "Merged total: ${#FINAL_ENODES[@]} unique enodes (target ${#BESU_VMIDS[@]})."
|
||||
|
||||
if [[ ${#FINAL_ENODES[@]} -lt 32 && ${#MISSING_VMIDS[@]} -gt 0 ]]; then
|
||||
echo "WARNING: ${#FINAL_ENODES[@]}/32. Missing VMIDs: ${MISSING_VMIDS[*]}. Re-run when those nodes are up or add enodes manually." >&2
|
||||
if [[ ${#FINAL_ENODES[@]} -lt ${#BESU_VMIDS[@]} && ${#MISSING_VMIDS[@]} -gt 0 ]]; then
|
||||
echo "WARNING: ${#FINAL_ENODES[@]}/${#BESU_VMIDS[@]}. Missing VMIDs: ${MISSING_VMIDS[*]}. Re-run when those nodes are up or add enodes manually." >&2
|
||||
fi
|
||||
|
||||
if [[ ${#FINAL_ENODES[@]} -eq 0 ]]; then
|
||||
|
||||
@@ -20,8 +20,8 @@ done
|
||||
# Same host/VMID as deploy-besu-node-lists-to-all.sh
|
||||
declare -A HOST_BY_VMID
|
||||
for v in 1000 1001 1002 1500 1501 1502 2101 2500 2501 2502 2503 2504 2505; do HOST_BY_VMID[$v]="${PROXMOX_R630_01:-${PROXMOX_HOST_R630_01:-192.168.11.11}}"; done
|
||||
for v in 2201 2303 2401; do HOST_BY_VMID[$v]="${PROXMOX_R630_02:-${PROXMOX_HOST_R630_02:-192.168.11.12}}"; done
|
||||
for v in 1003 1004 1503 1504 1505 1506 1507 1508 2102 2301 2304 2305 2306 2307 2308 2400 2402 2403; do HOST_BY_VMID[$v]="${PROXMOX_ML110:-${PROXMOX_HOST_ML110:-192.168.11.10}}"; done
|
||||
for v in 2201 2303 2305 2306 2307 2308 2401; do HOST_BY_VMID[$v]="${PROXMOX_R630_02:-${PROXMOX_HOST_R630_02:-192.168.11.12}}"; done
|
||||
for v in 1003 1004 1503 1504 1505 1506 1507 1508 2102 2301 2304 2400 2402 2403; do HOST_BY_VMID[$v]="${PROXMOX_R630_03:-${PROXMOX_HOST_R630_03:-192.168.11.13}}"; done
|
||||
|
||||
BESU_VMIDS=(1000 1001 1002 1003 1004 1500 1501 1502 1503 1504 1505 1506 1507 1508 2101 2102 2201 2301 2303 2304 2305 2306 2307 2308 2400 2401 2402 2403 2500 2501 2502 2503 2504 2505)
|
||||
STATIC="${PROJECT_ROOT}/config/besu-node-lists/static-nodes.json"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# Install Besu permanently on nodes that don't have /opt/besu/bin/besu (1505-1508, 2501-2505).
|
||||
# Install Besu permanently on nodes that don't have /opt/besu/bin/besu (1505-1508, 2420-2480).
|
||||
# Uses install-besu-in-ct-standalone.sh inside each CT; deploys config, genesis, node lists; enables and starts service.
|
||||
#
|
||||
# Usage: bash scripts/besu/install-besu-permanent-on-missing-nodes.sh [--dry-run]
|
||||
@@ -19,23 +19,23 @@ GENESIS_SRC="${PROJECT_ROOT}/smom-dbis-138-proxmox/config/genesis.json"
|
||||
STATIC_SRC="${PROJECT_ROOT}/config/besu-node-lists/static-nodes.json"
|
||||
PERMS_SRC="${PROJECT_ROOT}/config/besu-node-lists/permissions-nodes.toml"
|
||||
|
||||
# VMIDs that may lack Besu (sentries 1505-1508 on ml110; RPC 2500-2505 on r630-01)
|
||||
# VMIDs that may lack Besu (sentries 1505-1508 on ml110; edge RPC 2420-2480 on r630-01)
|
||||
SENTRY_VMIDS=(1505 1506 1507 1508)
|
||||
RPC_VMIDS=(2500 2501 2502 2503 2504 2505)
|
||||
RPC_VMIDS=(2420 2430 2440 2460 2470 2480)
|
||||
declare -A HOST_BY_VMID
|
||||
for v in 1505 1506 1507 1508; do HOST_BY_VMID[$v]="${PROXMOX_ML110:-192.168.11.10}"; done
|
||||
for v in 2500 2501 2502 2503 2504 2505; do HOST_BY_VMID[$v]="${PROXMOX_R630_01:-192.168.11.11}"; done
|
||||
for v in 2420 2430 2440 2460 2470 2480; do HOST_BY_VMID[$v]="${PROXMOX_R630_01:-192.168.11.11}"; done
|
||||
declare -A IP_BY_VMID
|
||||
IP_BY_VMID[1505]=192.168.11.213
|
||||
IP_BY_VMID[1506]=192.168.11.214
|
||||
IP_BY_VMID[1507]=192.168.11.244
|
||||
IP_BY_VMID[1508]=192.168.11.245
|
||||
IP_BY_VMID[2500]=192.168.11.172
|
||||
IP_BY_VMID[2501]=192.168.11.173
|
||||
IP_BY_VMID[2502]=192.168.11.174
|
||||
IP_BY_VMID[2503]=192.168.11.246
|
||||
IP_BY_VMID[2504]=192.168.11.247
|
||||
IP_BY_VMID[2505]=192.168.11.248
|
||||
IP_BY_VMID[2420]=192.168.11.172
|
||||
IP_BY_VMID[2430]=192.168.11.173
|
||||
IP_BY_VMID[2440]=192.168.11.174
|
||||
IP_BY_VMID[2460]=192.168.11.246
|
||||
IP_BY_VMID[2470]=192.168.11.247
|
||||
IP_BY_VMID[2480]=192.168.11.248
|
||||
|
||||
[[ ! -f "$GENESIS_SRC" ]] && { echo "ERROR: $GENESIS_SRC not found"; exit 1; }
|
||||
[[ ! -f "$STATIC_SRC" ]] && { echo "ERROR: $STATIC_SRC not found"; exit 1; }
|
||||
@@ -71,7 +71,7 @@ install_rpc() {
|
||||
ssh $SSH_OPTS "root@$host" "pct exec $vmid -- rm -rf /opt/besu 2>/dev/null; true"
|
||||
scp -q $SSH_OPTS "${PROJECT_ROOT}/scripts/install-besu-in-ct-standalone.sh" "root@${host}:/tmp/"
|
||||
ssh $SSH_OPTS "root@$host" "pct push $vmid /tmp/install-besu-in-ct-standalone.sh /tmp/install-besu-in-ct-standalone.sh && pct exec $vmid -- env NODE_TYPE=rpc BESU_VERSION=$BESU_VERSION bash /tmp/install-besu-in-ct-standalone.sh" || { echo " install failed"; return 1; }
|
||||
# 2500-style: besu.service + config.toml (not besu-rpc.service). Use inline template so we don't depend on 2500 having Besu.
|
||||
# Edge-RPC style: besu.service + config.toml (not besu-rpc.service).
|
||||
cat << 'BESUSVC' > /tmp/besu.service
|
||||
[Unit]
|
||||
Description=Hyperledger Besu
|
||||
@@ -134,7 +134,7 @@ EOF
|
||||
ssh $SSH_OPTS "root@$host" "pct exec $vmid -- systemctl disable besu-rpc.service 2>/dev/null; pct exec $vmid -- systemctl daemon-reload; pct exec $vmid -- systemctl enable besu.service && pct exec $vmid -- systemctl start besu.service" && echo " besu.service enabled and started" || echo " start failed"
|
||||
}
|
||||
|
||||
echo "Installing Besu permanently on nodes missing /opt/besu/bin/besu (1505-1508, 2500-2505)"
|
||||
echo "Installing Besu permanently on nodes missing /opt/besu/bin/besu (1505-1508, 2420-2480)"
|
||||
echo ""
|
||||
|
||||
for vmid in "${SENTRY_VMIDS[@]}"; do
|
||||
@@ -160,4 +160,4 @@ done
|
||||
echo ""
|
||||
echo "Done. Verify: bash scripts/besu/restart-besu-reload-node-lists.sh (optional); then check block production on RPCs."
|
||||
rm -f /tmp/config-sentry.toml /tmp/besu.service /tmp/config.toml 2>/dev/null || true
|
||||
for v in 2500 2501 2502 2503 2504 2505; do rm -f /tmp/config-rpc-${v}.toml 2>/dev/null; done
|
||||
for v in 2420 2430 2440 2460 2470 2480; do rm -f /tmp/config-rpc-${v}.toml 2>/dev/null; done
|
||||
|
||||
@@ -18,11 +18,11 @@ DRY_RUN=false
|
||||
|
||||
# Same VMID -> host as deploy-besu-node-lists-to-all.sh
|
||||
declare -A HOST_BY_VMID
|
||||
for v in 1000 1001 1002 1500 1501 1502 2101; do HOST_BY_VMID[$v]="${PROXMOX_R630_01:-${PROXMOX_HOST_R630_01:-192.168.11.11}}"; done
|
||||
for v in 2201 2303 2401; do HOST_BY_VMID[$v]="${PROXMOX_R630_02:-${PROXMOX_HOST_R630_02:-192.168.11.12}}"; done
|
||||
for v in 1003 1004 1503 1504 1505 1506 1507 1508 2102 2301 2304 2305 2306 2307 2308 2400 2402 2403; do HOST_BY_VMID[$v]="${PROXMOX_ML110:-${PROXMOX_HOST_ML110:-192.168.11.10}}"; done
|
||||
for v in 1000 1001 1002 1500 1501 1502 2101 2103; do HOST_BY_VMID[$v]="${PROXMOX_R630_01:-${PROXMOX_HOST_R630_01:-192.168.11.11}}"; done
|
||||
for v in 2201 2303 2305 2306 2307 2308 2401; do HOST_BY_VMID[$v]="${PROXMOX_R630_02:-${PROXMOX_HOST_R630_02:-192.168.11.12}}"; done
|
||||
for v in 1003 1004 1503 1504 1505 1506 1507 1508 1509 1510 2102 2301 2304 2400 2402 2403; do HOST_BY_VMID[$v]="${PROXMOX_R630_03:-${PROXMOX_HOST_R630_03:-192.168.11.13}}"; done
|
||||
|
||||
BESU_VMIDS=(1000 1001 1002 1003 1004 1500 1501 1502 1503 1504 1505 1506 1507 1508 2101 2102 2201 2301 2303 2304 2305 2306 2307 2308 2400 2401 2402 2403)
|
||||
BESU_VMIDS=(1000 1001 1002 1003 1004 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 2101 2102 2103 2201 2301 2303 2304 2305 2306 2307 2308 2400 2401 2402 2403)
|
||||
|
||||
echo "Restarting Besu on all nodes (to reload static-nodes.json and permissions-nodes.toml)"
|
||||
if $DRY_RUN; then echo " [dry-run]"; fi
|
||||
|
||||
Reference in New Issue
Block a user