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 4878a5df..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 8440f4e7..115ed357 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 @@ -22,7 +22,7 @@ if [ "$CLIENT" = "lighthouse" ]; then CMD="$CMD --metrics --metrics-address 0.0.0.0 --metrics-port $ETH2_METRICS_PORT --validator-monitor-auto" fi - exec ${CMD} + exec ${CMD} ${ETH2_EXTRA_ARGS} fi @@ -45,7 +45,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 @@ -70,7 +70,7 @@ if [ "$CLIENT" = "prysm" ]; then CMD="$CMD --disable-monitoring" fi - exec ${CMD} + exec ${CMD} ${ETH2_EXTRA_ARGS} fi @@ -88,6 +88,6 @@ if [ "$CLIENT" = "teku" ]; then CMD="$CMD --metrics-enabled=true --metrics-interface=0.0.0.0 --metrics-port=$ETH2_METRICS_PORT --metrics-host-allowlist=*" 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 854dc2df..edb83ae7 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 @@ -18,7 +18,7 @@ if [ "$CLIENT" = "lighthouse" ]; then CMD="$CMD --metrics --metrics-address 0.0.0.0 --metrics-port $VALIDATOR_METRICS_PORT" fi - exec ${CMD} --graffiti "$GRAFFITI" + exec ${CMD} --graffiti "$GRAFFITI" ${VALIDATOR_EXTRA_ARGS} fi @@ -49,7 +49,7 @@ if [ "$CLIENT" = "prysm" ]; then CMD="$CMD --disable-account-metrics" fi - exec ${CMD} --graffiti "$GRAFFITI" + exec ${CMD} --graffiti "$GRAFFITI" ${VALIDATOR_EXTRA_ARGS} fi @@ -63,7 +63,7 @@ if [ "$CLIENT" = "teku" ]; then CMD="$CMD --metrics-enabled=true --metrics-interface=0.0.0.0 --metrics-port=$VALIDATOR_METRICS_PORT --metrics-host-allowlist=*" fi - exec ${CMD} --validators-graffiti="$GRAFFITI" + exec ${CMD} --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 bbc2243f..9149f7bd 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: @@ -73,6 +75,7 @@ services: - ROCKET_POOL_VERSION=${ROCKET_POOL_VERSION} - ENABLE_METRICS=${ENABLE_METRICS} - VALIDATOR_METRICS_PORT=${VALIDATOR_METRICS_PORT} + - 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 8440f4e7..1e2ccead 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,11 +18,15 @@ if [ "$CLIENT" = "lighthouse" ]; then CMD="$CMD --target-peers $ETH2_MAX_PEERS" fi +<<<<<<< HEAD + exec ${CMD} ${ETH2_EXTRA_ARGS} +======= if [ "$ENABLE_METRICS" -eq "1" ]; then CMD="$CMD --metrics --metrics-address 0.0.0.0 --metrics-port $ETH2_METRICS_PORT --validator-monitor-auto" fi exec ${CMD} +>>>>>>> master fi @@ -45,7 +49,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 @@ -70,7 +74,7 @@ if [ "$CLIENT" = "prysm" ]; then CMD="$CMD --disable-monitoring" fi - exec ${CMD} + exec ${CMD} ${ETH2_EXTRA_ARGS} fi @@ -88,6 +92,6 @@ if [ "$CLIENT" = "teku" ]; then CMD="$CMD --metrics-enabled=true --metrics-interface=0.0.0.0 --metrics-port=$ETH2_METRICS_PORT --metrics-host-allowlist=*" 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 854dc2df..edb83ae7 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 @@ -18,7 +18,7 @@ if [ "$CLIENT" = "lighthouse" ]; then CMD="$CMD --metrics --metrics-address 0.0.0.0 --metrics-port $VALIDATOR_METRICS_PORT" fi - exec ${CMD} --graffiti "$GRAFFITI" + exec ${CMD} --graffiti "$GRAFFITI" ${VALIDATOR_EXTRA_ARGS} fi @@ -49,7 +49,7 @@ if [ "$CLIENT" = "prysm" ]; then CMD="$CMD --disable-account-metrics" fi - exec ${CMD} --graffiti "$GRAFFITI" + exec ${CMD} --graffiti "$GRAFFITI" ${VALIDATOR_EXTRA_ARGS} fi @@ -63,7 +63,7 @@ if [ "$CLIENT" = "teku" ]; then CMD="$CMD --metrics-enabled=true --metrics-interface=0.0.0.0 --metrics-port=$VALIDATOR_METRICS_PORT --metrics-host-allowlist=*" fi - exec ${CMD} --validators-graffiti="$GRAFFITI" + exec ${CMD} --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 bbc2243f..d2379324 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: @@ -73,6 +75,7 @@ services: - ROCKET_POOL_VERSION=${ROCKET_POOL_VERSION} - ENABLE_METRICS=${ENABLE_METRICS} - VALIDATOR_METRICS_PORT=${VALIDATOR_METRICS_PORT} + - VALIDATOR_EXTRA_ARGS=${VALIDATOR_EXTRA_ARGS} entrypoint: sh command: "/setup/start-validator.sh" depends_on: