From 5a1a878bbdb8a5fa049961c53579394c00b2b932 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Fri, 27 Sep 2019 19:42:53 +0200 Subject: [PATCH] multinet: script fixes --- multinet/run_all.sh | 12 ++++++------ multinet/run_lighthouse.sh | 2 +- multinet/run_prysm.sh | 5 +++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/multinet/run_all.sh b/multinet/run_all.sh index 5ed7c2411..c23051767 100755 --- a/multinet/run_all.sh +++ b/multinet/run_all.sh @@ -10,16 +10,16 @@ type "$MULTITAIL" &>/dev/null || USE_MULTITAIL="no" if [ "$USE_MULTITAIL" != "no" ]; then COMMANDS=() # "multitail" closes the corresponding panel when a command exits, so let's make sure it doesn't exit - COMMANDS+=( " -cT ansi -t 'nimbus' -l './run_nimbus.sh 0; echo [node execution completed]; while true; do sleep 100; done'" ) - COMMANDS+=( " -cT ansi -t 'trinity' -l 'sleep 3; ./run_trinity.sh; echo [node execution completed]; while true; do sleep 100; done'" ) - COMMANDS+=( " -cT ansi -t 'lighthouse' -l 'sleep 3; ./run_lighthouse.sh; echo [node execution completed]; while true; do sleep 100; done'" ) - COMMANDS+=( " -cT ansi -t 'prysm' -l 'sleep 3; ./run_prysm.sh; echo [node execution completed]; while true; do sleep 100; done'" ) - COMMANDS+=( " -cT ansi -t 'lodestar' -l 'sleep 3; ./run_lodestar.sh; echo [node execution completed]; while true; do sleep 100; done'" ) + COMMANDS+=( " -cT ansi -t 'nimbus' -l './run_nimbus.sh 10 5; echo [node execution completed]; while true; do sleep 100; done'" ) + COMMANDS+=( " -cT ansi -t 'trinity' -l 'sleep 3; ./run_trinity.sh 0 5; echo [node execution completed]; while true; do sleep 100; done'" ) + COMMANDS+=( " -cT ansi -t 'lighthouse' -l 'sleep 3; ./run_lighthouse.sh 5 5; echo [node execution completed]; while true; do sleep 100; done'" ) + COMMANDS+=( " -cT ansi -t 'prysm' -l 'sleep 3; ./run_prysm.sh 15 5; echo [node execution completed]; while true; do sleep 100; done'" ) + COMMANDS+=( " -cT ansi -t 'lodestar' -l 'sleep 3; ./run_lodestar.sh 20 5; echo [node execution completed]; while true; do sleep 100; done'" ) eval $MULTITAIL -s 3 -M 0 -x \"Multichain\" "${COMMANDS[@]}" else trap 'kill -9 -- -$$' SIGINT EXIT SIGTERM - ./run_nimbus.sh 0 & + ./run_nimbus.sh & sleep 2 ./run_trinity.sh & ./run_lighthouse.sh & diff --git a/multinet/run_lighthouse.sh b/multinet/run_lighthouse.sh index 0748d75eb..e409f15d9 100755 --- a/multinet/run_lighthouse.sh +++ b/multinet/run_lighthouse.sh @@ -70,6 +70,6 @@ cd "$SRCDIR/target/release" # fresh start! rm -rf ~/.lighthouse -./beacon_node --libp2p-addresses="$(cat ../data/bootstrap_nodes.txt)" testnet --spec minimal quick $VALIDATORS_TOTAL $GENESIS_TIME & +./beacon_node --libp2p-addresses="/ip4/127.0.0.1/tcp/50000" testnet --spec minimal quick $VALIDATORS_TOTAL $GENESIS_TIME & ./validator_client testnet -b insecure $VALIDATORS_START $VALIDATORS_NUM diff --git a/multinet/run_prysm.sh b/multinet/run_prysm.sh index 250bc4f5e..c869aa46e 100755 --- a/multinet/run_prysm.sh +++ b/multinet/run_prysm.sh @@ -36,10 +36,11 @@ set -x cd "$SRCDIR" +rm -rf /tmp/beacon-prysm + "$(bazel info bazel-bin)/beacon-chain/${OS}_stripped/beacon-chain" \ - --datadir /tmp/beacon \ + --datadir /tmp/beacon-prysm \ --pprof --verbosity=debug \ - --clear-db \ --bootstrap-node= \ --peer=$(cat ../data/bootstrap_nodes.txt) \ --interop-eth1data-votes \