Skip to content

Commit 398245d

Browse files
khalifaa55khalifaa55
authored
Remove support for Goerli (#372)
* Removed Goerli from NetworkSupported and adjusted networks test * Removed Goerli from templates/envs * Removed Goerli from templates/envs * Mentioned Goerli support removal in the changelog, goerli.mdx, and README * Fixed TestSupportMEVBoost * Removed Georli from TestGenerativeEnvFile * Adjusted Test case 6 in TestCheckVariable * Removed Georli from networks list for TestSupportedNetworks * Removed Goerli from cli.go * Adjusted test cli_test.go "consensus node" network into NetworkMainnet * Replaced Goerli network from test cases in generate_test.go with valid networks * Removed Goerli from GenerateCmd() * Replaced Goerli in test cases with Mainnet * Removed Goerli from KeysCmd() * Removed Goerli from FullNodeSubCmd() * Removed NetworkGoerli * Fixed index_out_of_range error in Holesky related test cases in "Select network" * Adjusted error in TestCli regarding "consensus node" test case * Update cli/sub_gen.go * docs: Update cli.mdx * docs: Update clients.mdx * docs: Update generate.mdx * docs: Update keys.mdx * docs: Update networks.mdx * docs: Replace Goerli with Sepolia in run-validator-mev[network].md * docs: Remove Goerli from documentations * feat: remove Goerli from ImportKeys and associated tests * docs: remove Goerli from docs
1 parent 4d41a7d commit 398245d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+75
-337
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
- Update client images to Dencun-ready versions.
1313
-
14+
15+
### Removed
16+
- Removed support for Goerli.
17+
1418
## [v1.3.1] - 2024-02-14
1519

1620
### Fixed

‎README.md

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Sedge is a one-click node setup tool for PoS network/chain validators and nodes
2828
- [Supported networks and clients](#supported-networks-and-clients)
2929
- [Mainnet](#mainnet)
3030
- [Sepolia](#sepolia)
31-
- [Goerli](#goerli)
3231
- [Holesky](#holesky)
3332
- [Gnosis](#gnosis)
3433
- [Chiado (Gnosis testnet)](#chiado-gnosis-testnet)
@@ -148,15 +147,6 @@ Users acknowledge that no warranty is being made of a successful installation. S
148147
| Erigon | Prysm | Prysm |
149148
| Besu | Teku | Teku |
150149

151-
### Goerli
152-
153-
| Execution | Consensus | Validator |
154-
| ---------- | ---------- | ---------- |
155-
| Geth | Lighthouse | Lighthouse |
156-
| Nethermind | Lodestar | Lodestar |
157-
| Erigon | Prysm | Prysm |
158-
| Besu | Teku | Teku |
159-
160150
### Holesky
161151

162152
| Execution | Consensus | Validator |
@@ -186,10 +176,10 @@ Users acknowledge that no warranty is being made of a successful installation. S
186176

187177
| Client | Mev-Boost | Networks |
188178
| ---------- | --------- |--------------------------|
189-
| Lighthouse | yes | Mainnet, Goerli, Sepolia |
190-
| Lodestar | yes | Mainnet, Goerli, Sepolia |
191-
| Prysm | yes | Mainnet, Goerli, Sepolia |
192-
| Teku | yes | Mainnet, Goerli, Sepolia |
179+
| Lighthouse | yes | Mainnet, Sepolia |
180+
| Lodestar | yes | Mainnet, Sepolia |
181+
| Prysm | yes | Mainnet, Sepolia |
182+
| Teku | yes | Mainnet, Sepolia |
193183

194184
## Supported Linux flavours for dependency installation
195185

‎cli/actions/importKeys.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func setupLodestarValidatorImport(dockerClient client.APIClient, serviceManager
229229
// CMD
230230
var preset string
231231
switch options.Network {
232-
case "mainnet", "goerli", "sepolia", "holesky":
232+
case "mainnet", "sepolia", "holesky":
233233
preset = "mainnet"
234234
case "gnosis", "chiado":
235235
preset = "gnosis"

‎cli/actions/importKeys_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func TestImportKeys_CustomOptions(t *testing.T) {
174174
customImage bool
175175
}{}
176176
for _, validatorClient := range []string{"prysm", "lodestar"} {
177-
for _, network := range []string{"sepolia", "goerli", "mainnet"} {
177+
for _, network := range []string{"sepolia", "mainnet"} {
178178
tests = append(tests, struct {
179179
client string
180180
network string
@@ -183,7 +183,7 @@ func TestImportKeys_CustomOptions(t *testing.T) {
183183
}
184184
}
185185
for _, validatorClient := range []string{"lighthouse", "teku"} {
186-
for _, network := range []string{"sepolia", "goerli", "mainnet"} {
186+
for _, network := range []string{"sepolia", "mainnet"} {
187187
tests = append(tests, struct {
188188
client string
189189
network string

‎cli/cli.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import (
4040

4141
const (
4242
NetworkMainnet = "mainnet"
43-
NetworkGoerli = "goerli"
4443
NetworkSepolia = "sepolia"
4544
NetworkGnosis = "gnosis"
4645
NetworkChiado = "chiado"
@@ -616,7 +615,7 @@ func runPromptActions(p ui.Prompter, o *CliCmdOptions, actions ...promptAction)
616615
}
617616

618617
func selectNetwork(p ui.Prompter, o *CliCmdOptions) error {
619-
options := []string{NetworkMainnet, NetworkGoerli, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}
618+
options := []string{NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}
620619
index, err := p.Select("Select network", "", options)
621620
if err != nil {
622621
return err

‎cli/cli_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func TestCli(t *testing.T) {
9494
}
9595
sedgeActions.EXPECT().GetCommandRunner().Return(&test.SimpleCMDRunner{})
9696
gomock.InOrder(
97-
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkGoerli, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(0, nil),
97+
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(0, nil),
9898
prompter.EXPECT().Select("Select node type", "", []string{NodeTypeFullNode, NodeTypeExecution, NodeTypeConsensus, NodeTypeValidator}).Return(0, nil),
9999
prompter.EXPECT().Input("Generation path", configs.DefaultAbsSedgeDataPath, false, nil).Return(generationPath, nil),
100100
prompter.EXPECT().Input("Container tag, sedge will add to each container and the network, a suffix with the tag", "", false, nil).Return("tag", nil),
@@ -164,7 +164,7 @@ func TestCli(t *testing.T) {
164164
JWTSecretPath: filepath.Join(generationPath, "jwtsecret"),
165165
}
166166
gomock.InOrder(
167-
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkGoerli, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(0, nil),
167+
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(0, nil),
168168
prompter.EXPECT().Select("Select node type", "", []string{NodeTypeFullNode, NodeTypeExecution, NodeTypeConsensus, NodeTypeValidator}).Return(0, nil),
169169
prompter.EXPECT().Input("Generation path", configs.DefaultAbsSedgeDataPath, false, nil).Return(generationPath, nil),
170170
prompter.EXPECT().Input("Container tag, sedge will add to each container and the network, a suffix with the tag", "", false, nil).Return("tag", nil),
@@ -207,7 +207,7 @@ func TestCli(t *testing.T) {
207207
JWTSecretPath: filepath.Join(generationPath, "jwtsecret"),
208208
}
209209
gomock.InOrder(
210-
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkGoerli, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(5, nil),
210+
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(4, nil),
211211
prompter.EXPECT().Select("Select node type", "", []string{NodeTypeFullNode, NodeTypeExecution, NodeTypeConsensus, NodeTypeValidator}).Return(0, nil),
212212
prompter.EXPECT().Input("Generation path", configs.DefaultAbsSedgeDataPath, false, nil).Return(generationPath, nil),
213213
prompter.EXPECT().Input("Container tag, sedge will add to each container and the network, a suffix with the tag", "", false, nil).Return("tag", nil),
@@ -243,7 +243,7 @@ func TestCli(t *testing.T) {
243243
}
244244

245245
gomock.InOrder(
246-
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkGoerli, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(0, nil),
246+
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(0, nil),
247247
prompter.EXPECT().Select("Select node type", "", []string{NodeTypeFullNode, NodeTypeExecution, NodeTypeConsensus, NodeTypeValidator}).Return(1, nil),
248248
prompter.EXPECT().Input("Generation path", configs.DefaultAbsSedgeDataPath, false, nil).Return(generationPath, nil),
249249
prompter.EXPECT().Input("Container tag, sedge will add to each container and the network, a suffix with the tag", "", false, nil).Return("tag", nil),
@@ -286,7 +286,7 @@ func TestCli(t *testing.T) {
286286
}
287287

288288
gomock.InOrder(
289-
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkGoerli, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(5, nil),
289+
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(4, nil),
290290
prompter.EXPECT().Select("Select node type", "", []string{NodeTypeFullNode, NodeTypeExecution, NodeTypeConsensus, NodeTypeValidator}).Return(1, nil),
291291
prompter.EXPECT().Input("Generation path", configs.DefaultAbsSedgeDataPath, false, nil).Return(generationPath, nil),
292292
prompter.EXPECT().Input("Container tag, sedge will add to each container and the network, a suffix with the tag", "", false, nil).Return("tag", nil),
@@ -323,7 +323,7 @@ func TestCli(t *testing.T) {
323323
Type: "consensus",
324324
Image: configs.ClientImages.Consensus.Lodestar.String(),
325325
},
326-
Network: NetworkGoerli,
326+
Network: NetworkMainnet,
327327
CheckpointSyncUrl: "http://checkpoint.sync",
328328
FeeRecipient: "0x2d07a21ebadde0c13e8b91022a7e5732eb6bf5d5",
329329
MapAllPorts: true,
@@ -335,7 +335,7 @@ func TestCli(t *testing.T) {
335335
}
336336

337337
gomock.InOrder(
338-
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkGoerli, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(1, nil),
338+
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(0, nil),
339339
prompter.EXPECT().Select("Select node type", "", []string{NodeTypeFullNode, NodeTypeExecution, NodeTypeConsensus, NodeTypeValidator}).Return(2, nil),
340340
prompter.EXPECT().Input("Generation path", configs.DefaultAbsSedgeDataPath, false, nil).Return(generationPath, nil),
341341
prompter.EXPECT().Input("Container tag, sedge will add to each container and the network, a suffix with the tag", "", false, nil).Return("tag", nil),
@@ -377,7 +377,7 @@ func TestCli(t *testing.T) {
377377
}
378378

379379
gomock.InOrder(
380-
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkGoerli, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(5, nil),
380+
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(4, nil),
381381
prompter.EXPECT().Select("Select node type", "", []string{NodeTypeFullNode, NodeTypeExecution, NodeTypeConsensus, NodeTypeValidator}).Return(2, nil),
382382
prompter.EXPECT().Input("Generation path", configs.DefaultAbsSedgeDataPath, false, nil).Return(generationPath, nil),
383383
prompter.EXPECT().Input("Container tag, sedge will add to each container and the network, a suffix with the tag", "", false, nil).Return("tag", nil),
@@ -419,7 +419,7 @@ func TestCli(t *testing.T) {
419419
}
420420

421421
gomock.InOrder(
422-
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkGoerli, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(0, nil),
422+
prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky}).Return(0, nil),
423423
prompter.EXPECT().Select("Select node type", "", []string{NodeTypeFullNode, NodeTypeExecution, NodeTypeConsensus, NodeTypeValidator}).Return(3, nil),
424424
prompter.EXPECT().Input("Generation path", configs.DefaultAbsSedgeDataPath, false, nil).Return(generationPath, nil),
425425
prompter.EXPECT().Input("Container tag, sedge will add to each container and the network, a suffix with the tag", "", false, nil).Return("tag", nil),

‎cli/generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ You can generate:
111111
cmd.AddCommand(MevBoostSubCmd(sedgeAction))
112112

113113
cmd.PersistentFlags().StringVarP(&generationPath, "path", "p", configs.DefaultAbsSedgeDataPath, "generation path for sedge data. Default is sedge-data")
114-
cmd.PersistentFlags().StringVarP(&network, "network", "n", "mainnet", "Target network. e.g. mainnet, goerli, sepolia, holesky, gnosis, chiado, etc.")
114+
cmd.PersistentFlags().StringVarP(&network, "network", "n", "mainnet", "Target network. e.g. mainnet,sepolia, holesky, gnosis, chiado, etc.")
115115
cmd.PersistentFlags().StringVar(&logging, "logging", "json", fmt.Sprintf("Docker logging driver used by all the services. Set 'none' to use the default docker logging driver. Possible values: %v", configs.ValidLoggingFlags()))
116116
cmd.PersistentFlags().StringVar(&containerTag, "container-tag", "", "Container tag to use. If defined, sedge will add to each container and the network, a suffix with the tag. e.g. sedge-validator-client -> sedge-validator-client-<tag>.")
117117
return cmd

‎cli/generate_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@ func TestGenerateCmd(t *testing.T) {
11021102
consensusApiUrl: "http://localhost:4000",
11031103
},
11041104
globalFlags{
1105-
network: "goerli",
1105+
network: "holesky",
11061106
},
11071107
nil,
11081108
},
@@ -1117,7 +1117,7 @@ func TestGenerateCmd(t *testing.T) {
11171117
consensusApiUrl: "localhost/4000",
11181118
},
11191119
globalFlags{
1120-
network: "goerli",
1120+
network: "gnosis",
11211121
},
11221122
fmt.Errorf(configs.InvalidUrlFlagError, "consensus api", "localhost/4000"),
11231123
},
@@ -1147,7 +1147,7 @@ func TestGenerateCmd(t *testing.T) {
11471147
consensusApiUrl: "localhost:4000",
11481148
},
11491149
globalFlags{
1150-
network: "goerli",
1150+
network: "gnosis",
11511151
},
11521152
fmt.Errorf(configs.InvalidUrlFlagError, "consensus api", "localhost:4000"),
11531153
},
@@ -1223,7 +1223,7 @@ func TestGenerateCmd(t *testing.T) {
12231223
graffiti: "sedge-graffiti-sedge",
12241224
},
12251225
globalFlags{
1226-
network: "goerli",
1226+
network: "holesky",
12271227
},
12281228
fmt.Errorf(configs.ErrGraffitiLength, "sedge-graffiti-sedge", 20),
12291229
},

‎cli/importKeys_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestImportKeys_NumberOfArguments(t *testing.T) {
4343
},
4444
{
4545
name: "with flags",
46-
args: []string{"--network", "goerli"},
46+
args: []string{"--network", "mainnet"},
4747
},
4848
}
4949
for _, tt := range tests {
@@ -85,7 +85,7 @@ func TestImportKeys_ArgsAndFlags(t *testing.T) {
8585
name: "with flags",
8686
args: []string{
8787
"prysm",
88-
"--network", "goerli",
88+
"--network", "mainnet",
8989
"--from", "/tmp/keystore",
9090
"--path", "/tmp/sedge",
9191
"--start-validator",
@@ -96,7 +96,7 @@ func TestImportKeys_ArgsAndFlags(t *testing.T) {
9696
},
9797
expectedOptions: actions.ImportValidatorKeysOptions{
9898
ValidatorClient: "prysm",
99-
Network: "goerli",
99+
Network: "mainnet",
100100
StartValidator: true,
101101
GenerationPath: "/tmp/sedge",
102102
From: "/tmp/keystore",
@@ -106,7 +106,7 @@ func TestImportKeys_ArgsAndFlags(t *testing.T) {
106106
name: "with shorthand flags",
107107
args: []string{
108108
"teku",
109-
"-n", "goerli",
109+
"-n", "mainnet",
110110
"--from", "/tmp/keystore",
111111
"-p", "/tmp/sedge",
112112
"--stop-validator",
@@ -117,7 +117,7 @@ func TestImportKeys_ArgsAndFlags(t *testing.T) {
117117
},
118118
expectedOptions: actions.ImportValidatorKeysOptions{
119119
ValidatorClient: "teku",
120-
Network: "goerli",
120+
Network: "mainnet",
121121
From: "/tmp/keystore",
122122
GenerationPath: "/tmp/sedge",
123123
StopValidator: true,

‎cli/keys.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func KeysCmd(cmdRunner commands.CommandRunner, p ui.Prompter) *cobra.Command {
181181
},
182182
}
183183
// Flag binds
184-
cmd.Flags().StringVarP(&flags.network, "network", "n", "mainnet", "Target network. e.g. mainnet, goerli, sepolia, holesky, gnosis, chiado etc.")
184+
cmd.Flags().StringVarP(&flags.network, "network", "n", "mainnet", "Target network. e.g. mainnet,sepolia, holesky, gnosis, chiado etc.")
185185
cmd.Flags().StringVarP(&flags.path, "path", "p", configs.DefaultAbsSedgeDataPath, "Absolute path to keystore folder. e.g. /home/user/keystore")
186186
cmd.Flags().StringVar(&flags.eth1WithdrawalAddress, "eth1-withdrawal-address", "", "If this field is set and valid, the given Eth1 address will be used to create the withdrawal credentials. Otherwise, it will generate withdrawal credentials with the mnemonic-derived withdrawal public key in EIP-2334 format.")
187187
cmd.Flags().StringVar(&flags.mnemonicPath, "mnemonic-path", "", "Path to file with a existing mnemonic to use.")

0 commit comments

Comments
 (0)