diff --git a/docker-compose.yml b/docker-compose.yml index 74f061f..0b7d046 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: - 127.0.0.1:60000:60000 - 127.0.0.1:8008:8008 - 127.0.0.1:9000:9000 - - 127.0.0.1:8545:8545 + - 127.0.0.1:8645:8645 entrypoint: sh command: - '/opt/run_bootstrap.sh' diff --git a/run_bootstrap.sh b/run_bootstrap.sh index 7eb09da..ff7dac1 100755 --- a/run_bootstrap.sh +++ b/run_bootstrap.sh @@ -6,14 +6,16 @@ echo "I am a bootstrap node" exec /usr/bin/wakunode\ --relay=true\ - --rpc-admin=true\ + --rest=true\ + --rest-admin=true\ + --rest-private=true\ + --rest-address=0.0.0.0\ --keep-alive=true\ --max-connections=300\ --dns-discovery=true\ --discv5-discovery=true\ --discv5-enr-auto-update=True\ --log-level=INFO\ - --rpc-address=0.0.0.0\ --metrics-server=True\ --metrics-server-address=0.0.0.0\ --nodekey=30348dd51465150e04a5d9d932c72864c8967f806cce60b5d26afeca1e77eb68\ diff --git a/run_gowaku.sh b/run_gowaku.sh index a6fd0fe..ee3fee8 100755 --- a/run_gowaku.sh +++ b/run_gowaku.sh @@ -7,7 +7,7 @@ echo "I am a gowaku node" RETRIES=${RETRIES:=10} while [ -z "${BOOTSTRAP_ENR}" ] && [ ${RETRIES} -ge 0 ]; do - BOOTSTRAP_ENR=$(wget -O - --post-data='{"jsonrpc":"2.0","method":"get_waku_v2_debug_v1_info","params":[],"id":1}' --header='Content-Type:application/json' http://bootstrap:8545/ 2> /dev/null | sed 's/.*"enrUri":"\([^"]*\)".*/\1/'); + BOOTSTRAP_ENR=$(wget -qO- http://bootstrap:8645/debug/v1/info --header='Content-Type:application/json' 2> /dev/null | sed 's/.*"enrUri":"\([^"]*\)".*/\1/'); echo "Bootstrap node not ready, retrying (retries left: ${RETRIES})" sleep 1 RETRIES=$(( $RETRIES - 1 )) diff --git a/run_nwaku.sh b/run_nwaku.sh index 40cc1d7..438bed0 100755 --- a/run_nwaku.sh +++ b/run_nwaku.sh @@ -14,7 +14,7 @@ echo "NODE_INDEX $NODE_INDEX" RETRIES=${RETRIES:=10} while [ -z "${BOOTSTRAP_ENR}" ] && [ ${RETRIES} -ge 0 ]; do - BOOTSTRAP_ENR=$(wget -O - --post-data='{"jsonrpc":"2.0","method":"get_waku_v2_debug_v1_info","params":[],"id":1}' --header='Content-Type:application/json' http://bootstrap:8545/ 2> /dev/null | sed 's/.*"enrUri":"\([^"]*\)".*/\1/'); + BOOTSTRAP_ENR=$(wget -qO- http://bootstrap:8645/debug/v1/info --header='Content-Type:application/json' 2> /dev/null | sed 's/.*"enrUri":"\([^"]*\)".*/\1/'); echo "Bootstrap node not ready, retrying (retries left: ${RETRIES})" sleep 1 RETRIES=$(( $RETRIES - 1 )) @@ -28,9 +28,7 @@ fi echo "Using bootstrap node: ${BOOTSTRAP_ENR}" exec /usr/bin/wakunode\ --relay=true\ - --rpc-admin=true\ --max-connections=250\ - --rpc-address=0.0.0.0\ --rest=true\ --rest-admin=true\ --rest-private=true\ @@ -42,7 +40,6 @@ exec /usr/bin/wakunode\ --discv5-discovery=true\ --discv5-enr-auto-update=True\ --log-level=INFO\ - --rpc-address=0.0.0.0\ --metrics-server=True\ --metrics-server-address=0.0.0.0\ --discv5-bootstrap-node=${BOOTSTRAP_ENR}\ diff --git a/run_wakupublisher.sh b/run_wakupublisher.sh index 62c639e..538f534 100644 --- a/run_wakupublisher.sh +++ b/run_wakupublisher.sh @@ -7,7 +7,7 @@ echo "I am a traffic generator" RETRIES=${RETRIES:=10} while [ -z "${BOOTSTRAP_ENR}" ] && [ ${RETRIES} -ge 0 ]; do - BOOTSTRAP_ENR=$(wget -O - --post-data='{"jsonrpc":"2.0","method":"get_waku_v2_debug_v1_info","params":[],"id":1}' --header='Content-Type:application/json' http://bootstrap:8545/ 2> /dev/null | sed 's/.*"enrUri":"\([^"]*\)".*/\1/'); + BOOTSTRAP_ENR=$(wget -qO- http://bootstrap:8645/debug/v1/info --header='Content-Type:application/json' 2> /dev/null | sed 's/.*"enrUri":"\([^"]*\)".*/\1/'); echo "Bootstrap node not ready, retrying (retries left: ${RETRIES})" sleep 1 RETRIES=$(( $RETRIES - 1 ))