fix: Remove cli commands bugs (#511)

khalifaa55 · AntiD2ta · web-flow · commit 391fdbacaeae · 2025-04-16T13:03:08.000+02:00
* fix: Keys command for hoodi

* fix: Update validator-blocker script

* test(config): improve NetworkCheck unit tests

* fix: Update lido-status command

* fix: withdrawal credentials on cli

* fix: nimbus keys import containers

* chore: Update changelog

* fix: add consensus setup for nimbus keys

* fix: Update nimbus cli test

* fix: withdrawal address for eth nodes

---------

Co-authored-by: AntiD2ta &lt;mtpotro41@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Fixed
+- Fix `keys` command for `hoodi` network.
+- Update `lido-status` command links.
+- Fix `withdrawal_credentials` for lido node.
+- Fix importing keys for `nimbus` client.
+
 ## [v1.9.0] - 2025-03-27
 
 ### Added
diff --git a/cli/cli.go b/cli/cli.go
@@ -495,13 +495,14 @@ func generateKeystore(p ui.Prompter, o *CliCmdOptions, a actions.SedgeActions, d
 		// TODO: Create an Action for keystore generation
 		log.Info("Generating keystores...")
 		data := keystores.ValidatorKeysGenData{
-			Mnemonic:    o.keystoreMnemonic,
-			Passphrase:  o.keystorePassphrase,
-			OutputPath:  o.keystorePath,
-			MinIndex:    uint64(o.existingValidators),
-			MaxIndex:    uint64(o.existingValidators) + uint64(o.numberOfValidators),
-			NetworkName: o.genData.Network,
-			ForkVersion: configs.NetworksConfigs()[o.genData.Network].GenesisForkVersion,
+			Mnemonic:          o.keystoreMnemonic,
+			Passphrase:        o.keystorePassphrase,
+			OutputPath:        o.keystorePath,
+			MinIndex:          uint64(o.existingValidators),
+			MaxIndex:          uint64(o.existingValidators) + uint64(o.numberOfValidators),
+			NetworkName:       o.genData.Network,
+			ForkVersion:       configs.NetworksConfigs()[o.genData.Network].GenesisForkVersion,
+			WithdrawalAddress: o.withdrawalAddress[2:],
 			// Constants
 			UseUniquePassphrase: true,
 			Insecure:            false,
@@ -540,10 +541,17 @@ func generateKeystore(p ui.Prompter, o *CliCmdOptions, a actions.SedgeActions, d
 	if err := checkCLIDependencies(p, o, a, depsMgr); err != nil {
 		return err
 	}
+
+	var services []string
+	if o.genData.ValidatorClient.Name == "nimbus" {
+		services = []string{validator, consensus}
+	} else {
+		services = []string{validator}
+	}
 	log.Info("Importing validator keys into the validator client...")
 	err := a.SetupContainers(actions.SetupContainersOptions{
 		GenerationPath: o.generationPath,
-		Services:       []string{validator},
+		Services:       services,
 	})
 	if err != nil {
 		return err
@@ -1000,7 +1008,7 @@ func inputWithdrawalAddress(p ui.Prompter, o *CliCmdOptions) (err error) {
 	opts := sedgeOpts.CreateSedgeOptions(o.nodeSetup)
 	withdrawalAddress := opts.WithdrawalAddress(o.genData.Network)
 	if opts.OverwriteSettings().WithdrawalAddress {
-		o.withdrawalAddress = withdrawalAddress
+		o.withdrawalAddress = withdrawalAddress[2:]
 		return
 	}
 	o.withdrawalAddress, err = p.Input("Withdrawal address", "", false, func(s string) error { return ui.EthAddressValidator(s, true) })
diff --git a/cli/cli_test.go b/cli/cli_test.go
@@ -126,7 +126,7 @@ func TestCli(t *testing.T) {
 					prompter.EXPECT().Select("Select keystore source", "", []string{SourceTypeCreate, SourceTypeExisting, SourceTypeSkip}).Return(0, nil),
 					prompter.EXPECT().Select("Select mnemonic source", "", []string{SourceTypeCreate, SourceTypeExisting}).Return(0, nil),
 					prompter.EXPECT().Select("Select passphrase source", "", []string{SourceTypeRandom, SourceTypeExisting, SourceTypeCreate}).Return(0, nil),
-					prompter.EXPECT().Input("Withdrawal address", "", false, gomock.AssignableToTypeOf(func(s string) error { return ui.EthAddressValidator(s, true) })).Return("0x00000007abca72jmd83jd8u3jd9kdn32j38abc", nil),
+					prompter.EXPECT().Input("Withdrawal address", "", false, gomock.AssignableToTypeOf(func(s string) error { return ui.EthAddressValidator(s, true) })).Return("0x2d07a21ebadde0c13e6b91022a7e5722eb6bf5d5", nil),
 					prompter.EXPECT().InputInt64("Number of validators", int64(1)).Return(int64(1), nil),
 					prompter.EXPECT().InputInt64("Existing validators. This number will be used as the initial index for the generated keystores.", int64(0)).Return(int64(0), nil),
 					depsMgr.EXPECT().Check([]string{dependencies.Docker}).Return([]string{dependencies.Docker}, nil),
@@ -746,7 +746,7 @@ func TestCli(t *testing.T) {
 					prompter.EXPECT().Select("Select keystore source", "", []string{SourceTypeCreate, SourceTypeExisting, SourceTypeSkip}).Return(0, nil),
 					prompter.EXPECT().Select("Select mnemonic source", "", []string{SourceTypeCreate, SourceTypeExisting}).Return(0, nil),
 					prompter.EXPECT().Select("Select passphrase source", "", []string{SourceTypeRandom, SourceTypeExisting, SourceTypeCreate}).Return(0, nil),
-					prompter.EXPECT().Input("Withdrawal address", "", false, gomock.AssignableToTypeOf(func(s string) error { return ui.EthAddressValidator(s, true) })).Return("0x00000007abca72jmd83jd8u3jd9kdn32j38abc", nil),
+					prompter.EXPECT().Input("Withdrawal address", "", false, gomock.AssignableToTypeOf(func(s string) error { return ui.EthAddressValidator(s, true) })).Return("0x2d07a21ebadde0c13e6b91022a7e5722eb6bf5d5", nil),
 					prompter.EXPECT().InputInt64("Number of validators", int64(1)).Return(int64(1), nil),
 					prompter.EXPECT().InputInt64("Existing validators. This number will be used as the initial index for the generated keystores.", int64(0)).Return(int64(0), nil),
 					depsMgr.EXPECT().Check([]string{dependencies.Docker}).Return([]string{dependencies.Docker}, nil),
@@ -847,6 +847,89 @@ func TestCli(t *testing.T) {
 				)
 			},
 		},
+		{
+			name: "full node with nimbus validator mainnet",
+			setup: func(t *testing.T, sedgeActions *sedge_mocks.MockSedgeActions, prompter *sedge_mocks.MockPrompter, depsMgr *sedge_mocks.MockDependenciesManager) {
+				generationPath := t.TempDir()
+				genData := generate.GenData{
+					Services: []string{"execution", "consensus", "validator", "mev-boost"},
+					ExecutionClient: &clients.Client{
+						Name:  "nethermind",
+						Type:  "execution",
+						Image: configs.ClientImages.Execution.Nethermind.String(),
+					},
+					ConsensusClient: &clients.Client{
+						Name:  "nimbus",
+						Type:  "consensus",
+						Image: configs.ClientImages.Consensus.Nimbus.String(),
+					},
+					ValidatorClient: &clients.Client{
+						Name:  "nimbus",
+						Type:  "validator",
+						Image: configs.ClientImages.Validator.Nimbus.String(),
+					},
+					Network:            "mainnet",
+					CheckpointSyncUrl:  "http://checkpoint.sync",
+					FeeRecipient:       "0x2d07a21ebadde0c13e6b91022a7e5722eb6bf5d5",
+					MapAllPorts:        true,
+					Graffiti:           "test graffiti",
+					VLStartGracePeriod: 840,
+					Mev:                true,
+					MevImage:           "flashbots/mev-boost:latest",
+					RelayURLs:          configs.NetworksConfigs()[NetworkMainnet].RelayURLs,
+					ContainerTag:       "tag",
+					JWTSecretPath:      filepath.Join(generationPath, "jwtsecret"),
+				}
+				sedgeActions.EXPECT().GetCommandRunner().Return(&test.SimpleCMDRunner{})
+				gomock.InOrder(
+					prompter.EXPECT().Select("Select node setup", "", []string{sedgeOpts.EthereumNode, sedgeOpts.LidoNode}).Return(0, nil),
+					prompter.EXPECT().Select("Select network", "", []string{NetworkMainnet, NetworkHoodi, NetworkHolesky, NetworkSepolia, NetworkGnosis, NetworkChiado}).Return(0, nil),
+					prompter.EXPECT().Select("Select node type", "", []string{NodeTypeFullNode, NodeTypeExecution, NodeTypeConsensus, NodeTypeValidator}).Return(0, 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().Confirm("Do you want to set up a validator?", true).Return(true, nil),
+					prompter.EXPECT().Confirm("Enable MEV Boost?", true).Return(true, nil),
+					prompter.EXPECT().Input("Mev-Boost image", "flashbots/mev-boost:latest", false, nil).Return("flashbots/mev-boost:latest", nil),
+					prompter.EXPECT().InputList("Insert relay URLs if you don't want to use the default values listed below", configs.NetworksConfigs()[NetworkMainnet].RelayURLs, gomock.AssignableToTypeOf(func([]string) error { return nil })).Return(configs.NetworksConfigs()[NetworkMainnet].RelayURLs, nil),
+					prompter.EXPECT().Select("Select execution client", "", ETHClients["execution"]).Return(0, nil),
+					prompter.EXPECT().Select("Select consensus client", "", ETHClients["consensus"]).Return(4, nil),
+					prompter.EXPECT().Select("Select validator client", "", ETHClients["validator"]).Return(4, nil),
+					prompter.EXPECT().InputInt64("Validator grace period. This is the number of epochs the validator will wait for security reasons before starting", int64(1)).Return(int64(2), nil),
+					prompter.EXPECT().Input("Graffiti to be used by the validator (press enter to skip it)", "", false, gomock.AssignableToTypeOf(ui.GraffitiValidator)).Return("test graffiti", nil),
+					prompter.EXPECT().InputURL("Checkpoint sync URL", configs.NetworksConfigs()[genData.Network].CheckpointSyncURL, false).Return("http://checkpoint.sync", nil),
+					prompter.EXPECT().EthAddress("Please enter the Fee Recipient address", "", true).Return("0x2d07a21ebadde0c13e6b91022a7e5722eb6bf5d5", nil),
+					prompter.EXPECT().Confirm("Do you want to expose all ports?", false).Return(true, nil),
+					prompter.EXPECT().Select("Select JWT source", "", []string{SourceTypeCreate, SourceTypeExisting}).Return(0, nil),
+					prompter.EXPECT().Confirm("Do you want to enable the monitoring stack?", false).Return(false, nil),
+					sedgeActions.EXPECT().Generate(gomock.Eq(actions.GenerateOptions{
+						GenerationPath: generationPath,
+						GenerationData: genData,
+					})).Return(genData, nil),
+					prompter.EXPECT().Select("Select keystore source", "", []string{SourceTypeCreate, SourceTypeExisting, SourceTypeSkip}).Return(0, nil),
+					prompter.EXPECT().Select("Select mnemonic source", "", []string{SourceTypeCreate, SourceTypeExisting}).Return(0, nil),
+					prompter.EXPECT().Select("Select passphrase source", "", []string{SourceTypeRandom, SourceTypeExisting, SourceTypeCreate}).Return(0, nil),
+					prompter.EXPECT().Input("Withdrawal address", "", false, gomock.AssignableToTypeOf(func(s string) error { return ui.EthAddressValidator(s, true) })).Return("0x2d07a21ebadde0c13e6b91022a7e5722eb6bf5d5", nil),
+					prompter.EXPECT().InputInt64("Number of validators", int64(1)).Return(int64(1), nil),
+					prompter.EXPECT().InputInt64("Existing validators. This number will be used as the initial index for the generated keystores.", int64(0)).Return(int64(0), nil),
+					depsMgr.EXPECT().Check([]string{dependencies.Docker}).Return([]string{dependencies.Docker}, nil),
+					depsMgr.EXPECT().DockerEngineIsOn().Return(nil),
+					depsMgr.EXPECT().DockerComposeIsInstalled().Return(nil),
+					sedgeActions.EXPECT().SetupContainers(actions.SetupContainersOptions{
+						GenerationPath: generationPath,
+						Services:       []string{"validator", "consensus"},
+					}),
+					sedgeActions.EXPECT().ImportValidatorKeys(actions.ImportValidatorKeysOptions{
+						ValidatorClient: "nimbus",
+						Network:         NetworkMainnet,
+						GenerationPath:  generationPath,
+						From:            filepath.Join(generationPath, "keystore"),
+						ContainerTag:    "tag",
+					}).Return(nil),
+					prompter.EXPECT().Confirm("Do you want to import slashing protection data?", false).Return(false, nil),
+					prompter.EXPECT().Confirm("Run services now?", false).Return(false, nil),
+				)
+			},
+		},
 	}
 
 	for _, tt := range tests {
diff --git a/cli/keys.go b/cli/keys.go
@@ -215,7 +215,7 @@ func KeysCmd(cmdRunner commands.CommandRunner, p ui.Prompter) *cobra.Command {
 	}
 	// Flag binds
 	cmd.PersistentFlags().BoolVar(&flags.lidoNode, "lido", false, "Enable Lido CSM compatible keys. Similar to using --eth-withdrawal-address with the Lido Withdrawal Vault address.")
-	cmd.Flags().StringVarP(&flags.network, "network", "n", "mainnet", "Target network. e.g. mainnet,sepolia, holesky, gnosis, chiado etc.")
+	cmd.Flags().StringVarP(&flags.network, "network", "n", "mainnet", "Target network. e.g. mainnet, hoodi, sepolia, holesky, gnosis, chiado etc.")
 	cmd.Flags().StringVarP(&flags.path, "path", "p", configs.DefaultAbsSedgeDataPath, "Absolute path to keystore folder. e.g. /home/user/keystore")
 	cmd.Flags().StringVar(&flags.ethWithdrawalAddress, "eth-withdrawal-address", "", "If this field is set and valid, the given Eth 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.")
 	cmd.Flags().StringVar(&flags.mnemonicPath, "mnemonic-path", "", "Path to file with a existing mnemonic to use.")
diff --git a/cli/lidoStatus.go b/cli/lidoStatus.go
@@ -61,7 +61,7 @@ func LidoStatusCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "lido-status [flags] [args]",
 		Short: "Display status and information of Lido Node Operator",
-		Long: `This command retrieves and displays the status and detailed information of Lido Node Operators. 
+		Long: `This command retrieves and displays the status and detailed information of Lido Node Operators.
 
 This information includes:
 - Node Operator ID.
@@ -95,7 +95,7 @@ Valid args: reward address of Node Operator (rewards recipient)`,
 			return nil
 		},
 	}
-	cmd.Flags().StringVarP(&networkName, "network", "n", "holesky", "Target network. e.g. holesky, mainnet etc.")
+	cmd.Flags().StringVarP(&networkName, "network", "n", "holesky", "Target network. e.g. holesky, mainnet, hoodi etc.")
 	cmd.Flags().BoolVar(&longDescriptions, "l", false, "Show detailed descriptions for each value")
 	cmd.Flags().Int64VarP(&nodeIDInt, "nodeID", "i", -1, "Your Node Operator ID (optional)")
 	cmd.Flags().SortFlags = false
@@ -213,44 +213,45 @@ func buildLidoData(node *lidoData) map[string]struct {
 } {
 	var nodeOpDetailed, keysDetailed, queueDetailed, bondDetailed, rewardsDetailed string
 	var currentBond, requiredBond, excessBond, missedBond, rewards decimal.Decimal
-	rewardAddressLink := fmt.Sprintf(`https://etherscan.io/address/%s`, node.nodeInfo.RewardAddress)
+
 	var prefix string
 	if networkName == "mainnet" {
 		prefix = ""
 	} else {
 		prefix = networkName + "."
 	}
 	claimRewardsLink := fmt.Sprintf(`https://%setherscan.io/address/%s#writeProxyContract#F10`, prefix, contracts.DeployedAddresses(contracts.CSModule)[networkName])
+	rewardAddressLink := fmt.Sprintf(`https://%setherscan.io/address/%s`, prefix, node.nodeInfo.RewardAddress)
 
 	detailedDescriptions := map[string]string{
 		nodeOpInfo: `
-## Description 
+## Description
 - Node Operator ID: Unique identifier for the node operator.
 - Reward Address: Address that is the ultimate recipient of the rewards
 - Manager Address: Address used to perform routine management operations regarding the CSM Node Operator.`,
 
 		keysInfo: `
-## Description 
+## Description
 - Stuck Keys Count: Number of keys stuck in the system. A validator is considered to be "stuck" if it has not been exited timely following an exit signal from the protocol.
 - Refunded Keys Count: Number of keys that were refunded.
 - Exited Keys Count: Number of keys that have exited.
 - Deposited Keys Count: Number of keys currently deposited.
 - Depositable Keys Count: Number of keys eligible for deposits.`,
 
 		queueInfo: `
-## Description 
+## Description
 - Keys in the deposit queue: Number of the depositable keys that are in the deposit queue.`,
 
 		bondInfo: `
-## Description 
+## Description
 - Bond : a security collateral that Node Operators must submit before uploading validator keys into CSM. It covers possible losses caused by inappropriate actions on the Node Operator's side.
 - Current Bond: The current amount of bonded ETH.
 - Required Bond: The required amount of ETH to maintain.
 - Excess Bond: The amount of excess bond over the required amount.
 - Missed Bond: The amount of bond that is missing.`,
 
 		rewardsInfo: `
-## Description 
+## Description
 - Non-claimed Rewards: The amount of rewards available for claiming.`,
 	}
 
diff --git a/configs/networks.go b/configs/networks.go
@@ -37,7 +37,7 @@ var ErrInvalidNetwork = errors.New("invalid network")
 
 func NetworkCheck(value string) error {
 	switch value {
-	case NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky, NetworkCustom:
+	case NetworkMainnet, NetworkSepolia, NetworkGnosis, NetworkChiado, NetworkHolesky, NetworkHoodi, NetworkCustom:
 		return nil
 	default:
 		return fmt.Errorf("%w: %s", ErrInvalidNetwork, value)
diff --git a/configs/networks_test.go b/configs/networks_test.go
@@ -8,46 +8,33 @@ func TestNetworkCheck(t *testing.T) {
 		network string
 		wantErr bool
 	}{
-		{
-			name:    "Valid network, mainnet",
-			network: "mainnet",
-			wantErr: false,
-		},
 		{
 			name:    "Invalid network, goerli",
 			network: "goerli",
 			wantErr: true,
 		},
-		{
-			name:    "Valid network, sepolia",
-			network: "sepolia",
-			wantErr: false,
-		},
-		{
-			name:    "Valid network, gnosis",
-			network: "gnosis",
-			wantErr: false,
-		},
-		{
-			name:    "Valid network, chiado",
-			network: "chiado",
-			wantErr: false,
-		},
-		{
-			name:    "Valid network, custom",
-			network: "custom",
-			wantErr: false,
-		},
 		{
 			name:    "Invalid network",
 			network: "invalid",
 			wantErr: true,
 		},
 	}
+
+	for _, network := range NetworkSupported() {
+		tests = append(tests, struct {
+			name    string
+			network string
+			wantErr bool
+		}{
+			name:    network,
+			network: network,
+			wantErr: false,
+		})
+	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if err := NetworkCheck(tt.network); (err != nil) != tt.wantErr {
-				t.Errorf("NetworkCheck() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("NetworkCheck(%s) error = %v, wantErr %v", tt.network, err, tt.wantErr)
 			}
 		})
 	}
diff --git a/docs/src/components/SupportedNetworks/index.js b/docs/src/components/SupportedNetworks/index.js
@@ -215,6 +215,7 @@ export const SupportedNetworks = () => {
         {
             name: 'Testnets',
             networks: [
+                { name: 'Hoodi', link: '/docs/networks/hoodi' },
                 { name: 'Holesky', link: '/docs/networks/holesky' },
                 { name: 'Sepolia', link: '/docs/networks/sepolia' },
                 { name: 'Chiado', link: '/docs/networks/chiado' }
diff --git a/templates/services/validator-blocker.tmpl b/templates/services/validator-blocker.tmpl
@@ -11,8 +11,8 @@
         sleep {{ .VLStartGracePeriod }};
         echo 'Done';
         while true; do
-          response=$$(wget -S ${CC_API_URL}/eth/v1/node/health -O /dev/null 2>&1 | grep -m 1 "HTTP/" | awk '{print $$2}')
-          if [ $$response -eq 200 ]; then
+          response=$(wget -S ${CC_API_URL}/eth/v1/node/health -O /dev/null 2>&1 | grep -m 1 'HTTP/' | awk '{print $2}')
+          if [ \"$response\" = \"200\" ]; then
             echo 'Endpoint is up!'
             break
           else

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ func KeysCmd(cmdRunner commands.CommandRunner, p ui.Prompter) *cobra.Command {`
`215`	`215`	`}`
`216`	`216`	`// Flag binds`
`217`	`217`	`cmd.PersistentFlags().BoolVar(&flags.lidoNode, "lido", false, "Enable Lido CSM compatible keys. Similar to using --eth-withdrawal-address with the Lido Withdrawal Vault address.")`
`218`		`- cmd.Flags().StringVarP(&flags.network, "network", "n", "mainnet", "Target network. e.g. mainnet,sepolia, holesky, gnosis, chiado etc.")`
	`218`	`+ cmd.Flags().StringVarP(&flags.network, "network", "n", "mainnet", "Target network. e.g. mainnet, hoodi, sepolia, holesky, gnosis, chiado etc.")`
`219`	`219`	`cmd.Flags().StringVarP(&flags.path, "path", "p", configs.DefaultAbsSedgeDataPath, "Absolute path to keystore folder. e.g. /home/user/keystore")`
`220`	`220`	`cmd.Flags().StringVar(&flags.ethWithdrawalAddress, "eth-withdrawal-address", "", "If this field is set and valid, the given Eth 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.")`
`221`	`221`	`cmd.Flags().StringVar(&flags.mnemonicPath, "mnemonic-path", "", "Path to file with a existing mnemonic to use.")`
Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,7 @@ export const SupportedNetworks = () => {`
`215`	`215`	`{`
`216`	`216`	`name: 'Testnets',`
`217`	`217`	`networks: [`
	`218`	`+ { name: 'Hoodi', link: '/docs/networks/hoodi' },`
`218`	`219`	`{ name: 'Holesky', link: '/docs/networks/holesky' },`
`219`	`220`	`{ name: 'Sepolia', link: '/docs/networks/sepolia' },`
`220`	`221`	`{ name: 'Chiado', link: '/docs/networks/chiado' }`