Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add prysm to holesky #337

Merged
merged 4 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 3 additions & 12 deletions cli/cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/commands/clients.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 13 additions & 0 deletions templates/envs/holesky/consensus/prysm.tmpl
Original file line number Diff line number Diff line change
@@ -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 }}
13 changes: 13 additions & 0 deletions templates/envs/holesky/validator/prysm.tmpl
Original file line number Diff line number Diff line change
@@ -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 }}