From f3ddc07b0dde1497afa5a462d735acb602c1af0b Mon Sep 17 00:00:00 2001 From: Yu Marvel Date: Wed, 2 Aug 2023 15:43:07 +0800 Subject: [PATCH 1/3] update run testnet shell --- run-testnet.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run-testnet.sh b/run-testnet.sh index 0e2249d1b..c80765ca4 100644 --- a/run-testnet.sh +++ b/run-testnet.sh @@ -1,8 +1,8 @@ -GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morphism/setup/morph-geth-data}" -GETH_CHAINDATA_DIR="$GETH_DATA_DIR/geth/chaindata" +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 @@ -36,4 +36,4 @@ COMMAND="geth \ --mine \ --miner.etherbase=$MINER_ETHERBASE $optional_bootnodes" -nohup $COMMAND > /dev/null & +nohup $COMMAND >> $GETH_LOG_FILE 2>&1 & \ No newline at end of file From 8b67e8f9f48280dca200e6c92884972d21742b07 Mon Sep 17 00:00:00 2001 From: Yu Marvel Date: Wed, 2 Aug 2023 16:49:17 +0800 Subject: [PATCH 2/3] refine run testnet sh --- run-testnet.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/run-testnet.sh b/run-testnet.sh index c80765ca4..28f951165 100644 --- a/run-testnet.sh +++ b/run-testnet.sh @@ -4,7 +4,6 @@ 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 @@ -36,4 +35,4 @@ COMMAND="geth \ --mine \ --miner.etherbase=$MINER_ETHERBASE $optional_bootnodes" -nohup $COMMAND >> $GETH_LOG_FILE 2>&1 & \ No newline at end of file +nohup $COMMAND >> $GETH_LOG_FILE 2>&1 & From 07c5e2996e3a1f2e921123e61b9f491ef3338071 Mon Sep 17 00:00:00 2001 From: Yu Marvel Date: Wed, 2 Aug 2023 17:08:02 +0800 Subject: [PATCH 3/3] refine testnet runner --- run-testnet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-testnet.sh b/run-testnet.sh index 28f951165..21bebf314 100644 --- a/run-testnet.sh +++ b/run-testnet.sh @@ -35,4 +35,4 @@ COMMAND="geth \ --mine \ --miner.etherbase=$MINER_ETHERBASE $optional_bootnodes" -nohup $COMMAND >> $GETH_LOG_FILE 2>&1 & +nohup $COMMAND > $GETH_LOG_FILE 2>&1 &