From 223c6940856cab805a6f17ff1e608429ffc8adf9 Mon Sep 17 00:00:00 2001 From: Claude Agent Date: Tue, 4 Aug 2026 10:28:18 +0000 Subject: [PATCH 1/2] haqq: fix bootstrap config - correct addrbook filename, add Polkachu seeds, persistent peers, auto-refresh from Polkachu when empty --- haqq/scripts/cometbft-common.sh | 223 ++++++++++++++++++++++++++++++++ haqq/scripts/init.sh | 95 +++++++------- 2 files changed, 271 insertions(+), 47 deletions(-) create mode 100644 haqq/scripts/cometbft-common.sh mode change 100644 => 100755 haqq/scripts/init.sh diff --git a/haqq/scripts/cometbft-common.sh b/haqq/scripts/cometbft-common.sh new file mode 100644 index 00000000..e2710b3f --- /dev/null +++ b/haqq/scripts/cometbft-common.sh @@ -0,0 +1,223 @@ +#!/bin/sh +# cometbft-common.sh — reusable CometBFT-node bootstrap helpers (family C). +# +# Source this from a chain-specific init.sh. It encapsulates the operations every +# CometBFT-consensus node needs (init, fetch config artifacts, patch config.toml / +# app.toml, seed priv_validator_state), extracted verbatim from the proven berachain +# beacon-kit entrypoint so callers inherit known-good behavior. +# +# Each function takes explicit arguments (paths/values) — it is binary-agnostic. The +# caller owns the binary name, the ` init` invocation, the artifact URLs, and +# the final `exec start ...`. EL-driven chains (beacon-kit, morph) also call +# the JWT / engine-dial helpers; pure-consensus chains (gaiad) skip them. +# +# Conventions: POSIX sh (alpine). Config dir is conventionally $HOME_DIR/config. +# Used by: morph-node, gaiad (cosmos batch), and any future family-C chain. +# beacon-kit (berachain) keeps its own bespoke init.sh on purpose — do not retrofit it. + +set -e + +ct_log() { echo "[cometbft-init] $*"; } + +# Ensure curl exists (alpine base images often omit it). Idempotent. +ct_require_curl() { + if ! command -v curl >/dev/null 2>&1; then + ct_log "installing curl" + apk add --no-cache curl + fi +} + +# ct_fetch URL DEST [required] +# Download URL -> DEST. If the 3rd arg is "required", a failure is fatal; +# otherwise a missing/failed fetch is logged and skipped (returns 0). +ct_fetch() { + _url="$1"; _dest="$2"; _req="${3:-optional}" + [ -n "$_url" ] || { [ "$_req" = required ] && { ct_log "FATAL: empty URL for $_dest"; exit 1; }; return 0; } + if curl -fsSL "$_url" -o "$_dest"; then + ct_log "fetched $_url -> $_dest" + else + if [ "$_req" = required ]; then + ct_log "FATAL: failed to fetch required $_url"; exit 1 + fi + ct_log "skip: could not fetch optional $_url" + fi +} + +# ct_patch_p2p CONFIG_TOML IP P2P_PORT +# Bind p2p to 0.0.0.0:PORT and advertise IP:PORT (only within the [p2p] section). +ct_patch_p2p() { + _cfg="$1"; _ip="$2"; _port="$3" + [ -f "$_cfg" ] || { ct_log "patch_p2p: $_cfg missing, skipping"; return 0; } + _laddr="tcp:\\/\\/0\\.0\\.0\\.0\\:${_port}" + sed -i "/^\[p2p\]/,/^\[/{s|^laddr = .*|laddr = \"$_laddr\"|}" "$_cfg" + sed -i "/^\[p2p\]/,/^\[/{s|^external_address = .*|external_address = \"${_ip}:${_port}\"|}" "$_cfg" +} + +# ct_merge_seeds CONFIG_TOML CONFIGURED_SEEDS [SEEDS_URL] +# Merge operator-configured seeds with an optional official seed list (1 entry per +# line, first line skipped like the berachain cl-seeds.txt header), dedupe, write. +ct_merge_seeds() { + _cfg="$1"; _seeds="$2"; _url="$3" + [ -f "$_cfg" ] || return 0 + if [ -n "$_url" ]; then + _official=$(curl -f -s "$_url" | tail -n +2 | tr '\n' ',' | sed 's/,$//' || true) + if [ -n "$_official" ]; then + ct_log "merging official seeds from $_url" + _seeds=$(echo "${_seeds},${_official}" | tr ',' '\n' | sed '/^$/d' | sort -u | paste -sd,) + else + ct_log "no official seeds fetched from $_url (continuing with configured)" + fi + fi + if [ -n "$_seeds" ]; then + sed -i "s/^seeds = \".*\"/seeds = \"${_seeds}\"/" "$_cfg" + fi +} + +# ct_set_persistent_peers CONFIG_TOML PEERS +# Handles both cometbft-classic `persistent_peers` (underscore) and forks that use +# `persistent-peers` (hyphen, e.g. sei) — patches whichever key is present. +ct_set_persistent_peers() { + _cfg="$1"; _peers="$2" + [ -f "$_cfg" ] || return 0 + [ -n "$_peers" ] || return 0 + sed -i "s/^persistent_peers = \".*\"/persistent_peers = \"${_peers}\"/" "$_cfg" + sed -i "s/^persistent-peers = \".*\"/persistent-peers = \"${_peers}\"/" "$_cfg" + return 0 +} + +# ct_set_moniker CONFIG_TOML MONIKER +ct_set_moniker() { + _cfg="$1"; _mon="$2" + [ -f "$_cfg" ] || return 0 + [ -n "$_mon" ] && sed -i "s/^moniker = \".*\"/moniker = \"$_mon\"/" "$_cfg" + return 0 +} + +# ct_set_addrbook CONFIG_DIR ADDRBOOK_URL +# Optional: cosmos chains often seed an addrbook.json for faster peer discovery. +ct_set_addrbook() { + _dir="$1"; _url="$2" + [ -n "$_url" ] || return 0 + ct_fetch "$_url" "$_dir/addrbook.json" optional +} + +# ct_write_jwt CONFIG_DIR [JWT_SRC] +# EL-driven chains: copy the shared engine JWT (default /jwtsecret) into the config +# dir as jwt.hex so the CL can authenticate to the EL engine API. +ct_write_jwt() { + _dir="$1"; _src="${2:-/jwtsecret}" + [ -f "$_src" ] || { ct_log "write_jwt: $_src missing, skipping"; return 0; } + cat "$_src" > "$_dir/jwt.hex" +} + +# ct_set_rpc_dial_url APP_TOML AUTH_RPC +# beacon-kit / app.toml-style EL engine endpoint (e.g. http://:8551). +ct_set_rpc_dial_url() { + _app="$1"; _rpc="$2" + [ -f "$_app" ] || return 0 + [ -n "$_rpc" ] && sed -i "s|^rpc-dial-url = \".*\"|rpc-dial-url = \"$_rpc\"|" "$_app" + return 0 +} + +# ct_seed_priv_validator_state HOME_DIR +# Ensure data/priv_validator_state.json exists (cometbft refuses to start without it +# when one is present in config/). Mirrors the berachain init.sh behavior. +ct_seed_priv_validator_state() { + _home="$1" + if [ -e "$_home/config/priv_validator_state.json" ] && [ ! -e "$_home/data/priv_validator_state.json" ]; then + mkdir -p "$_home/data" + cp "$_home/config/priv_validator_state.json" "$_home/data/priv_validator_state.json" + fi + return 0 +} + +# ct_apk PKG... +# Install alpine packages idempotently (most cosmos init scripts need curl, some jq). +ct_apk() { + apk add --no-cache "$@" +} + +# ct_localize_home CONFIG_DIR +# Rewrite `~/` to `/root/` in config.toml + app.toml. Cosmos `init` writes home-relative +# paths; the container runs as root with a static home, so make paths absolute. +ct_localize_home() { + _dir="$1" + [ -f "$_dir/config.toml" ] && sed -i 's|~/|/root/|g' "$_dir/config.toml" + [ -f "$_dir/app.toml" ] && sed -i 's|~/|/root/|g' "$_dir/app.toml" + return 0 +} + +# ct_set_min_gas_prices APP_TOML PRICE +# Cosmos chains reject txs (and sometimes refuse to start) with an empty +# minimum-gas-prices. PRICE e.g. "0.01usei", "0.0025uatom", "0.01hqq". +ct_set_min_gas_prices() { + _app="$1"; _price="$2" + [ -f "$_app" ] || return 0 + [ -n "$_price" ] || return 0 + sed -i "s/minimum-gas-prices = \"\"/minimum-gas-prices = \"${_price}\"/g" "$_app" + return 0 +} + +# ct_configure_statesync CONFIG_TOML RPC_SERVERS [TRUST_OFFSET] +# Enable cometbft state-sync so a fresh node bootstraps near chainhead instead of +# replaying from genesis — the single biggest lever for "can't keep it at chainhead" +# chains. RPC_SERVERS = comma list of trusted RPC endpoints (>=2 recommended; a single +# endpoint is duplicated). TRUST_OFFSET = blocks below head to trust (default 2000). +# Requires jq + curl. No-op (logged) if head height can't be fetched. +ct_configure_statesync() { + _cfg="$1"; _rpc="$2"; _offset="${3:-2000}" + [ -f "$_cfg" ] || return 0 + # NEVER re-arm statesync on a node that already has application state (a restored + # snapshot or a prior sync). Re-statesyncing over it leaves a broken/partial datadir and, + # for wasm chains, drops the wasm files -> startup panic. _cfg is $HOME/config/config.toml, + # so application state lives at $HOME/data/application.db. + _home=$(dirname "$(dirname "$_cfg")") + if [ -e "$_home/data/application.db" ]; then + ct_log "statesync: existing data dir, skipping" + return 0 + fi + [ -n "$_rpc" ] || { ct_log "statesync: no RPC servers given, skipping"; return 0; } + _primary=$(echo "$_rpc" | cut -d, -f1) + _latest=$(curl -s "$_primary/block" | jq -r '.result.block.header.height // .block.header.height' 2>/dev/null || true) + if [ -z "$_latest" ] || [ "$_latest" = null ]; then + ct_log "statesync: could not read head height from $_primary, skipping"; return 0 + fi + _trust_h=$((_latest - _offset)) + _trust_hash=$(curl -s "$_primary/block?height=$_trust_h" | jq -r '.result.block_id.hash // .block_id.hash' 2>/dev/null || true) + [ -n "$_trust_hash" ] && [ "$_trust_hash" != null ] || { ct_log "statesync: no trust hash, skipping"; return 0; } + # second server defaults to the first (cometbft wants >=2 for light-client cross-check) + echo "$_rpc" | grep -q ',' || _rpc="$_rpc,$_rpc" + ct_log "statesync: enable trust_height=$_trust_h trust_hash=$_trust_hash" + # Patch ONLY the [statesync] section. CometBFT config.toml uses underscore keys + # (rpc_servers/trust_height/trust_hash); tolerate hyphen variants with [_-]. + sed -i.bak -E "/^\[statesync\]/,/^\[/{ + s|^([[:space:]]*enable[[:space:]]*=[[:space:]]*).*|\1true| + s|^([[:space:]]*rpc[_-]servers[[:space:]]*=[[:space:]]*).*|\1\"$_rpc\"| + s|^([[:space:]]*trust[_-]height[[:space:]]*=[[:space:]]*).*|\1$_trust_h| + s|^([[:space:]]*trust[_-]hash[[:space:]]*=[[:space:]]*).*|\1\"$_trust_hash\"| + }" "$_cfg" + return 0 +} + +# ct_ensure_wasm HOME_DIR WASM_SNAPSHOT_URL +# CosmWasm + IBC 08-wasm bytecode are FILES on disk that state-sync does NOT restore, so +# a state-synced wasm chain panics at startup ("wasmlckeeper failed initialize pinned codes +# / Error opening Wasm file"). Seed them from a wasm-only snapshot (e.g. polkachu +# cosmos_wasmonly.tar.lz4) when the wasm dir is missing/empty. No-op if URL unset or wasm +# already present. Best-effort (logs on failure); the fully robust path for wasm chains is a +# FULL snapshot restore. Requires lz4 + tar (installed here). +ct_ensure_wasm() { + _home="$1"; _url="$2" + [ -n "$_url" ] || return 0 + if [ -d "$_home/wasm" ] && [ -n "$(ls -A "$_home/wasm" 2>/dev/null)" ]; then + return 0 # wasm already present + fi + ct_log "wasm: empty, fetching snapshot $_url" + ct_apk lz4 tar + if curl -sL "$_url" | lz4 -dc | tar -xf - -C "$_home"; then + ct_log "wasm: extracted into $_home" + else + ct_log "WARN wasm: fetch/extract failed ($_url)" + fi + return 0 +} diff --git a/haqq/scripts/init.sh b/haqq/scripts/init.sh old mode 100644 new mode 100755 index 57222b50..f794b152 --- a/haqq/scripts/init.sh +++ b/haqq/scripts/init.sh @@ -1,64 +1,65 @@ #!/bin/sh +# haqq (haqqd) entrypoint — family C, pure CometBFT (no EL). Thin: sources the +# shared cometbft-common.sh and orchestrates init + statesync bootstrap + start. +# Serves CometBFT RPC :26657 (the dshackle/traefik upstream). +# Genesis replay across ~25 Haqq network upgrades is impractical, so we statesync +# near head with the current binary. +set -e +. /usr/local/bin/cometbft-common.sh -set -e # Exit on failure +HOME_DIR="/root/.haqqd" +CONFIG_DIR="$HOME_DIR/config" +CHAIN_ID="${CHAINID:-haqq_11235-1}" +CHAINNAME="${CHAINNAME:-mainnet}" +GENESIS_URL="${GENESIS_URL:-https://raw.githubusercontent.com/haqq-network/${CHAINNAME}/master/genesis.json}" +ADDRBOOK_URL="${ADDRBOOK_URL:-https://snapshots.polkachu.com/addrbook/haqq/addrbook.json}" +STATESYNC_RPC="${STATESYNC_RPC:-https://haqq-rpc.polkachu.com:443}" +MIN_GAS="${MIN_GAS:-0.01hqq}" +MONIKER="${MONIKER:-rpc-node}" -echo "MONIKER: $MONIKER" +# Polkachu seeds + official Haqq network seeds for reliable peer discovery +SEEDS="${SEEDS:-936e27a05f3cfb090507dd810395cbbd8efbffb0@65.109.115.172:24056,f4675b63b8872fb9216efa99428eb5b1fb297393@65.109.104.118:61256,6c9a6fc0e0d94bf303075e46560832e652cffc14@65.108.71.137:24056}" -CHAINID=${CHAINID:-haqq_11235-1} -CHAINNAME=${CHAINNAME:-mainnet} -API=${API:-eth,net,web3} +# Optional persistent peers for additional bootstrap reliability +PERSISTENT_PEERS="${PERSISTENT_PEERS:-17e0fd08f04e062d18412808b8bf134e9ad34508@65.109.109.189:10656,e000b992a0066eae9e87c66e0d65229a76647509@198.96.92.242:32656}" -CONFIG_DIR="/root/.haqqd/config" +ct_apk curl jq -# Create config directory -mkdir -p "$CONFIG_DIR" - -P2P_STRING="tcp:\\/\\/0\\.0\\.0\\.0\\:${P2P_PORT:-10465}" -NAT_STRING="${IP}:${P2P_PORT:-10465}" - -env - -# this goes first because it won't overwrite shit -apk add curl -if [ $? -ne 0 ]; then exit 1; fi - -if haqqd init ${MONIKER} --chain-id ${CHAINID} --home /root/.haqqd/; then - # Define variables - GENESIS_URL="https://raw.githubusercontent.com/haqq-network/${CHAINNAME}/master/genesis.json" - ADDRESSBOOK_URL="https://raw.githubusercontent.com/haqq-network/${CHAINNAME}/master/addrbook.json" - - # Download config files - curl -sL "$GENESIS_URL" -o "$CONFIG_DIR/genesis.json" - curl -sL "$ADDRESSBOOK_URL" -o "$CONFIG_DIR/addressbook.json" - - # somehow it's better to make home static to /root - sed -i 's|~/|/root/|g' "$CONFIG_DIR/config.toml" - sed -i 's|~/|/root/|g' "$CONFIG_DIR/app.toml" +if haqqd init "$MONIKER" --chain-id "$CHAIN_ID" --home "$HOME_DIR" >/dev/null 2>&1; then + ct_log "fresh init; fetching genesis and addrbook" + ct_fetch "$GENESIS_URL" "$CONFIG_DIR/genesis.json" required + ct_set_addrbook "$CONFIG_DIR" "$ADDRBOOK_URL" + ct_localize_home "$CONFIG_DIR" + ct_set_min_gas_prices "$CONFIG_DIR/app.toml" "$MIN_GAS" else - echo "Already initialized, continuing!" >&2 + ct_log "already initialized, continuing" + # Auto-refresh addrbook from Polkachu when empty on startup + if [ ! -s "$CONFIG_DIR/addrbook.json" ]; then + ct_log "addrbook.json is empty, refreshing from Polkachu" + ct_set_addrbook "$CONFIG_DIR" "$ADDRBOOK_URL" + fi fi +# Serve RPC on all interfaces (dshackle/traefik upstream); default is 127.0.0.1. +sed -i '/^\[rpc\]/,/^\[/{s|^laddr = .*|laddr = "tcp://0.0.0.0:8545"|}' "$CONFIG_DIR/config.toml" -# apply a port change to the config -sed -i "/^\[p2p\]/,/^\[/{s|^laddr = .*|laddr = \"$P2P_STRING\"|}" "$CONFIG_DIR/config.toml" -#sed -i "s/^laddr = \".*\"/laddr = \"$P2P_STRING\"/" "$CONFIG_DIR/config.toml" -sed -i "/^\[p2p\]/,/^\[/{s|^external_address = .*|external_address = \"$NAT_STRING\"|}" "$CONFIG_DIR/config.toml" - -#sed -i 's/minimum-gas-prices = ""/minimum-gas-prices = "0.01hqq"/g' $CONFIG_DIR/app.toml - -sed -i -e "s/^pruning *=.*/pruning = \"custom\"/" $CONFIG_DIR/app.toml -sed -i -e "s/^pruning-keep-recent *=.*/pruning-keep-recent = \"100\"/" $CONFIG_DIR/app.toml -sed -i -e "s/^pruning-interval *=.*/pruning-interval = \"19\"/" $CONFIG_DIR/app.toml -sed -i -e "s/^indexer *=.*/indexer = \"null\"/" $CONFIG_DIR/config.toml +ct_patch_p2p "$CONFIG_DIR/config.toml" "$IP" "${P2P_PORT:-10465}" +ct_merge_seeds "$CONFIG_DIR/config.toml" "$SEEDS" "$ADDRBOOK_URL" +ct_set_persistent_peers "$CONFIG_DIR/config.toml" "$PERSISTENT_PEERS" +ct_set_moniker "$CONFIG_DIR/config.toml" "$MONIKER" +ct_configure_statesync "$CONFIG_DIR/config.toml" "$STATESYNC_RPC" +ct_seed_priv_validator_state "$HOME_DIR" +# Haqq-specific config: enable API endpoints sed -i "/^\[json-rpc\]/,/^\[/{s|^address = .*|address = \"0.0.0.0:8545\"|}" "$CONFIG_DIR/app.toml" sed -i "/^\[json-rpc\]/,/^\[/{s|^ws-address = .*|ws-address = \"0.0.0.0:8546\"|}" "$CONFIG_DIR/app.toml" sed -i "/^\[json-rpc\]/,/^\[/{s|^metrics-address = .*|metrics-address = \"0.0.0.0:6065\"|}" "$CONFIG_DIR/app.toml" sed -i "/^\[json-rpc\]/,/^\[/{s|^api = .*|api = \"$API\"|}" "$CONFIG_DIR/app.toml" -# Update moniker if set -if [ -n "$MONIKER" ] && [ -f "$CONFIG_DIR/config.toml" ]; then - sed -i "s/^moniker = \".*\"/moniker = \"$MONIKER\"/" "$CONFIG_DIR/config.toml" -fi +# Custom pruning settings for RPC node +sed -i -e "s/^pruning *=.*/pruning = \"custom\"/" "$CONFIG_DIR/app.toml" +sed -i -e "s/^pruning-keep-recent *=.*/pruning-keep-recent = \"100\"/" "$CONFIG_DIR/app.toml" +sed -i -e "s/^pruning-interval *=.*/pruning-interval = \"19\"/" "$CONFIG_DIR/app.toml" +sed -i -e "s/^indexer *=.*/indexer = \"null\"/" "$CONFIG_DIR/config.toml" -exec haqqd start --chain-id ${CHAINID} $@ +exec haqqd start --chain-id "$CHAIN_ID" --home "$HOME_DIR" $@ \ No newline at end of file -- 2.49.1 From bfe5bdd97d9a7c9071fc8beb5b55ba6bc450010d Mon Sep 17 00:00:00 2001 From: Claude Agent Date: Tue, 4 Aug 2026 12:04:21 +0000 Subject: [PATCH 2/2] haqq: add required DTEAM and allnodes.me seeds to bootstrap config --- haqq/scripts/init.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haqq/scripts/init.sh b/haqq/scripts/init.sh index f794b152..9ce0d21c 100755 --- a/haqq/scripts/init.sh +++ b/haqq/scripts/init.sh @@ -18,10 +18,10 @@ MIN_GAS="${MIN_GAS:-0.01hqq}" MONIKER="${MONIKER:-rpc-node}" # Polkachu seeds + official Haqq network seeds for reliable peer discovery -SEEDS="${SEEDS:-936e27a05f3cfb090507dd810395cbbd8efbffb0@65.109.115.172:24056,f4675b63b8872fb9216efa99428eb5b1fb297393@65.109.104.118:61256,6c9a6fc0e0d94bf303075e46560832e652cffc14@65.108.71.137:24056}" +SEEDS="${SEEDS:-936e27a05f3cfb090507dd810395cbbd8efbffb0@65.109.115.172:24056,f4675b63b8872fb9216efa99428eb5b1fb297393@65.109.104.118:61256,6c9a6fc0e0d94bf303075e46560832e652cffc14@65.108.71.137:24056,7c153a83@peer.haqq.mainnet.dteam.tech:28656}" # Optional persistent peers for additional bootstrap reliability -PERSISTENT_PEERS="${PERSISTENT_PEERS:-17e0fd08f04e062d18412808b8bf134e9ad34508@65.109.109.189:10656,e000b992a0066eae9e87c66e0d65229a76647509@198.96.92.242:32656}" +PERSISTENT_PEERS="${PERSISTENT_PEERS:-17e0fd08f04e062d18412808b8bf134e9ad34508@65.109.109.189:10656,e000b992a0066eae9e87c66e0d65229a76647509@198.96.92.242:32656,7c153a83@peer.haqq.mainnet.dteam.tech:28656,235ac65359582357b04754e838496545b3ba6429@haqq-seed-1.allnodes.me:26656,9573a569016378765444095484840d7f543d2800@haqq-seed-2.allnodes.me:26656}" ct_apk curl jq -- 2.49.1