Merge branch 'develop' into dependabot/go_modules/github.com/docker/d…

…ocker-24.0.7incompatible

.github/workflows/check-version.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - develop
+  workflow_dispatch:
 
 jobs:
   build:

README.md

@@ -164,7 +164,7 @@ Users acknowledge that no warranty is being made of a successful installation. S
 | Geth       | Lighthouse | Lighthouse |
 | Nethermind | Lodestar   | Lodestar   |
 | Erigon     | Teku       | Teku       |
-| Besu       |            |            |
+| Besu       | Prysm      | Prysm      |
 
 ### Gnosis
 

cli/cli_test.go

@@ -55,15 +55,6 @@ func TestCli(t *testing.T) {
 	GnosisClients["consensus"] = append(GnosisClients["consensus"], "randomize")
 	GnosisClients["validator"] = append(GnosisClients["validator"], "randomize")
 
-	HoleskyClients := map[string][]string{
-		"execution": clients.AllClients["execution"],
-		"consensus": utils.Filter(clients.AllClients["consensus"], func(c string) bool { return c != "prysm" }),
-		"validator": utils.Filter(clients.AllClients["validator"], func(c string) bool { return c != "prysm" }),
-	}
-	HoleskyClients["execution"] = append(HoleskyClients["execution"], "randomize")
-	HoleskyClients["consensus"] = append(HoleskyClients["consensus"], "randomize")
-	HoleskyClients["validator"] = append(HoleskyClients["validator"], "randomize")
-
 	tests := []struct {
 		name  string
 		setup func(*testing.T, *sedge_mocks.MockSedgeActions, *sedge_mocks.MockPrompter, *sedge_mocks.MockDependenciesManager)
@@ -221,8 +212,8 @@ func TestCli(t *testing.T) {
 					prompter.EXPECT().Input("Generation path", configs.DefaultAbsSedgeDataPath, false, nil).Return(generationPath, nil),
 					prompter.EXPECT().Input("Container tag, sedge will add to each container and the network, a suffix with the tag", "", false, nil).Return("tag", nil),
 					prompter.EXPECT().Confirm("Do you want to set up a validator?", true).Return(false, nil),
-					prompter.EXPECT().Select("Select execution client", "", HoleskyClients["execution"]).Return(0, nil),
-					prompter.EXPECT().Select("Select consensus client", "", HoleskyClients["consensus"]).Return(2, nil),
+					prompter.EXPECT().Select("Select execution client", "", ETHClients["execution"]).Return(0, nil),
+					prompter.EXPECT().Select("Select consensus client", "", ETHClients["consensus"]).Return(3, nil),
 					prompter.EXPECT().InputURL("Checkpoint sync URL", configs.NetworksConfigs()[genData.Network].CheckpointSyncURL, false).Return("https://checkpoint-sync.holesky.ethpandaops.io/", nil),
 					prompter.EXPECT().EthAddress("Please enter the Fee Recipient address (press enter to skip it)", "", false).Return("0x2d07a21ebadde0c13e6b91022a7e5722eb6bf5d5", nil),
 					prompter.EXPECT().Confirm("Do you want to expose all ports?", false).Return(true, nil),
@@ -390,7 +381,7 @@ func TestCli(t *testing.T) {
 					prompter.EXPECT().Select("Select node type", "", []string{NodeTypeFullNode, NodeTypeExecution, NodeTypeConsensus, NodeTypeValidator}).Return(2, nil),
 					prompter.EXPECT().Input("Generation path", configs.DefaultAbsSedgeDataPath, false, nil).Return(generationPath, nil),
 					prompter.EXPECT().Input("Container tag, sedge will add to each container and the network, a suffix with the tag", "", false, nil).Return("tag", nil),
-					prompter.EXPECT().Select("Select consensus client", "", HoleskyClients["consensus"]).Return(2, nil),
+					prompter.EXPECT().Select("Select consensus client", "", ETHClients["consensus"]).Return(3, nil),
 					prompter.EXPECT().InputURL("Checkpoint sync URL", configs.NetworksConfigs()[genData.Network].CheckpointSyncURL, false).Return("https://checkpoint-sync.holesky.ethpandaops.io/", nil),
 					prompter.EXPECT().InputURL("Execution API URL", "", true).Return("http://execution:5051", nil),
 					prompter.EXPECT().InputURL("Execution Auth API URL", "", true).Return("http://execution:5051", nil),

configs/client_images.yaml

@@ -1,26 +1,26 @@
 execution:
   geth:
     name: ethereum/client-go
-    version: v1.13.4
+    version: v1.13.5
   besu:
     name: hyperledger/besu
-    version: 23.7.2
+    version: 23.10.2
   nethermind:
     name: nethermind/nethermind
-    version: 1.21.1
+    version: 1.23.0
   erigon:
     name: thorax/erigon
-    version: v2.53.1
+    version: v2.55.1
 consensus:
   lighthouse:
     name: sigp/lighthouse
     version: v4.5.0
   lodestar:
     name: chainsafe/lodestar
-    version: v1.11.3
+    version: v1.12.0
   teku:
     name: consensys/teku
-    version: 23.9.0
+    version: 23.11.0
   prysm:
     name: gcr.io/prysmaticlabs/prysm/beacon-chain
     version: v4.1.1
@@ -30,10 +30,10 @@ validator:
     version: v4.5.0
   lodestar:
     name: chainsafe/lodestar
-    version: v1.11.3
+    version: v1.12.0
   teku:
     name: consensys/teku
-    version: 23.9.0
+    version: 23.11.0
   prysm:
     name: gcr.io/prysmaticlabs/prysm/validator
     version: v4.1.1

docs/docs/commands/clients.mdx

@@ -73,7 +73,7 @@ $ sedge clients
  1   nethermind          lighthouse          lighthouse
  2   geth                teku                teku
  3   erigon              lodestar            lodestar
- 4   besu                -                   -
+ 4   besu                prysm               prysm
 
 2023-10-13 14:13:45 -- [INFO] Listing supported clients for network mainnet
 

templates/envs/holesky/consensus/prysm.tmpl

@@ -0,0 +1,13 @@
+{{/* prysm.tmpl */}}
+{{ define "consensus" }}
+# --- Consensus Layer - Beacon Node - configuration ---
+CC_PEER_COUNT=50
+CC_LOG_LEVEL=info
+EC_API_URL={{.ExecutionApiURL}}
+EC_AUTH_URL={{.ExecutionAuthURL}}
+CC_INSTANCE_NAME=Prysm
+CC_IMAGE_VERSION={{.CcImage}}
+CC_DATA_DIR={{.CcDataDir}}
+CC_JWT_SECRET_PATH={{.JWTSecretPath}}
+{{if .CheckpointSyncUrl}}CHECKPOINT_SYNC_URL={{.CheckpointSyncUrl}}{{end}}
+{{ end }}

templates/envs/holesky/validator/prysm.tmpl

@@ -0,0 +1,13 @@
+{{/* prysm.tmpl */}}
+{{ define "validator" }}
+# --- Consensus Layer - Validator Node - configuration ---
+CC_API_URL={{.ConsensusApiURL}}
+CC_ADD_API_URL={{.ConsensusAdditionalApiURL}}
+GRAFFITI={{.Graffiti}}
+VL_LOG_LEVEL=info
+VL_INSTANCE_NAME=PrysmValidator
+VL_IMAGE_VERSION={{.VlImage}}
+KEYSTORE_DIR={{.KeystoreDir}}
+WALLET_DIR=./wallet
+VL_DATA_DIR={{.VlDataDir}}
+{{ end }}

templates/services/merge/consensus/teku.tmpl

@@ -1,7 +1,7 @@
 {{/* teku.tmpl */}}
 {{ define "consensus" }}
-  consensus:{{if and (ge .UID 0) (ge .GID 0)}}
-    user: "{{.UID}}:{{.GID}}"{{end}}
+  consensus:
+    user: "root:root"
     stop_grace_period: 30s
     container_name: sedge-consensus-client{{if .ContainerTag}}-{{.ContainerTag}}{{end}}
     restart: unless-stopped

templates/services/merge/validator/teku.tmpl

@@ -1,7 +1,7 @@
 {{/* teku.tmpl */}}
 {{ define "validator" }}
-  validator:{{if and (ge .UID 0) (ge .GID 0)}}
-    user: "{{.UID}}:{{.GID}}"{{end}}
+  validator:
+    user: "root:root"
     container_name: sedge-validator-client{{if .ContainerTag}}-{{.ContainerTag}}{{end}}
     image: ${VL_IMAGE_VERSION}
     depends_on: