From b5a875527d731a9d0ac07c7abc50cf38d45a61fb Mon Sep 17 00:00:00 2001 From: Kaloyan Tanev Date: Wed, 27 Nov 2024 11:23:16 +0200 Subject: [PATCH 1/3] Fixes for new Kurtosis CLI version --- network_params_geth_lighthouse.yaml | 1 - network_params_geth_lodestar.yaml | 1 - network_params_geth_nimbus.yaml | 1 - network_params_geth_prysm.yaml | 1 - network_params_geth_teku.yaml | 1 - 5 files changed, 5 deletions(-) diff --git a/network_params_geth_lighthouse.yaml b/network_params_geth_lighthouse.yaml index c7955c5..5a0f042 100644 --- a/network_params_geth_lighthouse.yaml +++ b/network_params_geth_lighthouse.yaml @@ -96,7 +96,6 @@ snooper_enabled: false ethereum_metrics_exporter_enabled: false parallel_keystore_generation: false disable_peer_scoring: false -grafana_additional_dashboards: [] persistent: false mev_type: mock mev_params: diff --git a/network_params_geth_lodestar.yaml b/network_params_geth_lodestar.yaml index 1b0d2b8..886f42a 100644 --- a/network_params_geth_lodestar.yaml +++ b/network_params_geth_lodestar.yaml @@ -96,7 +96,6 @@ snooper_enabled: false ethereum_metrics_exporter_enabled: false parallel_keystore_generation: false disable_peer_scoring: false -grafana_additional_dashboards: [] persistent: false mev_type: mock mev_params: diff --git a/network_params_geth_nimbus.yaml b/network_params_geth_nimbus.yaml index d9268f4..27042ea 100644 --- a/network_params_geth_nimbus.yaml +++ b/network_params_geth_nimbus.yaml @@ -96,7 +96,6 @@ snooper_enabled: false ethereum_metrics_exporter_enabled: false parallel_keystore_generation: false disable_peer_scoring: false -grafana_additional_dashboards: [] persistent: false mev_type: mock mev_params: diff --git a/network_params_geth_prysm.yaml b/network_params_geth_prysm.yaml index 02cc5d6..3f330ab 100644 --- a/network_params_geth_prysm.yaml +++ b/network_params_geth_prysm.yaml @@ -96,7 +96,6 @@ snooper_enabled: false ethereum_metrics_exporter_enabled: false parallel_keystore_generation: false disable_peer_scoring: false -grafana_additional_dashboards: [] persistent: false mev_type: mock mev_params: diff --git a/network_params_geth_teku.yaml b/network_params_geth_teku.yaml index 77e73c8..b72fe17 100644 --- a/network_params_geth_teku.yaml +++ b/network_params_geth_teku.yaml @@ -98,7 +98,6 @@ snooper_enabled: false ethereum_metrics_exporter_enabled: false parallel_keystore_generation: false disable_peer_scoring: false -grafana_additional_dashboards: [] persistent: false mev_type: mock mev_params: From 16e5685bab1888ef71d7fc8b0b3bd0f9a06f7b4b Mon Sep 17 00:00:00 2001 From: Kaloyan Tanev Date: Wed, 27 Nov 2024 11:23:49 +0200 Subject: [PATCH 2/3] Bump versions for charon v1.2.0-rc2 --- docker-compose.yml | 14 +++++++------- network_params_geth_lodestar.yaml | 2 +- network_params_geth_nimbus.yaml | 2 +- network_params_geth_prysm.yaml | 2 +- network_params_geth_teku.yaml | 2 +- nimbus/Dockerfile | 4 ++-- prysm/Dockerfile | 2 +- run_charon.sh | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7efebf1..ef7f3a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ x-node-base: # Pegged charon version (update this for each release). &node-base - image: obolnetwork/charon-local:latest + image: obolnetwork/charon:v1.2.0-rc2 restart: unless-stopped networks: [network1] # network_mode: "host" @@ -151,7 +151,7 @@ services: - ./testnet:/opt/lighthouse/network-configs vc0-teku: - image: consensys/teku:${TEKU_VERSION:-24.8} + image: consensys/teku:${TEKU_VERSION:-24.10.3} networks: [network1] # network_mode: "host" depends_on: [node0] @@ -172,7 +172,7 @@ services: - ./testnet/config.yaml:/opt/teku/config.yaml vc1-teku: - image: consensys/teku:${TEKU_VERSION:-24.8} + image: consensys/teku:${TEKU_VERSION:-24.10.3} networks: [network1] # network_mode: "host" depends_on: [node1] @@ -193,7 +193,7 @@ services: - ./testnet/config.yaml:/opt/teku/config.yaml vc2-teku: - image: consensys/teku:${TEKU_VERSION:-24.8} + image: consensys/teku:${TEKU_VERSION:-24.10.3} networks: [network1] # network_mode: "host" depends_on: [node2] @@ -253,7 +253,7 @@ services: - ./nimbus/run.sh:/home/user/data/run.sh vc0-lodestar: - image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.20.2} + image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.23.0} depends_on: [node0] entrypoint: /opt/lodestar/run.sh networks: [network1] @@ -270,7 +270,7 @@ services: restart: unless-stopped vc1-lodestar: - image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.20.2} + image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.23.0} depends_on: [node1] entrypoint: /opt/lodestar/run.sh networks: [network1] @@ -288,7 +288,7 @@ services: restart: unless-stopped vc2-lodestar: - image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.20.2} + image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.23.0} depends_on: [node2] entrypoint: /opt/lodestar/run.sh networks: [network1] diff --git a/network_params_geth_lodestar.yaml b/network_params_geth_lodestar.yaml index 886f42a..c5ab80b 100644 --- a/network_params_geth_lodestar.yaml +++ b/network_params_geth_lodestar.yaml @@ -14,7 +14,7 @@ participants: el_max_mem: 0 # CL cl_type: lodestar - cl_image: chainsafe/lodestar:v1.20.2 + cl_image: chainsafe/lodestar:v1.23.0 cl_log_level: "" cl_extra_env_vars: {} cl_extra_labels: {} diff --git a/network_params_geth_nimbus.yaml b/network_params_geth_nimbus.yaml index 27042ea..caed597 100644 --- a/network_params_geth_nimbus.yaml +++ b/network_params_geth_nimbus.yaml @@ -14,7 +14,7 @@ participants: el_max_mem: 0 # CL cl_type: nimbus - cl_image: statusim/nimbus-eth2:multiarch-v24.7.0 + cl_image: statusim/nimbus-eth2:multiarch-v24.10.0 cl_log_level: "" cl_extra_env_vars: {} cl_extra_labels: {} diff --git a/network_params_geth_prysm.yaml b/network_params_geth_prysm.yaml index 3f330ab..2e90b7c 100644 --- a/network_params_geth_prysm.yaml +++ b/network_params_geth_prysm.yaml @@ -14,7 +14,7 @@ participants: el_max_mem: 0 # CL cl_type: prysm - cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v5.1.0 + cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v5.1.2 cl_log_level: "" cl_extra_env_vars: {} cl_extra_labels: {} diff --git a/network_params_geth_teku.yaml b/network_params_geth_teku.yaml index b72fe17..39a2479 100644 --- a/network_params_geth_teku.yaml +++ b/network_params_geth_teku.yaml @@ -14,7 +14,7 @@ participants: el_max_mem: 0 # CL cl_type: teku - cl_image: consensys/teku:24.8.0 + cl_image: consensys/teku:24.10.3 cl_log_level: "" cl_extra_env_vars: {} cl_extra_labels: {} diff --git a/nimbus/Dockerfile b/nimbus/Dockerfile index 658cd0a..1914139 100755 --- a/nimbus/Dockerfile +++ b/nimbus/Dockerfile @@ -1,6 +1,6 @@ -FROM statusim/nimbus-eth2:multiarch-v24.7.0 as nimbusbn +FROM statusim/nimbus-eth2:multiarch-v24.10.0 as nimbusbn -FROM statusim/nimbus-validator-client:multiarch-v24.7.0 +FROM statusim/nimbus-validator-client:multiarch-v24.10.0 COPY --from=nimbusbn /home/user/nimbus_beacon_node /home/user/nimbus_beacon_node diff --git a/prysm/Dockerfile b/prysm/Dockerfile index 0a2847b..23bef8b 100644 --- a/prysm/Dockerfile +++ b/prysm/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/prysmaticlabs/prysm/validator:v5.1.0 as prysm-validator +FROM gcr.io/prysmaticlabs/prysm/validator:v5.1.2 as prysm-validator FROM debian:buster-slim COPY --from=prysm-validator /app/cmd/validator/validator validator diff --git a/run_charon.sh b/run_charon.sh index 268241e..4425858 100755 --- a/run_charon.sh +++ b/run_charon.sh @@ -240,7 +240,7 @@ if [ -n "$genesis_time" ] && [ -n "$enr_address" ]; then echo "BN_$i=${bnips[$i]}" >> ./.env done # Run the docker command with the extracted genesis_time - docker run -u $(id -u):$(id -g) --rm -v "$(pwd)/:/opt/charon" obolnetwork/charon-local:latest create cluster --fee-recipient-addresses="0x8943545177806ED17B9F23F0a21ee5948eCaa776" --nodes=3 --withdrawal-addresses="0xBc7c960C1097ef1Af0FD32407701465f3c03e407" --name=test --split-existing-keys --split-keys-dir=charon-keys --testnet-chain-id=3151908 --testnet-fork-version="0x10000038" --testnet-genesis-timestamp="$genesis_time" --testnet-name=kurtosis-testnet + docker run -u $(id -u):$(id -g) --rm -v "$(pwd)/:/opt/charon" obolnetwork/charon:v1.2.0-rc2 create cluster --fee-recipient-addresses="0x8943545177806ED17B9F23F0a21ee5948eCaa776" --nodes=3 --withdrawal-addresses="0xBc7c960C1097ef1Af0FD32407701465f3c03e407" --name=test --split-existing-keys --split-keys-dir=charon-keys --testnet-chain-id=3151908 --testnet-fork-version="0x10000038" --testnet-genesis-timestamp="$genesis_time" --testnet-name=kurtosis-testnet else echo "Genesis Time not found." fi From 83e635492a7e0f08a97e00c484bb9248430f6f38 Mon Sep 17 00:00:00 2001 From: Kaloyan Tanev Date: Thu, 28 Nov 2024 12:06:24 +0200 Subject: [PATCH 3/3] Remove the now default block v3 flag for Teku VC --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ef7f3a9..abe034e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -160,7 +160,6 @@ services: validator-client --beacon-node-api-endpoint="http://node0:3600" --config-file "/opt/charon/teku/teku-config.yaml" - --Xblock-v3-enabled true --validators-external-signer-slashing-protection-enabled true --validators-proposer-blinded-blocks-enabled ${BUILDER_API_ENABLED:-true} --validators-builder-registration-default-enabled ${BUILDER_API_ENABLED:-true} @@ -181,7 +180,6 @@ services: validator-client --beacon-node-api-endpoint=http://node1:3600 --config-file "/opt/charon/teku/teku-config.yaml" - --Xblock-v3-enabled true --validators-external-signer-slashing-protection-enabled true --validators-proposer-blinded-blocks-enabled ${BUILDER_API_ENABLED:-true} --validators-builder-registration-default-enabled ${BUILDER_API_ENABLED:-true} @@ -202,7 +200,6 @@ services: validator-client --beacon-node-api-endpoint=http://node2:3600 --config-file "/opt/charon/teku/teku-config.yaml" - --Xblock-v3-enabled true --validators-external-signer-slashing-protection-enabled true --validators-proposer-blinded-blocks-enabled ${BUILDER_API_ENABLED:-true} --validators-builder-registration-default-enabled ${BUILDER_API_ENABLED:-true}