From 44299976a2eeca0e40a76506e6c0b30c88cfd764 Mon Sep 17 00:00:00 2001
From: Michael de Hoog <michael.dehoog@coinbase.com>
Date: Mon, 27 Mar 2023 11:32:42 -0500
Subject: [PATCH] Add optional ethstats argument (#35)

---
 docker-compose.yml |  1 +
 geth-entrypoint.sh | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c59aaf3b..8ca686cd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,7 @@ services:
       - OP_GETH_SEQUENCER_HTTP=https://goerli.base.org
       - OP_NODE_L2_ENGINE_AUTH=/tmp/engine-auth-jwt
       - OP_NODE_L2_ENGINE_AUTH_RAW=688f5d737bad920bdfb2fc2f488d6b6209eebda1dae949a8de91398d932c517a # for localdev only
+      # - OP_GETH_ETH_STATS=nodename:secret@host:port # optional
   node:
     build: .
     depends_on:
diff --git a/geth-entrypoint.sh b/geth-entrypoint.sh
index 80fbc71d..705977aa 100755
--- a/geth-entrypoint.sh
+++ b/geth-entrypoint.sh
@@ -5,11 +5,12 @@ VERBOSITY=${GETH_VERBOSITY:-3}
 GETH_DATA_DIR=/data
 GETH_CHAINDATA_DIR="$GETH_DATA_DIR/geth/chaindata"
 OP_GETH_GENESIS_FILE_PATH="${OP_GETH_GENESIS_FILE_PATH:-/genesis.json}"
-CHAIN_ID=$(cat "$OP_GETH_GENESIS_FILE_PATH" | jq -r .config.chainId)
+CHAIN_ID=$(jq -r .config.chainId < "$OP_GETH_GENESIS_FILE_PATH")
 RPC_PORT="${RPC_PORT:-8545}"
 WS_PORT="${WS_PORT:-8546}"
 AUTHRPC_PORT="${AUTHRPC_PORT:-8551}"
 HOST_IP="0.0.0.0"
+ADDITIONAL_ARGS=""
 
 mkdir -p $GETH_DATA_DIR
 
@@ -25,6 +26,10 @@ fi
 
 echo "$OP_NODE_L2_ENGINE_AUTH_RAW" > "$OP_NODE_L2_ENGINE_AUTH"
 
+if [ "${OP_GETH_ETH_STATS+x}" = x ]; then
+  ADDITIONAL_ARGS="$ADDITIONAL_ARGS --ethstats=$OP_GETH_ETH_STATS"
+fi
+
 ./geth \
 	--datadir="$GETH_DATA_DIR" \
 	--verbosity="$VERBOSITY" \
@@ -49,4 +54,5 @@ echo "$OP_NODE_L2_ENGINE_AUTH_RAW" > "$OP_NODE_L2_ENGINE_AUTH"
 	--maxpeers=100 \
 	--nat=extip:$HOST_IP \
 	--networkid="$CHAIN_ID" \
-	--rollup.sequencerhttp="$OP_GETH_SEQUENCER_HTTP"
+	--rollup.sequencerhttp="$OP_GETH_SEQUENCER_HTTP" \
+	$ADDITIONAL_ARGS # intentionally unquoted