Merge pull request #872 from marioevz/clients-dencun-fixes

clients,configs: Consensus clients' Deneb fixes
ethereum · Sep 22, 2023 · bbe6a40 · bbe6a40
2 parents f304a08 + 7f7c832
commit bbe6a40
Show file tree

Hide file tree

Showing 6 changed files with 4,214 additions and 9 deletions.
diff --git a/clients/lodestar-vc/lodestar_vc.sh b/clients/lodestar-vc/lodestar_vc.sh
@@ -32,9 +32,6 @@ case "$HIVE_LOGLEVEL" in
     5)   LOG=trace ;;
 esac
 
-builder_option=$([[ "$HIVE_ETH2_BUILDER_ENDPOINT" == "" ]] && echo "" || echo "--builder --suggestedFeeRecipient 0xa94f5374Fce5edBC8E2a8697C15331677e6EbF0B")
-echo BUILDER=$builder_option
-
 echo Starting Lodestar Validator Client
 
 node /usr/app/node_modules/.bin/lodestar \
@@ -44,6 +41,6 @@ node /usr/app/node_modules/.bin/lodestar \
     --paramsFile=/hive/input/config.yaml \
     --keystoresDir="/data/validators" \
     --secretsDir="/data/secrets" \
-    $metrics_option $builder_option \
+    $metrics_option \
     --beaconNodes="http://$HIVE_ETH2_BN_API_IP:$HIVE_ETH2_BN_API_PORT"
 
diff --git a/clients/prysm-vc/Dockerfile b/clients/prysm-vc/Dockerfile
@@ -1,7 +1,7 @@
-ARG tag=latest-debug
 ARG baseimage=gcr.io/prysmaticlabs/prysm/validator
+ARG tag=latest-debug
 
-FROM $baseimage:$branch as upstream
+FROM $baseimage:$tag as upstream
 
 FROM debian:buster-slim
 COPY --from=upstream /app/cmd/validator/validator validator

diff --git a/clients/teku-bn/Dockerfile b/clients/teku-bn/Dockerfile
@@ -10,4 +10,6 @@ RUN chmod +x /opt/teku/bin//teku_bn.sh
 
 RUN ./bin/teku --version > /version.txt > /version.txt
 
+ADD trusted_setup.txt /trusted_setup.txt
+
 ENTRYPOINT ["/opt/teku/bin/teku_bn.sh"]
diff --git a/clients/teku-bn/teku_bn.sh b/clients/teku-bn/teku_bn.sh
@@ -23,6 +23,10 @@ if [[ "$HIVE_ETH2_SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY" != "" ]]; then
     echo "SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY: $HIVE_ETH2_SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY" >> /data/testnet_setup/config.yaml
 fi
 
+trusted_setup_path="/trusted_setup.txt"
+
+echo "Xtrusted-setup: $trusted_setup_path" >> /data/testnet_setup/config.yaml
+
 echo config.yaml:
 cat /data/testnet_setup/config.yaml
 
@@ -47,15 +51,14 @@ enr_option=$([[ "$HIVE_ETH2_BOOTNODE_ENRS" == "" ]] && echo "" || echo --p2p-dis
 static_option=$([[ "$HIVE_ETH2_STATIC_PEERS" == "" ]] && echo "" || echo --p2p-static-peers="$HIVE_ETH2_STATIC_PEERS")
 opt_sync_option=$([[ "$HIVE_ETH2_SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY" == "" ]] && echo "" || echo "--Xnetwork-safe-slots-to-import-optimistically=$HIVE_ETH2_SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY")
 builder_option=$([[ "$HIVE_ETH2_BUILDER_ENDPOINT" == "" ]] && echo "" || echo "--validators-builder-registration-default-enabled=true --validators-proposer-blinded-blocks-enabled=true --builder-endpoint=$HIVE_ETH2_BUILDER_ENDPOINT")
-echo $builder_option
 
 if [ "$HIVE_ETH2_MERGE_ENABLED" != "" ]; then
     echo -n "0x7365637265747365637265747365637265747365637265747365637265747365" > /jwtsecret
     merge_option="--ee-endpoint=$HIVE_ETH2_ETH1_ENGINE_RPC_ADDRS --ee-jwt-secret-file=/jwtsecret"
 fi
 
 echo Starting Teku Beacon Node
-
+/opt/teku/bin/teku --version
 /opt/teku/bin/teku \
     --network=/data/testnet_setup/config.yaml \
     --data-path=/data/teku \
@@ -72,4 +75,5 @@ echo Starting Teku Beacon Node
     --rest-api-enabled=true --rest-api-interface=0.0.0.0 --rest-api-port="${HIVE_ETH2_BN_API_PORT:-4000}" --rest-api-host-allowlist="*" \
     --data-storage-mode=ARCHIVE \
     --Xstartup-target-peer-count=0 \
-    --p2p-subscribe-all-subnets-enabled
+    --p2p-subscribe-all-subnets-enabled \
+    --Xtrusted-setup="$trusted_setup_path"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,6 @@ RUN chmod +x /opt/teku/bin//teku_bn.sh

		RUN ./bin/teku --version > /version.txt > /version.txt

		ADD trusted_setup.txt /trusted_setup.txt

		ENTRYPOINT ["/opt/teku/bin/teku_bn.sh"]