Only using gas limit if present on the config

Author: 0xfornax

install/scripts/start-bn.sh

@@ -172,14 +172,17 @@ if [ "$CC_CLIENT" = "nimbus" ]; then
         --data-dir=/ethclient/nimbus \
         --tcp-port=$BN_P2P_PORT \
         --udp-port=$BN_P2P_PORT \
-        --suggested-gas-limit=$BN_SUGGESTED_BLOCK_GAS_LIMIT \
         --web3-url=$EC_ENGINE_ENDPOINT \
         --rest \
         --rest-address=0.0.0.0 \
         --rest-port=${BN_API_PORT:-5052} \
         --jwt-secret=/secrets/jwtsecret \
         $BN_ADDITIONAL_FLAGS"
 
+    if [ ! -z "$BN_SUGGESTED_BLOCK_GAS_LIMIT" ]; then
+        CMD="$CMD --suggested-gas-limit=$BN_SUGGESTED_BLOCK_GAS_LIMIT"
+    fi
+
     if [ ! -z "$MEV_BOOST_URL" ]; then
         CMD="$CMD --payload-builder --payload-builder-url=$MEV_BOOST_URL"
     fi
@@ -282,7 +285,6 @@ if [ "$CC_CLIENT" = "teku" ]; then
         --network=$TEKU_NETWORK \
         --data-path=/ethclient/teku \
         --p2p-port=$BN_P2P_PORT \
-        --validators-builder-registration-default-gas-limit=$BN_SUGGESTED_BLOCK_GAS_LIMIT \
         --ee-endpoint=$EC_ENGINE_ENDPOINT \
         --rest-api-enabled \
         --rest-api-interface=0.0.0.0 \
@@ -296,6 +298,10 @@ if [ "$CC_CLIENT" = "teku" ]; then
         --validators-graffiti-client-append-format=DISABLED \
         $BN_ADDITIONAL_FLAGS"
 
+    if [ ! -z "$BN_SUGGESTED_BLOCK_GAS_LIMIT" ]; then
+            CMD="$CMD --validators-builder-registration-default-gas-limit=$BN_SUGGESTED_BLOCK_GAS_LIMIT"
+    fi
+    
     if [ "$TEKU_ARCHIVE_MODE" = "true" ]; then
         CMD="$CMD --data-storage-mode=archive"
     fi

install/scripts/start-ec.sh

@@ -92,7 +92,7 @@ if [ "$CLIENT" = "geth" ]; then
             --pprof \
             $EC_ADDITIONAL_FLAGS"
 
-        if [ "$EC_SUGGESTED_BLOCK_GAS_LIMIT" -gt "0"]; then
+        if [ ! -z "$EC_SUGGESTED_BLOCK_GAS_LIMIT" ]; then
             CMD="$CMD --miner.gaslimit $EC_SUGGESTED_BLOCK_GAS_LIMIT"
         fi
 
@@ -183,7 +183,7 @@ if [ "$CLIENT" = "nethermind" ]; then
         --Pruning.FullPruningMemoryBudgetMb=$RP_NETHERMIND_FULL_PRUNE_MEMORY_BUDGET \
         $EC_ADDITIONAL_FLAGS"
 
-    if [ "$EC_SUGGESTED_BLOCK_GAS_LIMIT" -gt "0"]; then
+    if [ ! -z "$EC_SUGGESTED_BLOCK_GAS_LIMIT" ]; then
             CMD="$CMD --Blocks.TargetBlockGasLimit $EC_SUGGESTED_BLOCK_GAS_LIMIT"
     fi
 
@@ -274,7 +274,7 @@ if [ "$CLIENT" = "besu" ]; then
             --Xbonsai-full-flat-db-enabled=true \
             $EC_ADDITIONAL_FLAGS"
 
-        if [ "$EC_SUGGESTED_BLOCK_GAS_LIMIT" -gt "0"]; then
+        if [ ! -z "$EC_SUGGESTED_BLOCK_GAS_LIMIT" ]; then
             CMD="$CMD --target-gas-limit=$EC_SUGGESTED_BLOCK_GAS_LIMIT"
         fi
 
@@ -337,7 +337,7 @@ if [ "$CLIENT" = "reth" ]; then
         --authrpc.jwtsecret /secrets/jwtsecret \
         $EC_ADDITIONAL_FLAGS"
 
-    if [ "$EC_SUGGESTED_BLOCK_GAS_LIMIT" -gt "0"]; then
+    if [ ! -z "$EC_SUGGESTED_BLOCK_GAS_LIMIT" ]; then
             CMD="$CMD --builder.gaslimit $EC_SUGGESTED_BLOCK_GAS_LIMIT"
     fi
 

install/scripts/start-vc.sh

@@ -45,11 +45,14 @@ if [ "$CC_CLIENT" = "lighthouse" ]; then
         --datadir /validators/lighthouse \
         --init-slashing-protection \
         --logfile-max-number 0 \
-        --gas-limit $VC_SUGGESTED_BLOCK_GAS_LIMIT \
         --beacon-nodes $CC_URL_STRING \
         --suggested-fee-recipient $(cat /validators/$FEE_RECIPIENT_FILE) \
         $VC_ADDITIONAL_FLAGS"
 
+    if [ ! -z "$VC_SUGGESTED_BLOCK_GAS_LIMIT" ]; then
+            CMD="$CMD --gas-limit $VC_SUGGESTED_BLOCK_GAS_LIMIT"
+    fi
+
     if [ "$DOPPELGANGER_DETECTION" = "true" ]; then
         CMD="$CMD --enable-doppelganger-protection"
     fi
@@ -94,10 +97,13 @@ if [ "$CC_CLIENT" = "lodestar" ]; then
         $FALLBACK_CC_STRING \
         --keystoresDir /validators/lodestar/validators \
         --secretsDir /validators/lodestar/secrets \
-        --defaultGasLimit $VC_SUGGESTED_BLOCK_GAS_LIMIT \
         --suggestedFeeRecipient $(cat /validators/$FEE_RECIPIENT_FILE) \
         $VC_ADDITIONAL_FLAGS"
 
+if [ ! -z "$VC_SUGGESTED_BLOCK_GAS_LIMIT" ]; then
+            CMD="$CMD --defaultGasLimit $VC_SUGGESTED_BLOCK_GAS_LIMIT"
+    fi
+
     if [ "$DOPPELGANGER_DETECTION" = "true" ]; then
         CMD="$CMD --doppelgangerProtection"
     fi
@@ -181,10 +187,13 @@ if [ "$CC_CLIENT" = "prysm" ]; then
         --wallet-dir /validators/prysm-non-hd \
         --wallet-password-file /validators/prysm-non-hd/direct/accounts/secret \
         --beacon-rpc-provider $CC_URL_STRING \
-        --suggested-gas-limit $VC_SUGGESTED_BLOCK_GAS_LIMIT \
         --suggested-fee-recipient $(cat /validators/$FEE_RECIPIENT_FILE) \
         $VC_ADDITIONAL_FLAGS"
 
+    if [ ! -z "$VC_SUGGESTED_BLOCK_GAS_LIMIT" ]; then
+        CMD="$CMD --suggested-gas-limit=$VC_SUGGESTED_BLOCK_GAS_LIMIT"
+    fi
+    
     if [ "$ENABLE_MEV_BOOST" = "true" ]; then
         CMD="$CMD --enable-builder"
     fi