feat: Update images to latest versions (#391)

* feat: update clients to latest images * Fix misused eth1 flag for lighthouse CL * docs: update changelog --------- Co-authored-by: Yaroslav Kukharuk <[email protected]>
NethermindEth · Jul 9, 2024 · 4bb728e · 4bb728e
1 parent 74604f5
commit 4bb728e
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,14 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Remove arguments for Lighthouse `--eth1` flag.
+
 ### Added
 
 - Add support for MEV-boost on Holesky.
 
 ### Changed
 
-- Update client images to Dencun-ready versions. 
-- 
+- Update client images to latest versions.
 
 ### Removed
 - Removed support for Goerli. 

diff --git a/cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml
@@ -85,7 +85,7 @@ services:
       - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
-      - --eth1=${EC_API_URL}
+      - --eth1
       - --debug-level=${CC_LOG_LEVEL}
       - --suggested-fee-recipient=${FEE_RECIPIENT}
       - --validator-monitor-auto

diff --git a/cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
-      - --eth1=${EC_API_URL}
+      - --eth1
       - --debug-level=${CC_LOG_LEVEL}
       - --suggested-fee-recipient=${FEE_RECIPIENT}
       - --validator-monitor-auto

diff --git a/cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml
@@ -85,7 +85,7 @@ services:
       - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
-      - --eth1=${EC_API_URL}
+      - --eth1
       - --debug-level=${CC_LOG_LEVEL}
       - --suggested-fee-recipient=${FEE_RECIPIENT}
       - --validator-monitor-auto

diff --git a/cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml
@@ -85,7 +85,7 @@ services:
     - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
-    - --eth1=${EC_API_URL}
+    - --eth1
     - --debug-level=${CC_LOG_LEVEL}
     - --suggested-fee-recipient=${FEE_RECIPIENT}
     - --validator-monitor-auto

diff --git a/cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml
@@ -86,7 +86,7 @@ services:
     - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
-    - --eth1=${EC_API_URL}
+    - --eth1
     - --debug-level=${CC_LOG_LEVEL}
     - --suggested-fee-recipient=${FEE_RECIPIENT}
     - --validator-monitor-auto

diff --git a/cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml
@@ -47,7 +47,7 @@ services:
       - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
-      - --eth1=${EC_API_URL}
+      - --eth1
       - --debug-level=${CC_LOG_LEVEL}
       - --suggested-fee-recipient=${FEE_RECIPIENT}
       - --validator-monitor-auto

diff --git a/cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml
@@ -71,7 +71,7 @@ services:
       - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
-      - --eth1=${EC_API_URL}
+      - --eth1
       - --debug-level=${CC_LOG_LEVEL}
       - --suggested-fee-recipient=${FEE_RECIPIENT}
       - --validator-monitor-auto

diff --git a/cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml
@@ -85,7 +85,7 @@ services:
       - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
-      - --eth1=${EC_API_URL}
+      - --eth1
       - --debug-level=${CC_LOG_LEVEL}
       - --suggested-fee-recipient=${FEE_RECIPIENT}
       - --validator-monitor-auto

diff --git a/cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml
@@ -85,7 +85,7 @@ services:
       - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
-      - --eth1=${EC_API_URL}
+      - --eth1
       - --debug-level=${CC_LOG_LEVEL}
       - --suggested-fee-recipient=${FEE_RECIPIENT}
       - --validator-monitor-auto

diff --git a/cli/testdata/run_tests/no_env/docker-compose.yml b/cli/testdata/run_tests/no_env/docker-compose.yml
@@ -88,7 +88,7 @@ services:
     - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
-    - --eth1=${EC_API_URL}
+    - --eth1
     - --debug-level=${CC_LOG_LEVEL}
     - --validator-monitor-auto
     - --subscribe-all-subnets

diff --git a/cli/testdata/run_tests/no_version/docker-compose.yml b/cli/testdata/run_tests/no_version/docker-compose.yml
@@ -87,7 +87,7 @@ services:
     - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
-    - --eth1=${EC_API_URL}
+    - --eth1
     - --debug-level=${CC_LOG_LEVEL}
     - --validator-monitor-auto
     - --subscribe-all-subnets

diff --git a/cli/testdata/run_tests/valid/docker-compose.yml b/cli/testdata/run_tests/valid/docker-compose.yml
@@ -87,7 +87,7 @@ services:
     - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
-    - --eth1=${EC_API_URL}
+    - --eth1
     - --debug-level=${CC_LOG_LEVEL}
     - --validator-monitor-auto
     - --subscribe-all-subnets

diff --git a/configs/client_images.yaml b/configs/client_images.yaml
@@ -1,39 +1,39 @@
 execution:
   geth:
     name: ethereum/client-go
-    version: v1.13.14
+    version: v1.14.6
   besu:
     name: hyperledger/besu
-    version: 24.3.0
+    version: 24.6.0
   nethermind:
     name: nethermind/nethermind
-    version: 1.25.4
+    version: 1.27.0
   erigon:
     name: thorax/erigon
-    version: v2.58.1
+    version: v2.60.2
 consensus:
   lighthouse:
     name: sigp/lighthouse
-    version: v5.0.0
+    version: v5.2.1
   lodestar:
     name: chainsafe/lodestar
-    version: v1.16.0
+    version: v1.19.0
   teku:
     name: consensys/teku
-    version: 24.3.0
+    version: 24.6.1
   prysm:
     name: gcr.io/prysmaticlabs/prysm/beacon-chain
-    version: v5.0.0
+    version: v5.0.4
 validator:
   lighthouse:
     name: sigp/lighthouse
-    version: v5.0.0
+    version: v5.2.1
   lodestar:
     name: chainsafe/lodestar
-    version: v1.16.0
+    version: v1.19.0
   teku:
     name: consensys/teku
-    version: 24.3.0
+    version: 24.6.1
   prysm:
     name: gcr.io/prysmaticlabs/prysm/validator
-    version: v5.0.0
+    version: v5.0.4
diff --git a/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml
@@ -88,7 +88,7 @@ services:
     - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
-    - --eth1=${EC_API_URL}
+    - --eth1
     - --debug-level=${CC_LOG_LEVEL}
     - --validator-monitor-auto
     - --subscribe-all-subnets

diff --git a/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml
@@ -87,7 +87,7 @@ services:
     - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
-    - --eth1=${EC_API_URL}
+    - --eth1
     - --debug-level=${CC_LOG_LEVEL}
     - --validator-monitor-auto
     - --subscribe-all-subnets

diff --git a/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml
@@ -88,7 +88,7 @@ services:
     - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
-    - --eth1=${EC_API_URL}
+    - --eth1
     - --debug-level=${CC_LOG_LEVEL}
     - --validator-monitor-auto
     - --subscribe-all-subnets

diff --git a/templates/services/merge/consensus/lighthouse.tmpl b/templates/services/merge/consensus/lighthouse.tmpl
@@ -38,7 +38,7 @@
       - --boot-nodes={{.CCBootnodes}}{{end}}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
-      - --eth1=${EC_API_URL}{{range $url := .FallbackELUrls}},{{$url}}{{end}}
+      - --eth1
       - --debug-level=${CC_LOG_LEVEL}{{with .FeeRecipient}}
       - --suggested-fee-recipient=${FEE_RECIPIENT}{{end}}
       - --validator-monitor-auto