From 285a3826182e9f1017f5ab8be2843f7991e8f8a7 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Fri, 21 Jul 2023 16:25:20 -0600 Subject: [PATCH] Update startup scripts --- .../config/mainnet-eth/scripts/run-geth.sh | 23 ++++-------------- .../mainnet-eth/scripts/run-lighthouse.sh | 24 +++++-------------- 2 files changed, 10 insertions(+), 37 deletions(-) diff --git a/app/data/config/mainnet-eth/scripts/run-geth.sh b/app/data/config/mainnet-eth/scripts/run-geth.sh index d50698c7..c72b371f 100755 --- a/app/data/config/mainnet-eth/scripts/run-geth.sh +++ b/app/data/config/mainnet-eth/scripts/run-geth.sh @@ -25,34 +25,19 @@ cleanup() { $START_CMD \ --datadir="${CERC_ETH_DATADIR}" \ - --allow-insecure-unlock \ - --http \ - --http.addr="0.0.0.0" \ - --http.vhosts="*" \ - --http.api="${CERC_GETH_HTTP_APIS:-eth,web3,net,admin,personal,debug,statediff}" \ - --http.corsdomain="*" \ --authrpc.addr="0.0.0.0" \ + --authrpc.port 8551 \ --authrpc.vhosts="*" \ - --authrpc.jwtsecret="/opt/testnet/build/el/jwtsecret" \ + --authrpc.jwtsecret="/etc/mainnet-eth/jwtsecret" \ --ws \ --ws.addr="0.0.0.0" \ --ws.origins="*" \ --ws.api="${CERC_GETH_WS_APIS:-eth,web3,net,admin,personal,debug,statediff}" \ --http.corsdomain="*" \ - --networkid="${NETWORK_ID}" \ - --netrestrict="${NETRESTRICT}" \ - --gcmode archive \ + --gcmode full \ --txlookuplimit=0 \ --cache.preimages \ - --syncmode=full \ - --mine \ - --miner.threads=1 \ - --metrics \ - --metrics.addr="0.0.0.0" \ - --verbosity=${CERC_GETH_VERBOSITY:-3} \ - --log.vmodule="${CERC_GETH_VMODULE:-statediff/*=5}" \ - --miner.etherbase="${ETHERBASE}" \ - ${STATEDIFF_OPTS} \ + --syncmode=snap \ & geth_pid=$! diff --git a/app/data/config/mainnet-eth/scripts/run-lighthouse.sh b/app/data/config/mainnet-eth/scripts/run-lighthouse.sh index 2005a6d4..ac4ffc1b 100755 --- a/app/data/config/mainnet-eth/scripts/run-lighthouse.sh +++ b/app/data/config/mainnet-eth/scripts/run-lighthouse.sh @@ -5,8 +5,8 @@ fi DEBUG_LEVEL=${CERC_LIGHTHOUSE_DEBUG_LEVEL:-info} -# Get positional arguments -data_dir=$DATADIR/node_${NODE_NUMBER} +data_dir=/var/lighthouse-data-dir + network_port=9001 http_port=8001 authrpc_port=8551 @@ -14,21 +14,9 @@ authrpc_port=8551 exec lighthouse \ bn \ --debug-level $DEBUG_LEVEL \ - --boot-nodes "$ENR" \ --datadir $data_dir \ - --testnet-dir $TESTNET_DIR \ - --enable-private-discovery \ - --staking \ - --enr-address $ENR_IP \ - --enr-udp-port $network_port \ - --enr-tcp-port $network_port \ - --port $network_port \ - --http-address 0.0.0.0 \ - --http-port $http_port \ - --disable-packet-filter \ + --network mainnet \ --execution-endpoint $EXECUTION_ENDPOINT \ - --execution-jwt $JWTSECRET \ - --terminal-total-difficulty-override $ETH1_TTD \ - --suggested-fee-recipient $SUGGESTED_FEE_RECIPIENT \ - --target-peers $((BN_COUNT - 1)) \ - --http-allow-sync-stalled \ + --execution-jwt /etc/mainnet-eth/jwtsecret \ + --disable-deposit-contract-sync \ + --checkpoint-sync-url https://mainnet.checkpoint.sigp.io