From 6423e4a524f3461b1719ceb59893e2975c02c7e5 Mon Sep 17 00:00:00 2001 From: Yu Marvel Date: Fri, 11 Aug 2023 15:09:11 +0800 Subject: [PATCH 1/3] update l2node geth command with --nodiscover --- run-testnet.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run-testnet.sh b/run-testnet.sh index 21bebf314..fb3ff3c22 100644 --- a/run-testnet.sh +++ b/run-testnet.sh @@ -32,6 +32,7 @@ COMMAND="geth \ --authrpc.vhosts="*" \ --authrpc.jwtsecret=$JWT_SECRET_PATH \ --gcmode=archive \ +--nodiscover \ --mine \ --miner.etherbase=$MINER_ETHERBASE $optional_bootnodes" From 63c0ef250cb6f7120ee3ee8c52de7c749e3330d1 Mon Sep 17 00:00:00 2001 From: Yu Marvel Date: Tue, 22 Aug 2023 13:20:34 +0800 Subject: [PATCH 2/3] add run testnet in validator role --- run-testnet-sentry.sh | 2 +- run-testnet.sh => run-testnet-sequencer.sh | 2 +- run-testnet-validator.sh | 39 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) mode change 100644 => 100755 run-testnet-sentry.sh rename run-testnet.sh => run-testnet-sequencer.sh (96%) mode change 100644 => 100755 create mode 100755 run-testnet-validator.sh diff --git a/run-testnet-sentry.sh b/run-testnet-sentry.sh old mode 100644 new mode 100755 index 1255c9f65..df265b67d --- a/run-testnet-sentry.sh +++ b/run-testnet-sentry.sh @@ -36,4 +36,4 @@ COMMAND="geth \ --mine \ --miner.etherbase=$MINER_ETHERBASE $optional_bootnodes" -nohup $COMMAND > $GETH_LOG_FILE 2>&1 & +$COMMAND diff --git a/run-testnet.sh b/run-testnet-sequencer.sh old mode 100644 new mode 100755 similarity index 96% rename from run-testnet.sh rename to run-testnet-sequencer.sh index fb3ff3c22..ea0fefec0 --- a/run-testnet.sh +++ b/run-testnet-sequencer.sh @@ -36,4 +36,4 @@ COMMAND="geth \ --mine \ --miner.etherbase=$MINER_ETHERBASE $optional_bootnodes" -nohup $COMMAND > $GETH_LOG_FILE 2>&1 & +$COMMAND diff --git a/run-testnet-validator.sh b/run-testnet-validator.sh new file mode 100755 index 000000000..df265b67d --- /dev/null +++ b/run-testnet-validator.sh @@ -0,0 +1,39 @@ +GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morphism/setup/geth-data}" +JWT_SECRET_PATH="${JWT_SECRET_PATH:-/data/morphism/setup/jwt-secret.txt}" +DEFAULE_MINER_ETHERBASE="0x0e87cd091e091562F25CB1cf4641065dA2C049F5" +CHAIN_ID="${CHAIN_ID:-2710}" +GETH_LOG_FILE="${GETH_LOG_FILE:-/data/logs/geth.log}" + +if [[ -z "$MINER_ETHERBASE" ]]; then + # the environment variable is missing, set a default value + MINER_ETHERBASE=$DEFAULE_MINER_ETHERBASE +fi + +optional_bootnodes=${BOOT_NODES:+"--bootnodes=$BOOT_NODES"} + +# shellcheck disable=SC2125 +COMMAND="geth \ +--datadir="$GETH_DATA_DIR" \ +--verbosity=3 \ +--http \ +--http.corsdomain="*" \ +--http.vhosts="*" \ +--http.addr=0.0.0.0 \ +--http.port=8545 \ +--http.api=web3,eth,txpool,net,engine \ +--ws \ +--ws.addr=0.0.0.0 \ +--ws.port=8546 \ +--ws.origins="*" \ +--ws.api=web3,eth,txpool,net,engine \ +--networkid=$CHAIN_ID \ +--authrpc.addr="0.0.0.0" \ +--authrpc.port="8551" \ +--authrpc.vhosts="*" \ +--authrpc.jwtsecret=$JWT_SECRET_PATH \ +--gcmode=archive \ +--metrics \ +--mine \ +--miner.etherbase=$MINER_ETHERBASE $optional_bootnodes" + +$COMMAND From 4f358f8b808fc9e2b7dae839bab22e33cac161ac Mon Sep 17 00:00:00 2001 From: Yu Marvel Date: Tue, 22 Aug 2023 13:26:21 +0800 Subject: [PATCH 3/3] add comment for each script --- run-testnet-sentry.sh | 4 ++++ run-testnet-sequencer.sh | 4 ++++ run-testnet-validator.sh | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/run-testnet-sentry.sh b/run-testnet-sentry.sh index df265b67d..74344acb3 100755 --- a/run-testnet-sentry.sh +++ b/run-testnet-sentry.sh @@ -1,3 +1,7 @@ +#!/bin/sh +#script for sentry entrypoint +set -exu + GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morphism/setup/geth-data}" JWT_SECRET_PATH="${JWT_SECRET_PATH:-/data/morphism/setup/jwt-secret.txt}" DEFAULE_MINER_ETHERBASE="0x0e87cd091e091562F25CB1cf4641065dA2C049F5" diff --git a/run-testnet-sequencer.sh b/run-testnet-sequencer.sh index ea0fefec0..78310dabb 100755 --- a/run-testnet-sequencer.sh +++ b/run-testnet-sequencer.sh @@ -1,3 +1,7 @@ +#!/bin/sh +#script for sequencer entrypoint +set -exu + GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morphism/setup/geth-data}" JWT_SECRET_PATH="${JWT_SECRET_PATH:-/data/morphism/setup/jwt-secret.txt}" DEFAULE_MINER_ETHERBASE="0x0e87cd091e091562F25CB1cf4641065dA2C049F5" diff --git a/run-testnet-validator.sh b/run-testnet-validator.sh index df265b67d..fc79f69c1 100755 --- a/run-testnet-validator.sh +++ b/run-testnet-validator.sh @@ -1,3 +1,7 @@ +#!/bin/sh +#script for validator entrypoint +set -exu + GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morphism/setup/geth-data}" JWT_SECRET_PATH="${JWT_SECRET_PATH:-/data/morphism/setup/jwt-secret.txt}" DEFAULE_MINER_ETHERBASE="0x0e87cd091e091562F25CB1cf4641065dA2C049F5"