From d39c3589d3ed7f41a531a4bb2e4c8ff1b070ec1d Mon Sep 17 00:00:00 2001
From: Ted Steen <ted.steen@gmail.com>
Date: Sun, 15 Aug 2021 22:47:04 +0300
Subject: [PATCH] Make it possible to pass extra arguments to the eth1, eth2
 and validator container

---
 .../network/prater/chains/eth1/start-node.sh              | 8 ++++----
 .../network/prater/chains/eth2/start-beacon.sh            | 8 ++++----
 .../network/prater/chains/eth2/start-validator.sh         | 6 +++---
 .../network/prater/docker-compose.yml                     | 3 +++
 .../network/prater/chains/eth1/start-node.sh              | 8 ++++----
 .../network/prater/chains/eth2/start-beacon.sh            | 8 ++++----
 .../network/prater/chains/eth2/start-validator.sh         | 6 +++---
 .../network/prater/docker-compose.yml                     | 3 +++
 8 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/amd64/rp-smartnode-install/network/prater/chains/eth1/start-node.sh b/amd64/rp-smartnode-install/network/prater/chains/eth1/start-node.sh
index 51093b88..c7ddf973 100755
--- a/amd64/rp-smartnode-install/network/prater/chains/eth1/start-node.sh
+++ b/amd64/rp-smartnode-install/network/prater/chains/eth1/start-node.sh
@@ -23,7 +23,7 @@ if [ "$CLIENT" = "geth" ]; then
         CMD="$CMD --port $ETH1_P2P_PORT"
     fi
 
-    exec ${CMD} --http.vhosts '*'
+    exec ${CMD} --http.vhosts '*' ${ETH1_EXTRA_ARGS}
 
 fi
 
@@ -31,7 +31,7 @@ fi
 # Infura startup
 if [ "$CLIENT" = "infura" ]; then
 
-    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --wsPort 8546 --network goerli --projectId $INFURA_PROJECT_ID --providerType infura
+    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --wsPort 8546 --network goerli --projectId $INFURA_PROJECT_ID --providerType infura $ETH1_EXTRA_ARGS
 
 fi
 
@@ -39,7 +39,7 @@ fi
 # Pocket startup
 if [ "$CLIENT" = "pocket" ]; then
 
-    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --network eth-goerli --projectId $POCKET_PROJECT_ID --providerType pocket 
+    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --network eth-goerli --projectId $POCKET_PROJECT_ID --providerType pocket $ETH1_EXTRA_ARGS
 
 fi
 
@@ -47,7 +47,7 @@ fi
 # Custom provider startup
 if [ "$CLIENT" = "custom" ]; then
 
-    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --wsPort 8546 --httpProviderUrl $HTTP_PROVIDER_URL --wsProviderUrl $WS_PROVIDER_URL --providerType=""
+    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --wsPort 8546 --httpProviderUrl $HTTP_PROVIDER_URL --wsProviderUrl $WS_PROVIDER_URL --providerType="" $ETH1_EXTRA_ARGS
 
 fi
 
diff --git a/amd64/rp-smartnode-install/network/prater/chains/eth2/start-beacon.sh b/amd64/rp-smartnode-install/network/prater/chains/eth2/start-beacon.sh
index 17a1d053..960d4aa5 100755
--- a/amd64/rp-smartnode-install/network/prater/chains/eth2/start-beacon.sh
+++ b/amd64/rp-smartnode-install/network/prater/chains/eth2/start-beacon.sh
@@ -18,7 +18,7 @@ if [ "$CLIENT" = "lighthouse" ]; then
         CMD="$CMD --target-peers $ETH2_MAX_PEERS"
     fi
 
-    exec ${CMD}
+    exec ${CMD} ${ETH2_EXTRA_ARGS}
 
 fi
 
@@ -41,7 +41,7 @@ if [ "$CLIENT" = "nimbus" ]; then
     fi
 
     # Graffiti breaks if it's in the CMD string instead of here because of spaces
-    exec ${CMD} --graffiti="$GRAFFITI"
+    exec ${CMD} --graffiti="$GRAFFITI" ${ETH2_EXTRA_ARGS}
 
 fi
 
@@ -60,7 +60,7 @@ if [ "$CLIENT" = "prysm" ]; then
         CMD="$CMD --p2p-max-peers $ETH2_MAX_PEERS"
     fi
 
-    exec ${CMD}
+    exec ${CMD} ${ETH2_EXTRA_ARGS}
 
 fi
 
@@ -74,6 +74,6 @@ if [ "$CLIENT" = "teku" ]; then
         CMD="$CMD --p2p-peer-lower-bound=$ETH2_MAX_PEERS --p2p-peer-upper-bound=$ETH2_MAX_PEERS"
     fi
 
-    exec ${CMD}
+    exec ${CMD} ${ETH2_EXTRA_ARGS}
 
 fi
diff --git a/amd64/rp-smartnode-install/network/prater/chains/eth2/start-validator.sh b/amd64/rp-smartnode-install/network/prater/chains/eth2/start-validator.sh
index f278a794..34fc096e 100755
--- a/amd64/rp-smartnode-install/network/prater/chains/eth2/start-validator.sh
+++ b/amd64/rp-smartnode-install/network/prater/chains/eth2/start-validator.sh
@@ -12,7 +12,7 @@ fi
 # Lighthouse startup
 if [ "$CLIENT" = "lighthouse" ]; then
 
-    exec /usr/local/bin/lighthouse validator --network prater --datadir /validators/lighthouse --init-slashing-protection --beacon-node "http://$ETH2_PROVIDER" --graffiti "$GRAFFITI"
+    exec /usr/local/bin/lighthouse validator --network prater --datadir /validators/lighthouse --init-slashing-protection --beacon-node "http://$ETH2_PROVIDER" --graffiti "$GRAFFITI" ${VALIDATOR_EXTRA_ARGS}
 
 fi
 
@@ -35,7 +35,7 @@ if [ "$CLIENT" = "prysm" ]; then
     # Get rid of the protocol prefix
     ETH2_PROVIDER=$(echo $ETH2_PROVIDER | sed -E 's/.*\:\/\/(.*)/\1/')
 
-    exec /app/cmd/validator/validator --accept-terms-of-use --prater --wallet-dir /validators/prysm-non-hd --wallet-password-file /validators/prysm-non-hd/direct/accounts/secret --beacon-rpc-provider "$ETH2_PROVIDER" --graffiti "$GRAFFITI"
+    exec /app/cmd/validator/validator --accept-terms-of-use --prater --wallet-dir /validators/prysm-non-hd --wallet-password-file /validators/prysm-non-hd/direct/accounts/secret --beacon-rpc-provider "$ETH2_PROVIDER" --graffiti "$GRAFFITI" ${VALIDATOR_EXTRA_ARGS}
 
 fi
 
@@ -43,7 +43,7 @@ fi
 # Teku startup
 if [ "$CLIENT" = "teku" ]; then
 
-    exec /opt/teku/bin/teku validator-client --network=prater --validator-keys=/validators/teku/keys:/validators/teku/passwords --beacon-node-api-endpoint="http://$ETH2_PROVIDER" --validators-graffiti="$GRAFFITI"
+    exec /opt/teku/bin/teku validator-client --network=prater --validator-keys=/validators/teku/keys:/validators/teku/passwords --beacon-node-api-endpoint="http://$ETH2_PROVIDER" --validators-graffiti="$GRAFFITI" ${VALIDATOR_EXTRA_ARGS}
 
 fi
 
diff --git a/amd64/rp-smartnode-install/network/prater/docker-compose.yml b/amd64/rp-smartnode-install/network/prater/docker-compose.yml
index 3ddfec38..3b65507a 100644
--- a/amd64/rp-smartnode-install/network/prater/docker-compose.yml
+++ b/amd64/rp-smartnode-install/network/prater/docker-compose.yml
@@ -24,6 +24,7 @@ services:
       - GETH_CACHE_SIZE=${GETH_CACHE_SIZE}
       - GETH_MAX_PEERS=${GETH_MAX_PEERS}
       - ETH1_P2P_PORT=${ETH1_P2P_PORT}
+      - ETH1_EXTRA_ARGS=${ETH1_EXTRA_ARGS}
     entrypoint: sh
     command: "/setup/start-node.sh"
   eth2:
@@ -51,6 +52,7 @@ services:
       - ETH2_MAX_PEERS=${ETH2_MAX_PEERS}
       - ENABLE_METRICS=${ENABLE_METRICS}
       - ETH2_METRICS_PORT=${ETH2_METRICS_PORT}
+      - ETH2_EXTRA_ARGS=${ETH2_EXTRA_ARGS}
     entrypoint: sh
     command: "/setup/start-beacon.sh"
     depends_on:
@@ -71,6 +73,7 @@ services:
       - ETH2_PROVIDER=${ETH2_PROVIDER}
       - CUSTOM_GRAFFITI=${CUSTOM_GRAFFITI}
       - ROCKET_POOL_VERSION=${ROCKET_POOL_VERSION}
+      - VALIDATOR_EXTRA_ARGS=${ETH1_EXTRA_ARGS}
     entrypoint: sh
     command: "/setup/start-validator.sh"
     depends_on:
diff --git a/arm64/rp-smartnode-install/network/prater/chains/eth1/start-node.sh b/arm64/rp-smartnode-install/network/prater/chains/eth1/start-node.sh
index 4878a5df..a79a5741 100755
--- a/arm64/rp-smartnode-install/network/prater/chains/eth1/start-node.sh
+++ b/arm64/rp-smartnode-install/network/prater/chains/eth1/start-node.sh
@@ -23,7 +23,7 @@ if [ "$CLIENT" = "geth" ]; then
         CMD="$CMD --port $ETH1_P2P_PORT"
     fi
 
-    exec ${CMD} --http.vhosts '*'
+    exec ${CMD} --http.vhosts '*' ${ETH1_EXTRA_ARGS}
 
 fi
 
@@ -31,7 +31,7 @@ fi
 # Infura startup
 if [ "$CLIENT" = "infura" ]; then
 
-    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --wsPort 8546 --network goerli --projectId $INFURA_PROJECT_ID --providerType infura
+    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --wsPort 8546 --network goerli --projectId $INFURA_PROJECT_ID --providerType infura ${ETH1_EXTRA_ARGS}
 
 fi
 
@@ -39,7 +39,7 @@ fi
 # Pocket startup
 if [ "$CLIENT" = "pocket" ]; then
 
-    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --network eth-goerli --projectId $POCKET_PROJECT_ID --providerType pocket
+    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --network eth-goerli --projectId $POCKET_PROJECT_ID --providerType pocket ${ETH1_EXTRA_ARGS}
 
 fi
 
@@ -47,7 +47,7 @@ fi
 # Custom provider startup
 if [ "$CLIENT" = "custom" ]; then
 
-    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --wsPort 8546 --httpProviderUrl $HTTP_PROVIDER_URL --wsProviderUrl $WS_PROVIDER_URL --providerType=""
+    exec /go/bin/rocketpool-pow-proxy --httpPort 8545 --wsPort 8546 --httpProviderUrl $HTTP_PROVIDER_URL --wsProviderUrl $WS_PROVIDER_URL --providerType="" ${ETH1_EXTRA_ARGS}
 
 fi
 
diff --git a/arm64/rp-smartnode-install/network/prater/chains/eth2/start-beacon.sh b/arm64/rp-smartnode-install/network/prater/chains/eth2/start-beacon.sh
index bf5c06ac..78e58842 100755
--- a/arm64/rp-smartnode-install/network/prater/chains/eth2/start-beacon.sh
+++ b/arm64/rp-smartnode-install/network/prater/chains/eth2/start-beacon.sh
@@ -18,7 +18,7 @@ if [ "$CLIENT" = "lighthouse" ]; then
         CMD="$CMD --target-peers $ETH2_MAX_PEERS"
     fi
 
-    exec ${CMD}
+    exec ${CMD} ${ETH2_EXTRA_ARGS}
 
 fi
 
@@ -41,7 +41,7 @@ if [ "$CLIENT" = "nimbus" ]; then
     fi
 
     # Graffiti breaks if it's in the CMD string instead of here because of spaces
-    exec ${CMD} --graffiti="$GRAFFITI"
+    exec ${CMD} --graffiti="$GRAFFITI" ${ETH2_EXTRA_ARGS}
 
 fi
 
@@ -60,7 +60,7 @@ if [ "$CLIENT" = "prysm" ]; then
         CMD="$CMD --p2p-max-peers $ETH2_MAX_PEERS"
     fi
 
-    exec ${CMD}
+    exec ${CMD} ${ETH2_EXTRA_ARGS}
 
 fi
 
@@ -74,6 +74,6 @@ if [ "$CLIENT" = "teku" ]; then
         CMD="$CMD --p2p-peer-lower-bound=$ETH2_MAX_PEERS --p2p-peer-upper-bound=$ETH2_MAX_PEERS"
     fi
 
-    exec ${CMD}
+    exec ${CMD} ${ETH2_EXTRA_ARGS}
 
 fi
diff --git a/arm64/rp-smartnode-install/network/prater/chains/eth2/start-validator.sh b/arm64/rp-smartnode-install/network/prater/chains/eth2/start-validator.sh
index f278a794..34fc096e 100755
--- a/arm64/rp-smartnode-install/network/prater/chains/eth2/start-validator.sh
+++ b/arm64/rp-smartnode-install/network/prater/chains/eth2/start-validator.sh
@@ -12,7 +12,7 @@ fi
 # Lighthouse startup
 if [ "$CLIENT" = "lighthouse" ]; then
 
-    exec /usr/local/bin/lighthouse validator --network prater --datadir /validators/lighthouse --init-slashing-protection --beacon-node "http://$ETH2_PROVIDER" --graffiti "$GRAFFITI"
+    exec /usr/local/bin/lighthouse validator --network prater --datadir /validators/lighthouse --init-slashing-protection --beacon-node "http://$ETH2_PROVIDER" --graffiti "$GRAFFITI" ${VALIDATOR_EXTRA_ARGS}
 
 fi
 
@@ -35,7 +35,7 @@ if [ "$CLIENT" = "prysm" ]; then
     # Get rid of the protocol prefix
     ETH2_PROVIDER=$(echo $ETH2_PROVIDER | sed -E 's/.*\:\/\/(.*)/\1/')
 
-    exec /app/cmd/validator/validator --accept-terms-of-use --prater --wallet-dir /validators/prysm-non-hd --wallet-password-file /validators/prysm-non-hd/direct/accounts/secret --beacon-rpc-provider "$ETH2_PROVIDER" --graffiti "$GRAFFITI"
+    exec /app/cmd/validator/validator --accept-terms-of-use --prater --wallet-dir /validators/prysm-non-hd --wallet-password-file /validators/prysm-non-hd/direct/accounts/secret --beacon-rpc-provider "$ETH2_PROVIDER" --graffiti "$GRAFFITI" ${VALIDATOR_EXTRA_ARGS}
 
 fi
 
@@ -43,7 +43,7 @@ fi
 # Teku startup
 if [ "$CLIENT" = "teku" ]; then
 
-    exec /opt/teku/bin/teku validator-client --network=prater --validator-keys=/validators/teku/keys:/validators/teku/passwords --beacon-node-api-endpoint="http://$ETH2_PROVIDER" --validators-graffiti="$GRAFFITI"
+    exec /opt/teku/bin/teku validator-client --network=prater --validator-keys=/validators/teku/keys:/validators/teku/passwords --beacon-node-api-endpoint="http://$ETH2_PROVIDER" --validators-graffiti="$GRAFFITI" ${VALIDATOR_EXTRA_ARGS}
 
 fi
 
diff --git a/arm64/rp-smartnode-install/network/prater/docker-compose.yml b/arm64/rp-smartnode-install/network/prater/docker-compose.yml
index 3ddfec38..84dfa527 100644
--- a/arm64/rp-smartnode-install/network/prater/docker-compose.yml
+++ b/arm64/rp-smartnode-install/network/prater/docker-compose.yml
@@ -24,6 +24,7 @@ services:
       - GETH_CACHE_SIZE=${GETH_CACHE_SIZE}
       - GETH_MAX_PEERS=${GETH_MAX_PEERS}
       - ETH1_P2P_PORT=${ETH1_P2P_PORT}
+      - ETH1_EXTRA_ARGS=${ETH1_EXTRA_ARGS}
     entrypoint: sh
     command: "/setup/start-node.sh"
   eth2:
@@ -51,6 +52,7 @@ services:
       - ETH2_MAX_PEERS=${ETH2_MAX_PEERS}
       - ENABLE_METRICS=${ENABLE_METRICS}
       - ETH2_METRICS_PORT=${ETH2_METRICS_PORT}
+      - ETH2_EXTRA_ARGS=${ETH2_EXTRA_ARGS}
     entrypoint: sh
     command: "/setup/start-beacon.sh"
     depends_on:
@@ -71,6 +73,7 @@ services:
       - ETH2_PROVIDER=${ETH2_PROVIDER}
       - CUSTOM_GRAFFITI=${CUSTOM_GRAFFITI}
       - ROCKET_POOL_VERSION=${ROCKET_POOL_VERSION}
+      - VALIDATOR_EXTRA_ARGS=${VALIDATOR_EXTRA_ARGS}
     entrypoint: sh
     command: "/setup/start-validator.sh"
     depends_on: