diff --git a/.env b/.env deleted file mode 100644 index ebf2b0d7..00000000 --- a/.env +++ /dev/null @@ -1,18 +0,0 @@ -BSC_CLUSTER_SIZE=4 # 3f+1 -CHAIN_ID=714 -KEYPASS="0123456789" -INIT_HOLDER="0x04d63aBCd2b9b1baa327f2Dda0f873F197ccd186" -# INIT_HOLDER_PRV="59ba8068eb256d520179e903f43dacf6d8d57d72bd306e1bd603fdb8c8da10e8" -RPC_URL="http://127.0.0.1:8545" -GENESIS_COMMIT="34618f607f8356cf147dde6a69fae150bd53d5bf" # fermi commit -PASSED_FORK_DELAY=40 -LAST_FORK_MORE_DELAY=10 -FullImmutabilityThreshold=2048 -MinBlocksForBlobRequests=576 -DefaultExtraReserveForBlobRequests=32 -BreatheBlockInterval=1200 -useLatestBscClient=false -EnableSentryNode=false -EnableFullNode=false -RegisterNodeID=false -EnableEVNWhitelist=false diff --git a/.env.example b/.env.example new file mode 100644 index 00000000..cc10845e --- /dev/null +++ b/.env.example @@ -0,0 +1,29 @@ +BSC_CLUSTER_SIZE=10 +CHAIN_ID=714 +KEYPASS="0123456789" +INIT_HOLDER="0x04d63aBCd2b9b1baa327f2Dda0f873F197ccd186" +# INIT_HOLDER_PRV="" +RPC_URL="http://127.0.0.1:8545" +GENESIS_COMMIT="" +PASSED_FORK_DELAY=40 +LAST_FORK_MORE_DELAY=10 +FullImmutabilityThreshold=2048 +MinBlocksForBlobRequests=576 +DefaultExtraReserveForBlobRequests=32 +BreatheBlockInterval=1200 +useLatestBscClient=true +EnableSentryNode=false +EnableFullNode=false +RegisterNodeID=false +EnableEVNWhitelist=false +RETH_BSC_BINARY_PATH="/path/to/reth-bsc/target/debug/reth-bsc" +# Jemalloc heap profiling for reth-bsc nodes. Leave unset to disable. +# Requires binary built with: --features jemalloc-prof +# tikv-jemallocator uses prefix _rjem_, so the env var is _RJEM_MALLOC_CONF (set automatically from this). +# lg_prof_interval:30 → dump every 2^30 bytes (~1 GB) allocated +# prof_final:true → dump once on exit +# Example: RETH_JEMALLOC_PROF="prof:true,prof_active:true,lg_prof_sample:19,lg_prof_interval:30,prof_final:true,prof_prefix:/tmp/reth-heap." +# RETH_JEMALLOC_PROF="" +RETH_NODE_COUNT=5 +EnableMetrics=false +BSC_SUBMIT_BUILT_PAYLOAD=true diff --git a/.gitignore b/.gitignore index ab57b06f..8a8bb955 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ .idea/ lib/ +.venv/ +.env +voteJournal/votes.jsonl diff --git a/README.md b/README.md index cf348fcc..1f3563d1 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ git clone https://github.com/bnb-chain/node-deploy.git 2. For the first time, please execute the following command ```bash +python3 -m venv .venv +source .venv/bin/activate pip3 install -r requirements.txt ``` @@ -32,15 +34,49 @@ go build ``` 4. Configure the cluster + +Copy the example env file and edit it to match your setup: +```bash +cp .env.example .env ``` - You can configure the cluster by modifying the following files: + +You can configure the cluster by modifying the following files: + - `.env` - `config.toml` - `genesis/genesis-template.json` - `genesis/scripts/init_holders.template` - - `.env` + +**Reth-BSC Configuration:** +To use reth-bsc nodes instead of geth nodes for some validators, configure the following in `.env`: +```bash +# Path to the reth-bsc binary +RETH_BSC_BINARY_PATH="/path/to/reth-bsc/target/debug/reth-bsc" + +# Number of nodes to run with reth-bsc (starting from node0) +# For example: RETH_NODE_COUNT=2 will run node0 and node1 with reth-bsc, others with geth +RETH_NODE_COUNT=1 +``` + +Reth-BSC nodes are launched with BLS vote key CLI flags by default: +- `--bls.keystore-path` and `--bls.keystore-password` are auto-detected from each node’s `bls/keystore` and `${KEYPASS}`. +- To override, set either of the following envs before start (the script will pass them as CLI, which takes precedence over env inside reth): + - `BSC_BLS_PRIVATE_KEY` (dev only) → passes `--bls.private-key` + - `BSC_BLS_KEYSTORE_PATH` and `BSC_BLS_KEYSTORE_PASSWORD` → passes `--bls.keystore-path` and `--bls.keystore-password` + + +5. Prepare the `bin/` directory for the geth binary. + +If `useLatestBscClient=true` in `.env` (the default), the `reset` command builds geth from source and moves it into `bin/`. The `bin/` directory must exist first or the move will fail: +```bash +mkdir -p bin ``` -5. Setup all nodes. +If you already have a pre-built geth binary (e.g. from a previous build at `bsc/build/bin/geth`), you can copy it directly instead of waiting for a full rebuild: +```bash +mkdir -p bin && cp bsc/build/bin/geth bin/geth +``` + +6. Setup all nodes. two different ways, choose as you like. ```bash bash -x ./bsc_cluster.sh reset # will reset the cluster and start @@ -50,7 +86,7 @@ bash -x ./bsc_cluster.sh start [vidx] # only start the cluster bash -x ./bsc_cluster.sh restart [vidx] # start the cluster after stopping it ``` -6. Setup a full node. +7. Setup a full node. If you want to run a full node to test snap/full syncing, you can run: > Attention: it relies on the validator cluster, so you should set up validators by `bsc_cluster.sh` firstly. @@ -76,6 +112,112 @@ You can see the logs in `.local/fullnode`. Generally, you need to wait for the validator to produce a certain amount of blocks before starting the full/snap syncing test, such as 1000 blocks. +## Prometheus metrics + +reth-bsc nodes expose Prometheus metrics automatically when running via `bsc_cluster.sh`. + +**Ports:** +- reth-bsc nodes: `9001 + nodeIndex * 2` (node0=9001, node1=9003, node2=9005, …) +- geth nodes: `6060 + nodeIndex * 2` (node0=6060, node1=6062, node2=6064, …) + +A `prometheus.yml` is included that scrapes all nodes. Run Prometheus with Docker: + +```bash +cd /path/to/node-deploy +docker run -d \ + --name prometheus \ + -p 9090:9090 \ + -v $(pwd)/prometheus.yml:/etc/prometheus/prometheus.yml \ + prom/prometheus +``` + +Then open [http://localhost:9090/graph](http://localhost:9090/graph). + +> **macOS note:** `--network host` does not work on macOS. The `prometheus.yml` uses +> `host.docker.internal` to reach node metrics running on your Mac. + +To also spin up Grafana alongside it: + +```bash +docker run -d \ + --name grafana \ + -p 3000:3000 \ + -e GF_SECURITY_ADMIN_PASSWORD=admin \ + grafana/grafana +``` + +Grafana will be available at [http://localhost:3000](http://localhost:3000) (admin/admin). Add Prometheus as a datasource using `http://host.docker.internal:9090`. + +> If you change `BSC_CLUSTER_SIZE` in `.env`, add or remove the corresponding target ports in `prometheus.yml`. + +## Heap profiling for reth-bsc nodes + +reth-bsc nodes can be profiled using jemalloc's built-in heap profiler. + +> **Note:** Before building with profiling support, the `reth-bsc` repo requires two small +> pending changes that have not yet been pushed upstream. See +> [reth-bsc-pending-changes.md](reth-bsc-pending-changes.md) for the exact edits needed. + +### 1. Build reth-bsc with profiling support + +```bash +cd /path/to/reth-bsc +cargo build --bin reth-bsc --profile profiling --features jemalloc-prof,asm-keccak +``` + +### 2. Configure node-deploy + +In `.env`, point to the profiling binary and set `RETH_JEMALLOC_PROF`: + +```bash +RETH_BSC_BINARY_PATH="/path/to/reth-bsc/target/profiling/reth-bsc" + +# lg_prof_interval:30 dumps every ~1 GB allocated; prof_final:true dumps on exit +RETH_JEMALLOC_PROF="prof:true,prof_active:true,lg_prof_sample:19,lg_prof_interval:30,prof_final:true,prof_prefix:/tmp/reth-heap." +``` + +Leave `RETH_JEMALLOC_PROF` unset to run without profiling overhead. + +> **Note:** tikv-jemallocator uses the `_rjem_` symbol prefix, so the script passes +> `_RJEM_MALLOC_CONF` to the process (not `MALLOC_CONF`). Setting `MALLOC_CONF` +> directly will have no effect. + +### 3. Start the cluster + +```bash +bash -x ./bsc_cluster.sh reset +``` + +Heap dumps are written to the path specified by `prof_prefix`, e.g. `/tmp/reth-heap...heap`. + +### 4. Read the heap dumps + +`jeprof` is compiled as part of the reth-bsc build: + +```bash +export JEPROF=/path/to/reth-bsc/target/profiling/build/tikv-jemalloc-sys-*/out/build/bin/jeprof +export BINARY=/path/to/reth-bsc/target/profiling/reth-bsc +chmod +x $JEPROF +``` + +Generate a flamegraph SVG (requires `brew install graphviz`): + +```bash +$JEPROF --svg $BINARY /tmp/reth-heap...heap > heap.svg && open heap.svg +``` + +Compare two dumps to see allocation growth between them: + +```bash +$JEPROF --svg --base=/tmp/reth-heap..1.heap $BINARY /tmp/reth-heap..2.heap > diff.svg && open diff.svg +``` + +Top allocations as text: + +```bash +$JEPROF --text $BINARY /tmp/reth-heap...heap +``` + ## Background transactions ```bash ## normal tx @@ -87,4 +229,4 @@ go build cd txblob go build ./txblob -``` \ No newline at end of file +``` diff --git a/bin/.gitkeep b/bin/.gitkeep deleted file mode 100644 index 5428a97c..00000000 --- a/bin/.gitkeep +++ /dev/null @@ -1,3 +0,0 @@ -# Ignore everything in this directory -* -# Except geth \ No newline at end of file diff --git a/bsc b/bsc new file mode 160000 index 00000000..ce498e9d --- /dev/null +++ b/bsc @@ -0,0 +1 @@ +Subproject commit ce498e9d873b691a76f4e42d1a93b94880017efb diff --git a/bsc_cluster.sh b/bsc_cluster.sh index cac9142b..94ead14a 100644 --- a/bsc_cluster.sh +++ b/bsc_cluster.sh @@ -16,10 +16,73 @@ gcmode="full" sleepBeforeStart=15 sleepAfterStart=10 -# stop geth client +# Validation function for reth-bsc configuration +function validate_reth_config() { + # Check if RETH_NODE_COUNT is set and valid + if [ -z "$RETH_NODE_COUNT" ]; then + RETH_NODE_COUNT=0 + echo "RETH_NODE_COUNT not set, defaulting to 0 (all geth nodes)" + return 0 + fi + + # Check if RETH_NODE_COUNT is not greater than total cluster size + if [ $RETH_NODE_COUNT -gt $size ]; then + echo "ERROR: RETH_NODE_COUNT ($RETH_NODE_COUNT) cannot be greater than BSC_CLUSTER_SIZE ($size)" + echo "Please adjust RETH_NODE_COUNT in .env file to be <= $size" + exit 1 + fi + + # Check if RETH_NODE_COUNT is negative + if [ $RETH_NODE_COUNT -lt 0 ]; then + echo "ERROR: RETH_NODE_COUNT ($RETH_NODE_COUNT) cannot be negative" + echo "Please set RETH_NODE_COUNT to a value between 0 and $size in .env file" + exit 1 + fi + + # If RETH_NODE_COUNT > 0, check if reth-bsc binary exists and is executable + if [ $RETH_NODE_COUNT -gt 0 ]; then + if [ -z "$RETH_BSC_BINARY_PATH" ]; then + echo "ERROR: RETH_BSC_BINARY_PATH is not set in .env file" + echo "Please set RETH_BSC_BINARY_PATH to the path of your reth-bsc binary" + exit 1 + fi + + if [ ! -f "$RETH_BSC_BINARY_PATH" ]; then + echo "ERROR: reth-bsc binary not found at: $RETH_BSC_BINARY_PATH" + echo "Please check the RETH_BSC_BINARY_PATH in .env file and ensure the binary exists" + exit 1 + fi + + if [ ! -x "$RETH_BSC_BINARY_PATH" ]; then + echo "ERROR: reth-bsc binary is not executable: $RETH_BSC_BINARY_PATH" + echo "Please make the binary executable with: chmod +x $RETH_BSC_BINARY_PATH" + exit 1 + fi + + echo "✓ Validated: Will run $RETH_NODE_COUNT reth-bsc nodes (node0-node$((RETH_NODE_COUNT-1))) and $((size-RETH_NODE_COUNT)) geth nodes" + else + echo "✓ Validated: Will run all $size nodes with geth (no reth-bsc nodes)" + fi +} + +# stop geth client and reth-bsc function exit_previous() { ValIdx=$1 - ps -ef | grep geth$ValIdx | grep config |awk '{print $2}' | xargs kill + if [ ! -z $ValIdx ]; then + if [ $ValIdx -lt $RETH_NODE_COUNT ]; then + # Stop reth-bsc for reth nodes (first RETH_NODE_COUNT nodes) + ps -ef | grep reth-bsc | grep -v grep | awk '{print $2}' | xargs -r kill + else + # Stop geth for other nodes + ps -ef | grep geth$ValIdx | grep config |awk '{print $2}' | xargs -r kill + fi + else + # Stop all nodes + ps -ef | grep reth-bsc | grep -v grep | awk '{print $2}' | xargs -r kill + for ((i = 0; i < size; i++)); do + ps -ef | grep geth$i | grep config |awk '{print $2}' | xargs -r kill + done + fi sleep ${sleepBeforeStart} } @@ -169,6 +232,10 @@ function initNetwork() { initLog=${workspace}/.local/node${i}/init.log if [ $i -eq 0 ] ; then ${workspace}/bin/geth --datadir ${workspace}/.local/node${i} init --state.scheme ${stateScheme} --db.engine ${dbEngine} ${workspace}/genesis/genesis.json > "${initLog}" 2>&1 + elif [ $i -lt $RETH_NODE_COUNT ] ; then + # Skip geth init for reth-bsc nodes, just copy genesis and create a dummy init log + cp ${workspace}/genesis/genesis.json ${workspace}/.local/node${i}/genesis.json + echo "reth-bsc init: genesis.json copied for reth-bsc node${i}" > "${initLog}" 2>&1 else ${workspace}/bin/geth --datadir ${workspace}/.local/node${i} init --state.scheme path --db.engine pebble ${workspace}/genesis/genesis.json > "${initLog}" 2>&1 fi @@ -190,6 +257,171 @@ function initNetwork() { fi } +function start_reth_bsc() { + local nodeIndex=$1 + local HTTPPort=$2 + local WSPort=$3 + local PassedForkTime=$4 + local LastHardforkTime=$5 + local rialtoHash=$6 + + # Copy and modify genesis.json for reth-bsc with correct fork timing + cp ${workspace}/genesis/genesis.json ${workspace}/.local/node${nodeIndex}/genesis.json + + # Modify fork times in genesis.json for reth-bsc: all forks at PassedForkTime except fermi at LastHardforkTime + jq --arg passedTime "$PassedForkTime" --arg lastTime "$LastHardforkTime" ' + .config.shanghaiTime = ($passedTime | tonumber) | + .config.keplerTime = ($passedTime | tonumber) | + .config.feynmanTime = ($passedTime | tonumber) | + .config.feynmanFixTime = ($passedTime | tonumber) | + .config.cancunTime = ($passedTime | tonumber) | + .config.haberTime = ($passedTime | tonumber) | + .config.haberFixTime = ($passedTime | tonumber) | + .config.lorentzTime = ($passedTime | tonumber) | + .config.bohrTime = ($passedTime | tonumber) | + .config.tychoTime = ($passedTime | tonumber) | + .config.pragueTime = ($passedTime | tonumber) | + .config.pascalTime = ($passedTime | tonumber) | + .config.maxwellTime = ($passedTime | tonumber) | + .config.fermiTime = ($lastTime | tonumber) | + .config.osakaTime = ($lastTime | tonumber) | + .config.mendelTime = ($lastTime | tonumber) + ' ${workspace}/.local/node${nodeIndex}/genesis.json > ${workspace}/.local/node${nodeIndex}/genesis_reth.json + + if [ ${EnableSentryNode} = true ]; then + cp ${workspace}/.local/node${nodeIndex}/genesis_reth.json ${workspace}/.local/sentry${nodeIndex}/genesis_reth.json + fi + + # Get the first bootnode enode from BootstrapNodes configuration + # Extract the complete first bootnode entry (including the full enode:// URL) + bootnode_enode=$(grep -E "BootstrapNodes" ${workspace}/.local/node${nodeIndex}/config.toml | grep -o '\[".*"\]' | sed 's/\["//;s/"\]//;s/", "/,/g') + staic_enode=$(grep -E "StaticNodes" ${workspace}/.local/node${nodeIndex}/config.toml | grep -o '\[".*"\]' | sed 's/\["//;s/"\]//;s/", "/,/g') + + # Extract discovery port from the current node's config.toml ListenAddr + discovery_port=$(grep "ListenAddr" ${workspace}/.local/node${nodeIndex}/config.toml | sed 's/.*:\([0-9]*\).*/\1/') + auth_port=$((8551+nodeIndex)) + + # Detect keystore path dynamically + keystore_path=$(find ${workspace}/.local/node${nodeIndex}/keystore -name "UTC--*" -type f | head -1) + nodekey_path=$(find ${workspace}/.local/node${nodeIndex}/geth/nodekey -type f | head -1) + peer_conf=() + if [ -n "${bootnode_enode}" ]; then + peer_conf+=(--bootnodes ${bootnode_enode}) + fi + if [ -n "${staic_enode}" ]; then + peer_conf+=(--trusted-peers ${staic_enode}) + fi + + # Determine BLS signer CLI args (prefer CLI over env) + # Priority: + # 1) BSC_BLS_PRIVATE_KEY -> use direct private key (dev only) + # 2) BSC_BLS_KEYSTORE_PATH + BSC_BLS_KEYSTORE_PASSWORD -> use provided keystore + # 3) Auto-detected keystore in node dir + KEYPASS from .env + bls_keystore_path=$(find ${workspace}/.local/node${nodeIndex}/bls/keystore -name "*.json" -type f | head -1) + bls_cli_args=() + if [ -n "${BSC_BLS_PRIVATE_KEY}" ]; then + bls_cli_args+=(--bls.private-key "${BSC_BLS_PRIVATE_KEY}") + elif [ -n "${BSC_BLS_KEYSTORE_PATH}" ] && [ -n "${BSC_BLS_KEYSTORE_PASSWORD}" ]; then + bls_cli_args+=(--bls.keystore-path "${BSC_BLS_KEYSTORE_PATH}" --bls.keystore-password "${BSC_BLS_KEYSTORE_PASSWORD}") + else + if [ -z "${bls_keystore_path}" ]; then + echo "WARNING: No BLS keystore found for node${nodeIndex}; reth-bsc may fall back to env if configured" >&2 + fi + bls_cli_args+=(--bls.keystore-path "${bls_keystore_path}" --bls.keystore-password "${KEYPASS}") + fi + + evn_conf=() + if [ ${EnableSentryNode} = true ]; then + evn_conf+=(--evn.enabled) + add_nodeid=$(grep -E "EVNNodeIDsToAdd" ${workspace}/.local/node${nodeIndex}/config.toml | grep -o '\[".*"\]' | sed 's/\["//;s/"\]//;s/", "/,/g') + if [ -n "${add_nodeid}" ]; then + evn_conf+=(--evn.add-nodeid ${add_nodeid}) + fi + remove_nodeid=$(grep -E "EVNNodeIDsToRemove" ${workspace}/.local/node${nodeIndex}/config.toml | grep -o '\[".*"\]' | sed 's/\["//;s/"\]//;s/", "/,/g') + if [ -n "${remove_nodeid}" ]; then + evn_conf+=(--evn.remove-nodeid ${remove_nodeid}) + fi + fi + echo "node${nodeIndex}, nodekey_path: ${nodekey_path}, peer_conf: ${peer_conf[@]}, evn_conf: ${evn_conf[@]}" + + # Run reth-bsc node + reth_env=(RUST_LOG=debug BREATHE_BLOCK_INTERVAL=${BreatheBlockInterval} BSC_SUBMIT_BUILT_PAYLOAD=${BSC_SUBMIT_BUILT_PAYLOAD}) + if [ -n "${RETH_JEMALLOC_PROF}" ]; then + reth_env+=(_RJEM_MALLOC_CONF="${RETH_JEMALLOC_PROF}") + fi + nohup env "${reth_env[@]}" ${RETH_BSC_BINARY_PATH} node \ + --chain ${workspace}/.local/node${nodeIndex}/genesis_reth.json \ + --datadir ${workspace}/.local/node${nodeIndex} \ + --genesis-hash ${rialtoHash} \ + --disable-discovery \ + --http \ + --http.addr 0.0.0.0 \ + --http.port ${HTTPPort} \ + --p2p-secret-key ${nodekey_path} \ + --ws \ + --ws.addr 0.0.0.0 \ + --ws.port $((${WSPort})) \ + --discovery.addr 0.0.0.0 \ + --discovery.port ${discovery_port} \ + --authrpc.port ${auth_port} \ + --port ${discovery_port} \ + ${peer_conf[@]} \ + ${evn_conf[@]} \ + --mining.enabled \ + --mining.min-gas-tip 1000000000 \ + --mining.keystore-path ${keystore_path} \ + --mining.keystore-password ${KEYPASS} "${bls_cli_args[@]}" \ + ${EnableMetrics:+--metrics 0.0.0.0:$((9001 + nodeIndex * 2))} \ + --log.stdout.format terminal --engine.persistence-threshold 10 --engine.memory-block-buffer-target 128 \ + >> ${workspace}/.local/node${nodeIndex}/reth.log 2>&1 & + + if [ ${EnableSentryNode} = true ]; then + discovery_port=$(grep "ListenAddr" ${workspace}/.local/sentry${nodeIndex}/config.toml | sed 's/.*:\([0-9]*\).*/\1/') + nodekey_path=$(find ${workspace}/.local/sentry${i}/geth/nodekey -type f | head -1) + bootnode_enode=$(grep -E "BootstrapNodes" ${workspace}/.local/sentry${nodeIndex}/config.toml | grep -o '\[".*"\]' | sed 's/\["//;s/"\]//;s/", "/,/g') + staic_enode=$(grep -E "StaticNodes" ${workspace}/.local/sentry${nodeIndex}/config.toml | grep -o '\[".*"\]' | sed 's/\["//;s/"\]//;s/", "/,/g') + peer_conf=() + if [ -n "${bootnode_enode}" ]; then + peer_conf+=(--bootnodes ${bootnode_enode}) + fi + if [ -n "${staic_enode}" ]; then + peer_conf+=(--trusted-peers ${staic_enode}) + fi + evn_conf=() + evn_conf+=(--evn.enabled) + whitelist_nodeid=$(grep -E "EVNNodeIdsWhitelist" ${workspace}/.local/sentry${nodeIndex}/config.toml | grep -o '\[".*"\]' | sed 's/\["//;s/"\]//;s/", "/,/g') + if [ -n "${whitelist_nodeid}" ]; then + evn_conf+=(--evn.whitelist-nodeids ${whitelist_nodeid}) + fi + proxyed_val=$(grep -E "ProxyedValidatorAddresses" ${workspace}/.local/sentry${nodeIndex}/config.toml | grep -o '\[".*"\]' | sed 's/\["//;s/"\]//;s/", "/,/g') + if [ -n "${proxyed_val}" ]; then + evn_conf+=(--evn.proxyed-validator ${proxyed_val}) + fi + + echo "sentry${nodeIndex}, nodekey_path: ${nodekey_path}, peer_conf: ${peer_conf[@]}, evn_conf: ${evn_conf[@]}" + nohup env "${reth_env[@]}" ${RETH_BSC_BINARY_PATH} node \ + --chain ${workspace}/.local/sentry${nodeIndex}/genesis_reth.json \ + --datadir ${workspace}/.local/sentry${nodeIndex} \ + --genesis-hash ${rialtoHash} \ + --disable-discovery \ + --http \ + --http.addr 0.0.0.0 \ + --http.port $((HTTPPort+1)) \ + --p2p-secret-key ${nodekey_path} \ + --ws \ + --ws.addr 0.0.0.0 \ + --ws.port $((WSPort+1)) \ + --discovery.addr 0.0.0.0 \ + --discovery.port ${discovery_port} \ + --authrpc.port $((auth_port+1)) \ + --port ${discovery_port} \ + ${peer_conf[@]} \ + ${evn_conf[@]} \ + --log.stdout.format terminal \ + >> ${workspace}/.local/sentry${nodeIndex}/reth.log 2>&1 & + fi +} + function start_node() { local type=$1 # node | sentry | full local idx=$2 # index (validator/sentry)，full default 0 @@ -209,8 +441,8 @@ function start_node() { --rpc.allow-unprotected-txs --allow-insecure-unlock \ --ws --ws.addr 0.0.0.0 --ws.port ${ws_port} \ --http --http.addr 0.0.0.0 --http.port ${http_port} --http.corsdomain "*" \ - --metrics --metrics.addr localhost --metrics.port ${metrics_port} \ - --pprof --pprof.addr localhost --pprof.port ${pprof_port} \ + ${EnableMetrics:+--metrics --metrics.addr localhost --metrics.port ${metrics_port}} \ + ${EnableMetrics:+--pprof --pprof.addr localhost --pprof.port ${pprof_port}} \ --gcmode ${gcmode} --syncmode full --monitor.maliciousvote \ --rialtohash ${rialtoHash} \ --override.passedforktime ${PassedForkTime} \ @@ -232,35 +464,42 @@ function native_start() { LastHardforkTime=$(expr ${PassedForkTime} + ${LAST_FORK_MORE_DELAY}) rialtoHash=`cat ${workspace}/.local/node0/init.log|grep "database=chaindata"|awk -F"=" '{print $NF}'|awk -F'"' '{print $1}'` - for ((i=0; i