diff --git a/cmd/prysmctl/validator/cmd.go b/cmd/prysmctl/validator/cmd.go index 5c75c38355..54cb99a5e7 100644 --- a/cmd/prysmctl/validator/cmd.go +++ b/cmd/prysmctl/validator/cmd.go @@ -160,12 +160,12 @@ var Commands = []*cli.Command{ flags.InteropStartIndex, cmd.GrpcMaxCallRecvMsgSizeFlag, flags.CertFlag, - flags.GrpcHeadersFlag, - flags.GrpcRetriesFlag, - flags.GrpcRetryDelayFlag, + flags.GRPCHeadersFlag, + flags.GRPCRetriesFlag, + flags.GRPCRetryDelayFlag, flags.ExitAllFlag, flags.ForceExitFlag, - flags.VoluntaryExitJSONOutputPath, + flags.VoluntaryExitJSONOutputPathFlag, features.Mainnet, features.SepoliaTestnet, features.HoleskyTestnet, diff --git a/cmd/validator/accounts/accounts.go b/cmd/validator/accounts/accounts.go index 1e904f0b14..16adf06d6c 100644 --- a/cmd/validator/accounts/accounts.go +++ b/cmd/validator/accounts/accounts.go @@ -58,9 +58,9 @@ var Commands = &cli.Command{ flags.BeaconRPCProviderFlag, cmd.GrpcMaxCallRecvMsgSizeFlag, flags.CertFlag, - flags.GrpcHeadersFlag, - flags.GrpcRetriesFlag, - flags.GrpcRetryDelayFlag, + flags.GRPCHeadersFlag, + flags.GRPCRetriesFlag, + flags.GRPCRetryDelayFlag, features.Mainnet, features.SepoliaTestnet, features.HoleskyTestnet, @@ -93,7 +93,7 @@ var Commands = &cli.Command{ flags.WalletPasswordFileFlag, flags.BackupDirFlag, flags.BackupPublicKeysFlag, - flags.BackupPasswordFile, + flags.BackupPasswordFileFlag, features.Mainnet, features.SepoliaTestnet, features.HoleskyTestnet, @@ -160,12 +160,12 @@ var Commands = &cli.Command{ flags.InteropStartIndex, cmd.GrpcMaxCallRecvMsgSizeFlag, flags.CertFlag, - flags.GrpcHeadersFlag, - flags.GrpcRetriesFlag, - flags.GrpcRetryDelayFlag, + flags.GRPCHeadersFlag, + flags.GRPCRetriesFlag, + flags.GRPCRetryDelayFlag, flags.ExitAllFlag, flags.ForceExitFlag, - flags.VoluntaryExitJSONOutputPath, + flags.VoluntaryExitJSONOutputPathFlag, features.Mainnet, features.SepoliaTestnet, features.HoleskyTestnet, diff --git a/cmd/validator/accounts/backup.go b/cmd/validator/accounts/backup.go index 1aaa229b73..b4ac83f69c 100644 --- a/cmd/validator/accounts/backup.go +++ b/cmd/validator/accounts/backup.go @@ -23,10 +23,10 @@ func accountsBackup(c *cli.Context) error { dialOpts := client.ConstructDialOptions( c.Int(cmd.GrpcMaxCallRecvMsgSizeFlag.Name), c.String(flags.CertFlag.Name), - c.Uint(flags.GrpcRetriesFlag.Name), - c.Duration(flags.GrpcRetryDelayFlag.Name), + c.Uint(flags.GRPCRetriesFlag.Name), + c.Duration(flags.GRPCRetryDelayFlag.Name), ) - grpcHeaders := strings.Split(c.String(flags.GrpcHeadersFlag.Name), ",") + grpcHeaders := strings.Split(c.String(flags.GRPCHeadersFlag.Name), ",") opts := []accounts.Option{ accounts.WithWallet(w), @@ -62,7 +62,7 @@ func accountsBackup(c *cli.Context) error { // Ask the user for their desired password for their backed up accounts. backupsPassword, err := prompt.InputPassword( c, - flags.BackupPasswordFile, + flags.BackupPasswordFileFlag, "Enter a new password for your backed up accounts", "Confirm new password", true, diff --git a/cmd/validator/accounts/delete.go b/cmd/validator/accounts/delete.go index 2b501c8037..611cd1643f 100644 --- a/cmd/validator/accounts/delete.go +++ b/cmd/validator/accounts/delete.go @@ -20,10 +20,10 @@ func accountsDelete(c *cli.Context) error { dialOpts := client.ConstructDialOptions( c.Int(cmd.GrpcMaxCallRecvMsgSizeFlag.Name), c.String(flags.CertFlag.Name), - c.Uint(flags.GrpcRetriesFlag.Name), - c.Duration(flags.GrpcRetryDelayFlag.Name), + c.Uint(flags.GRPCRetriesFlag.Name), + c.Duration(flags.GRPCRetryDelayFlag.Name), ) - grpcHeaders := strings.Split(c.String(flags.GrpcHeadersFlag.Name), ",") + grpcHeaders := strings.Split(c.String(flags.GRPCHeadersFlag.Name), ",") opts := []accounts.Option{ accounts.WithWallet(w), diff --git a/cmd/validator/accounts/delete_test.go b/cmd/validator/accounts/delete_test.go index 43610f62b0..c876608883 100644 --- a/cmd/validator/accounts/delete_test.go +++ b/cmd/validator/accounts/delete_test.go @@ -98,7 +98,7 @@ func setupWalletCtx( set.String(flags.DeletePublicKeysFlag.Name, cfg.deletePublicKeys, "") set.String(flags.VoluntaryExitPublicKeysFlag.Name, cfg.voluntaryExitPublicKeys, "") set.String(flags.BackupDirFlag.Name, cfg.backupDir, "") - set.String(flags.BackupPasswordFile.Name, cfg.backupPasswordFile, "") + set.String(flags.BackupPasswordFileFlag.Name, cfg.backupPasswordFile, "") set.String(flags.BackupPublicKeysFlag.Name, cfg.backupPublicKeys, "") set.String(flags.WalletPasswordFileFlag.Name, cfg.walletPasswordFile, "") set.String(flags.AccountPasswordFileFlag.Name, cfg.accountPasswordFile, "") @@ -106,7 +106,7 @@ func setupWalletCtx( set.Bool(flags.SkipDepositConfirmationFlag.Name, cfg.skipDepositConfirm, "") set.Bool(flags.SkipMnemonic25thWordCheckFlag.Name, true, "") set.Bool(flags.ExitAllFlag.Name, cfg.exitAll, "") - set.String(flags.GrpcHeadersFlag.Name, cfg.grpcHeaders, "") + set.String(flags.GRPCHeadersFlag.Name, cfg.grpcHeaders, "") if cfg.privateKeyFile != "" { set.String(flags.ImportPrivateKeyFileFlag.Name, cfg.privateKeyFile, "") @@ -120,13 +120,13 @@ func setupWalletCtx( assert.NoError(tb, set.Set(flags.VoluntaryExitPublicKeysFlag.Name, cfg.voluntaryExitPublicKeys)) assert.NoError(tb, set.Set(flags.BackupDirFlag.Name, cfg.backupDir)) assert.NoError(tb, set.Set(flags.BackupPublicKeysFlag.Name, cfg.backupPublicKeys)) - assert.NoError(tb, set.Set(flags.BackupPasswordFile.Name, cfg.backupPasswordFile)) + assert.NoError(tb, set.Set(flags.BackupPasswordFileFlag.Name, cfg.backupPasswordFile)) assert.NoError(tb, set.Set(flags.WalletPasswordFileFlag.Name, cfg.walletPasswordFile)) assert.NoError(tb, set.Set(flags.AccountPasswordFileFlag.Name, cfg.accountPasswordFile)) assert.NoError(tb, set.Set(flags.NumAccountsFlag.Name, strconv.Itoa(int(cfg.numAccounts)))) assert.NoError(tb, set.Set(flags.SkipDepositConfirmationFlag.Name, strconv.FormatBool(cfg.skipDepositConfirm))) assert.NoError(tb, set.Set(flags.ExitAllFlag.Name, strconv.FormatBool(cfg.exitAll))) - assert.NoError(tb, set.Set(flags.GrpcHeadersFlag.Name, cfg.grpcHeaders)) + assert.NoError(tb, set.Set(flags.GRPCHeadersFlag.Name, cfg.grpcHeaders)) return cli.NewContext(&app, set, nil) } diff --git a/cmd/validator/accounts/exit.go b/cmd/validator/accounts/exit.go index c7f75f3451..168657c195 100644 --- a/cmd/validator/accounts/exit.go +++ b/cmd/validator/accounts/exit.go @@ -27,10 +27,10 @@ func Exit(c *cli.Context, r io.Reader) error { dialOpts := client.ConstructDialOptions( c.Int(cmd.GrpcMaxCallRecvMsgSizeFlag.Name), c.String(flags.CertFlag.Name), - c.Uint(flags.GrpcRetriesFlag.Name), - c.Duration(flags.GrpcRetryDelayFlag.Name), + c.Uint(flags.GRPCRetriesFlag.Name), + c.Duration(flags.GRPCRetryDelayFlag.Name), ) - grpcHeaders := strings.Split(c.String(flags.GrpcHeadersFlag.Name), ",") + grpcHeaders := strings.Split(c.String(flags.GRPCHeadersFlag.Name), ",") beaconRPCProvider := c.String(flags.BeaconRPCProviderFlag.Name) if !c.IsSet(flags.Web3SignerURLFlag.Name) && !c.IsSet(flags.WalletDirFlag.Name) && !c.IsSet(flags.InteropNumValidators.Name) { return errors.Errorf("No validators found, please provide a prysm wallet directory via flag --%s "+ @@ -83,7 +83,7 @@ func Exit(c *cli.Context, r io.Reader) error { accounts.WithBeaconRPCProvider(beaconRPCProvider), accounts.WithBeaconRESTApiProvider(c.String(flags.BeaconRESTApiProviderFlag.Name)), accounts.WithGRPCHeaders(grpcHeaders), - accounts.WithExitJSONOutputPath(c.String(flags.VoluntaryExitJSONOutputPath.Name)), + accounts.WithExitJSONOutputPath(c.String(flags.VoluntaryExitJSONOutputPathFlag.Name)), } // Get full set of public keys from the keymanager. validatingPublicKeys, err := km.FetchValidatingPublicKeys(c.Context) diff --git a/cmd/validator/accounts/import.go b/cmd/validator/accounts/import.go index c1ee44c7ea..11feea9cd6 100644 --- a/cmd/validator/accounts/import.go +++ b/cmd/validator/accounts/import.go @@ -27,10 +27,10 @@ func accountsImport(c *cli.Context) error { dialOpts := client.ConstructDialOptions( c.Int(cmd.GrpcMaxCallRecvMsgSizeFlag.Name), c.String(flags.CertFlag.Name), - c.Uint(flags.GrpcRetriesFlag.Name), - c.Duration(flags.GrpcRetryDelayFlag.Name), + c.Uint(flags.GRPCRetriesFlag.Name), + c.Duration(flags.GRPCRetryDelayFlag.Name), ) - grpcHeaders := strings.Split(c.String(flags.GrpcHeadersFlag.Name), ",") + grpcHeaders := strings.Split(c.String(flags.GRPCHeadersFlag.Name), ",") opts := []accounts.Option{ accounts.WithWallet(w), diff --git a/cmd/validator/accounts/list.go b/cmd/validator/accounts/list.go index 147b8a8a49..d502c53fb4 100644 --- a/cmd/validator/accounts/list.go +++ b/cmd/validator/accounts/list.go @@ -18,10 +18,10 @@ func accountsList(c *cli.Context) error { dialOpts := client.ConstructDialOptions( c.Int(cmd.GrpcMaxCallRecvMsgSizeFlag.Name), c.String(flags.CertFlag.Name), - c.Uint(flags.GrpcRetriesFlag.Name), - c.Duration(flags.GrpcRetryDelayFlag.Name), + c.Uint(flags.GRPCRetriesFlag.Name), + c.Duration(flags.GRPCRetryDelayFlag.Name), ) - grpcHeaders := strings.Split(c.String(flags.GrpcHeadersFlag.Name), ",") + grpcHeaders := strings.Split(c.String(flags.GRPCHeadersFlag.Name), ",") opts := []accounts.Option{ accounts.WithWallet(w), diff --git a/cmd/validator/flags/flags.go b/cmd/validator/flags/flags.go index 037ffaaf95..d9822cc722 100644 --- a/cmd/validator/flags/flags.go +++ b/cmd/validator/flags/flags.go @@ -91,20 +91,20 @@ var ( Name: "graffiti", Usage: "String to include in proposed blocks.", } - // GrpcRetriesFlag defines the number of times to retry a failed gRPC request. - GrpcRetriesFlag = &cli.UintFlag{ + // GRPCRetriesFlag defines the number of times to retry a failed gRPC request. + GRPCRetriesFlag = &cli.UintFlag{ Name: "grpc-retries", Usage: "Number of attempts to retry gRPC requests.", Value: 5, } - // GrpcRetryDelayFlag defines the interval to retry a failed gRPC request. - GrpcRetryDelayFlag = &cli.DurationFlag{ + // GRPCRetryDelayFlag defines the interval to retry a failed gRPC request. + GRPCRetryDelayFlag = &cli.DurationFlag{ Name: "grpc-retry-delay", Usage: "Amount of time between gRPC retry requests.", Value: 1 * time.Second, } - // GrpcHeadersFlag defines a list of headers to send with all gRPC requests. - GrpcHeadersFlag = &cli.StringFlag{ + // GRPCHeadersFlag defines a list of headers to send with all gRPC requests. + GRPCHeadersFlag = &cli.StringFlag{ Name: "grpc-headers", Usage: `Comma separated list of key value pairs to pass as gRPC headers for all gRPC calls. Example: --grpc-headers=key=value`, @@ -121,8 +121,8 @@ var ( Usage: "Enables gRPC gateway for JSON requests.", Value: 7500, } - // GPRCGatewayCorsDomain serves preflight requests when serving gRPC JSON gateway. - GPRCGatewayCorsDomain = &cli.StringFlag{ + // GRPCGatewayCorsDomain serves preflight requests when serving gRPC JSON gateway. + GRPCGatewayCorsDomain = &cli.StringFlag{ Name: "grpc-gateway-corsdomain", Usage: `Comma separated list of domains from which to accept cross origin requests (browser enforced). This flag has no effect if not used with --grpc-gateway-port. @@ -142,7 +142,6 @@ var ( Value: filepath.Join(filepath.Join(DefaultValidatorDir(), WalletDefaultDirName), api.AuthTokenFileName), Aliases: []string{"validator-api-bearer-file"}, } - // WalletDirFlag defines the path to a wallet directory for Prysm accounts. WalletDirFlag = &cli.StringFlag{ Name: "wallet-dir", @@ -184,7 +183,6 @@ var ( Name: "mnemonic-language", Usage: "Allows specifying mnemonic language. Supported languages are: english|chinese_traditional|chinese_simplified|czech|french|japanese|korean|italian|spanish.", } - // ShowPrivateKeysFlag for accounts. ShowPrivateKeysFlag = &cli.BoolFlag{ Name: "show-private-keys", @@ -236,14 +234,15 @@ var ( Name: "force-exit", Usage: "Exits without displaying the confirmation prompt.", } - VoluntaryExitJSONOutputPath = &cli.StringFlag{ + // VoluntaryExitJSONOutputPathFlag to write voluntary exits as JSON files instead of broadcasting them. + VoluntaryExitJSONOutputPathFlag = &cli.StringFlag{ Name: "exit-json-output-dir", Usage: "Output directory to write voluntary exits as individual unencrypted JSON " + "files. If this flag is provided, voluntary exits will be written to the provided " + "directory and will not be broadcasted.", } - // BackupPasswordFile for encrypting accounts a user wishes to back up. - BackupPasswordFile = &cli.StringFlag{ + // BackupPasswordFileFlag for encrypting accounts a user wishes to back up. + BackupPasswordFileFlag = &cli.StringFlag{ Name: "backup-password-file", Usage: "Path to a plain-text, .txt file containing the desired password for your backed up accounts.", Value: "", @@ -264,7 +263,6 @@ var ( Name: "keys-dir", Usage: "Path to a directory where keystores to be imported are stored.", } - // RemoteSignerCertPathFlag defines the path to a client.crt file for a wallet to connect to // a secure signer via TLS and gRPC. RemoteSignerCertPathFlag = &cli.StringFlag{ @@ -294,7 +292,6 @@ var ( Usage: "URL for consensys' web3signer software to use with the Prysm validator client.", Value: "", } - // Web3SignerPublicValidatorKeysFlag defines a comma-separated list of hex string public keys or external url for web3signer to use for validator signing. // example with external url: --validators-external-signer-public-keys= https://web3signer.com/api/v1/eth2/publicKeys // example with public key: --validators-external-signer-public-keys=0xa99a...e44c,0xb89b...4a0b @@ -303,7 +300,6 @@ var ( Name: "validators-external-signer-public-keys", Usage: "Comma separated list of public keys OR an external url endpoint for the validator to retrieve public keys from for usage with web3signer.", } - // KeymanagerKindFlag defines the kind of keymanager desired by a user during wallet creation. KeymanagerKindFlag = &cli.StringFlag{ Name: "keymanager-kind", @@ -348,7 +344,6 @@ var ( fee recipient and gas limit. File format found in docs`, Value: "", } - // SuggestedFeeRecipientFlag defines the address of the fee recipient. SuggestedFeeRecipientFlag = &cli.StringFlag{ Name: "suggested-fee-recipient", @@ -358,7 +353,6 @@ var ( --` + ProposerSettingsFlag.Name + " or --" + ProposerSettingsURLFlag.Name + " flags.", Value: params.BeaconConfig().EthBurnAddressHex, } - // EnableBuilderFlag enables the periodic validator registration API calls that will update the custom builder with validator settings. EnableBuilderFlag = &cli.BoolFlag{ Name: "enable-builder", @@ -368,21 +362,18 @@ var ( Value: false, Aliases: []string{"enable-validator-registration"}, } - // BuilderGasLimitFlag defines the gas limit for the builder to use for constructing a payload. BuilderGasLimitFlag = &cli.StringFlag{ Name: "suggested-gas-limit", Usage: "Sets gas limit for the builder to use for constructing a payload for all the validators.", Value: fmt.Sprint(params.BeaconConfig().DefaultBuilderGasLimit), } - // ValidatorsRegistrationBatchSizeFlag sets the maximum size for one batch of validator registrations. Use a non-positive value to disable batching. ValidatorsRegistrationBatchSizeFlag = &cli.IntFlag{ Name: "validators-registration-batch-size", Usage: "Sets the maximum size for one batch of validator registrations. Use a non-positive value to disable batching.", Value: 0, } - // EnableDistributed enables the usage of prysm validator client in a Distributed Validator Cluster. EnableDistributed = &cli.BoolFlag{ Name: "distributed", diff --git a/cmd/validator/main.go b/cmd/validator/main.go index 4251a720f3..f5ca240ee0 100644 --- a/cmd/validator/main.go +++ b/cmd/validator/main.go @@ -62,10 +62,10 @@ var appFlags = []cli.Flag{ flags.RPCPort, flags.GRPCGatewayPort, flags.GRPCGatewayHost, - flags.GrpcRetriesFlag, - flags.GrpcRetryDelayFlag, - flags.GrpcHeadersFlag, - flags.GPRCGatewayCorsDomain, + flags.GRPCRetriesFlag, + flags.GRPCRetryDelayFlag, + flags.GRPCHeadersFlag, + flags.GRPCGatewayCorsDomain, flags.DisableAccountMetricsFlag, flags.MonitoringPortFlag, flags.SlasherRPCProviderFlag, diff --git a/cmd/validator/usage.go b/cmd/validator/usage.go index 900af603f1..cef63780bb 100644 --- a/cmd/validator/usage.go +++ b/cmd/validator/usage.go @@ -56,6 +56,8 @@ var appHelpFlagGroups = []flagGroup{ cmd.E2EConfigFlag, cmd.VerbosityFlag, cmd.DataDirFlag, + flags.WalletDirFlag, + flags.WalletPasswordFileFlag, cmd.ClearDB, cmd.ForceClearDB, cmd.EnableBackupWebhookFlag, @@ -90,38 +92,56 @@ var appHelpFlagGroups = []flagGroup{ }, }, { - Name: "validator", + Name: "rpc", Flags: []cli.Flag{ + flags.CertFlag, flags.BeaconRPCProviderFlag, flags.BeaconRPCGatewayProviderFlag, - flags.BeaconRESTApiProviderFlag, - flags.CertFlag, - flags.EnableWebFlag, - flags.DisablePenaltyRewardLogFlag, - flags.GraffitiFlag, flags.EnableRPCFlag, flags.RPCHost, flags.RPCPort, flags.GRPCGatewayPort, flags.GRPCGatewayHost, - flags.GrpcRetriesFlag, - flags.GrpcRetryDelayFlag, - flags.GPRCGatewayCorsDomain, - flags.GrpcHeadersFlag, - flags.SlasherRPCProviderFlag, - flags.SlasherCertFlag, - flags.DisableAccountMetricsFlag, - flags.WalletDirFlag, - flags.WalletPasswordFileFlag, - flags.GraffitiFileFlag, - flags.Web3SignerURLFlag, - flags.Web3SignerPublicValidatorKeysFlag, + flags.GRPCRetriesFlag, + flags.GRPCRetryDelayFlag, + flags.GRPCGatewayCorsDomain, + flags.GRPCHeadersFlag, + flags.BeaconRESTApiProviderFlag, + }, + }, + { + Name: "proposer", + Flags: []cli.Flag{ flags.ProposerSettingsFlag, flags.ProposerSettingsURLFlag, flags.SuggestedFeeRecipientFlag, flags.EnableBuilderFlag, flags.BuilderGasLimitFlag, flags.ValidatorsRegistrationBatchSizeFlag, + flags.GraffitiFlag, + flags.GraffitiFileFlag, + }, + }, + { + Name: "remote signer", + Flags: []cli.Flag{ + flags.Web3SignerURLFlag, + flags.Web3SignerPublicValidatorKeysFlag, + }, + }, + { + Name: "slasher", + Flags: []cli.Flag{ + flags.SlasherRPCProviderFlag, + flags.SlasherCertFlag, + }, + }, + { + Name: "misc", + Flags: []cli.Flag{ + flags.EnableWebFlag, + flags.DisablePenaltyRewardLogFlag, + flags.DisableAccountMetricsFlag, flags.EnableDistributed, flags.AuthTokenPathFlag, }, diff --git a/cmd/validator/usage_test.go b/cmd/validator/usage_test.go index c5bc52c294..633d90d464 100644 --- a/cmd/validator/usage_test.go +++ b/cmd/validator/usage_test.go @@ -10,7 +10,7 @@ import ( func TestAllFlagsExistInHelp(t *testing.T) { // If this test is failing, it is because you've recently added/removed a - // flag in beacon chain main.go, but did not add/remove it to the usage.go + // flag in main.go, but did not add/remove it to the usage.go // flag grouping (appHelpFlagGroups). var helpFlags []cli.Flag diff --git a/cmd/validator/wallet/create_test.go b/cmd/validator/wallet/create_test.go index 929394a693..d81cb6bd42 100644 --- a/cmd/validator/wallet/create_test.go +++ b/cmd/validator/wallet/create_test.go @@ -68,7 +68,7 @@ func SetupWalletCtx( set.String(flags.DeletePublicKeysFlag.Name, cfg.deletePublicKeys, "") set.String(flags.VoluntaryExitPublicKeysFlag.Name, cfg.voluntaryExitPublicKeys, "") set.String(flags.BackupDirFlag.Name, cfg.backupDir, "") - set.String(flags.BackupPasswordFile.Name, cfg.backupPasswordFile, "") + set.String(flags.BackupPasswordFileFlag.Name, cfg.backupPasswordFile, "") set.String(flags.BackupPublicKeysFlag.Name, cfg.backupPublicKeys, "") set.String(flags.WalletPasswordFileFlag.Name, cfg.walletPasswordFile, "") set.String(flags.AccountPasswordFileFlag.Name, cfg.accountPasswordFile, "") @@ -76,7 +76,7 @@ func SetupWalletCtx( set.Bool(flags.SkipDepositConfirmationFlag.Name, cfg.skipDepositConfirm, "") set.Bool(flags.SkipMnemonic25thWordCheckFlag.Name, true, "") set.Bool(flags.ExitAllFlag.Name, cfg.exitAll, "") - set.String(flags.GrpcHeadersFlag.Name, cfg.grpcHeaders, "") + set.String(flags.GRPCHeadersFlag.Name, cfg.grpcHeaders, "") if cfg.privateKeyFile != "" { set.String(flags.ImportPrivateKeyFileFlag.Name, cfg.privateKeyFile, "") @@ -90,13 +90,13 @@ func SetupWalletCtx( assert.NoError(tb, set.Set(flags.VoluntaryExitPublicKeysFlag.Name, cfg.voluntaryExitPublicKeys)) assert.NoError(tb, set.Set(flags.BackupDirFlag.Name, cfg.backupDir)) assert.NoError(tb, set.Set(flags.BackupPublicKeysFlag.Name, cfg.backupPublicKeys)) - assert.NoError(tb, set.Set(flags.BackupPasswordFile.Name, cfg.backupPasswordFile)) + assert.NoError(tb, set.Set(flags.BackupPasswordFileFlag.Name, cfg.backupPasswordFile)) assert.NoError(tb, set.Set(flags.WalletPasswordFileFlag.Name, cfg.walletPasswordFile)) assert.NoError(tb, set.Set(flags.AccountPasswordFileFlag.Name, cfg.accountPasswordFile)) assert.NoError(tb, set.Set(flags.NumAccountsFlag.Name, strconv.Itoa(int(cfg.numAccounts)))) assert.NoError(tb, set.Set(flags.SkipDepositConfirmationFlag.Name, strconv.FormatBool(cfg.skipDepositConfirm))) assert.NoError(tb, set.Set(flags.ExitAllFlag.Name, strconv.FormatBool(cfg.exitAll))) - assert.NoError(tb, set.Set(flags.GrpcHeadersFlag.Name, cfg.grpcHeaders)) + assert.NoError(tb, set.Set(flags.GRPCHeadersFlag.Name, cfg.grpcHeaders)) return cli.NewContext(&app, set, nil) } diff --git a/testing/endtoend/components/validator.go b/testing/endtoend/components/validator.go index c57b18eb26..042a49bc7e 100644 --- a/testing/endtoend/components/validator.go +++ b/testing/endtoend/components/validator.go @@ -229,7 +229,7 @@ func (v *ValidatorNode) Start(ctx context.Context) error { fmt.Sprintf("--%s=%d", flags.GRPCGatewayPort.Name, e2e.TestParams.Ports.ValidatorGatewayPort+index), fmt.Sprintf("--%s=localhost:%d", flags.BeaconRPCProviderFlag.Name, beaconRPCPort), - fmt.Sprintf("--%s=%s", flags.GrpcHeadersFlag.Name, "dummy=value,foo=bar"), // Sending random headers shouldn't break anything. + fmt.Sprintf("--%s=%s", flags.GRPCHeadersFlag.Name, "dummy=value,foo=bar"), // Sending random headers shouldn't break anything. fmt.Sprintf("--%s=%s", cmdshared.VerbosityFlag.Name, "debug"), fmt.Sprintf("--%s=%s", flags.ProposerSettingsFlag.Name, proposerSettingsPathPath), fmt.Sprintf("--%s=%s", cmdshared.ChainConfigFileFlag.Name, cfgPath), diff --git a/validator/accounts/accounts_list_test.go b/validator/accounts/accounts_list_test.go index 69703c8f6c..7724df8626 100644 --- a/validator/accounts/accounts_list_test.go +++ b/validator/accounts/accounts_list_test.go @@ -65,7 +65,7 @@ func setupWalletCtx( set.String(flags.DeletePublicKeysFlag.Name, cfg.deletePublicKeys, "") set.String(flags.VoluntaryExitPublicKeysFlag.Name, cfg.voluntaryExitPublicKeys, "") set.String(flags.BackupDirFlag.Name, cfg.backupDir, "") - set.String(flags.BackupPasswordFile.Name, cfg.backupPasswordFile, "") + set.String(flags.BackupPasswordFileFlag.Name, cfg.backupPasswordFile, "") set.String(flags.BackupPublicKeysFlag.Name, cfg.backupPublicKeys, "") set.String(flags.WalletPasswordFileFlag.Name, cfg.walletPasswordFile, "") set.String(flags.AccountPasswordFileFlag.Name, cfg.accountPasswordFile, "") @@ -73,7 +73,7 @@ func setupWalletCtx( set.Bool(flags.SkipDepositConfirmationFlag.Name, cfg.skipDepositConfirm, "") set.Bool(flags.SkipMnemonic25thWordCheckFlag.Name, true, "") set.Bool(flags.ExitAllFlag.Name, cfg.exitAll, "") - set.String(flags.GrpcHeadersFlag.Name, cfg.grpcHeaders, "") + set.String(flags.GRPCHeadersFlag.Name, cfg.grpcHeaders, "") if cfg.privateKeyFile != "" { set.String(flags.ImportPrivateKeyFileFlag.Name, cfg.privateKeyFile, "") @@ -87,13 +87,13 @@ func setupWalletCtx( assert.NoError(tb, set.Set(flags.VoluntaryExitPublicKeysFlag.Name, cfg.voluntaryExitPublicKeys)) assert.NoError(tb, set.Set(flags.BackupDirFlag.Name, cfg.backupDir)) assert.NoError(tb, set.Set(flags.BackupPublicKeysFlag.Name, cfg.backupPublicKeys)) - assert.NoError(tb, set.Set(flags.BackupPasswordFile.Name, cfg.backupPasswordFile)) + assert.NoError(tb, set.Set(flags.BackupPasswordFileFlag.Name, cfg.backupPasswordFile)) assert.NoError(tb, set.Set(flags.WalletPasswordFileFlag.Name, cfg.walletPasswordFile)) assert.NoError(tb, set.Set(flags.AccountPasswordFileFlag.Name, cfg.accountPasswordFile)) assert.NoError(tb, set.Set(flags.NumAccountsFlag.Name, strconv.Itoa(int(cfg.numAccounts)))) assert.NoError(tb, set.Set(flags.SkipDepositConfirmationFlag.Name, strconv.FormatBool(cfg.skipDepositConfirm))) assert.NoError(tb, set.Set(flags.ExitAllFlag.Name, strconv.FormatBool(cfg.exitAll))) - assert.NoError(tb, set.Set(flags.GrpcHeadersFlag.Name, cfg.grpcHeaders)) + assert.NoError(tb, set.Set(flags.GRPCHeadersFlag.Name, cfg.grpcHeaders)) return cli.NewContext(&app, set, nil) } diff --git a/validator/node/node.go b/validator/node/node.go index 4529287cfa..aee6e841f7 100644 --- a/validator/node/node.go +++ b/validator/node/node.go @@ -149,10 +149,10 @@ func NewValidatorClient(cliCtx *cli.Context) (*ValidatorClient, error) { func newRouter(cliCtx *cli.Context) *mux.Router { var allowedOrigins []string - if cliCtx.IsSet(flags.GPRCGatewayCorsDomain.Name) { - allowedOrigins = strings.Split(cliCtx.String(flags.GPRCGatewayCorsDomain.Name), ",") + if cliCtx.IsSet(flags.GRPCGatewayCorsDomain.Name) { + allowedOrigins = strings.Split(cliCtx.String(flags.GRPCGatewayCorsDomain.Name), ",") } else { - allowedOrigins = strings.Split(flags.GPRCGatewayCorsDomain.Value, ",") + allowedOrigins = strings.Split(flags.GRPCGatewayCorsDomain.Value, ",") } r := mux.NewRouter() r.Use(server.NormalizeQueryValuesHandler) @@ -523,9 +523,9 @@ func (c *ValidatorClient) registerValidatorService(cliCtx *cli.Context) error { Wallet: c.wallet, WalletInitializedFeed: c.walletInitializedFeed, GRPCMaxCallRecvMsgSize: c.cliCtx.Int(cmd.GrpcMaxCallRecvMsgSizeFlag.Name), - GRPCRetries: c.cliCtx.Uint(flags.GrpcRetriesFlag.Name), - GRPCRetryDelay: c.cliCtx.Duration(flags.GrpcRetryDelayFlag.Name), - GRPCHeaders: strings.Split(c.cliCtx.String(flags.GrpcHeadersFlag.Name), ","), + GRPCRetries: c.cliCtx.Uint(flags.GRPCRetriesFlag.Name), + GRPCRetryDelay: c.cliCtx.Duration(flags.GRPCRetryDelayFlag.Name), + GRPCHeaders: strings.Split(c.cliCtx.String(flags.GRPCHeadersFlag.Name), ","), BeaconNodeGRPCEndpoint: c.cliCtx.String(flags.BeaconRPCProviderFlag.Name), BeaconNodeCert: c.cliCtx.String(flags.CertFlag.Name), BeaconApiEndpoint: c.cliCtx.String(flags.BeaconRESTApiProviderFlag.Name), @@ -630,9 +630,9 @@ func (c *ValidatorClient) registerRPCService(router *mux.Router) error { GRPCGatewayHost: c.cliCtx.String(flags.GRPCGatewayHost.Name), GRPCGatewayPort: c.cliCtx.Int(flags.GRPCGatewayPort.Name), GRPCMaxCallRecvMsgSize: c.cliCtx.Int(cmd.GrpcMaxCallRecvMsgSizeFlag.Name), - GRPCRetries: c.cliCtx.Uint(flags.GrpcRetriesFlag.Name), - GRPCRetryDelay: c.cliCtx.Duration(flags.GrpcRetryDelayFlag.Name), - GRPCHeaders: strings.Split(c.cliCtx.String(flags.GrpcHeadersFlag.Name), ","), + GRPCRetries: c.cliCtx.Uint(flags.GRPCRetriesFlag.Name), + GRPCRetryDelay: c.cliCtx.Duration(flags.GRPCRetryDelayFlag.Name), + GRPCHeaders: strings.Split(c.cliCtx.String(flags.GRPCHeadersFlag.Name), ","), BeaconNodeGRPCEndpoint: c.cliCtx.String(flags.BeaconRPCProviderFlag.Name), BeaconApiEndpoint: c.cliCtx.String(flags.BeaconRESTApiProviderFlag.Name), BeaconApiTimeout: time.Second * 30, @@ -663,10 +663,10 @@ func (c *ValidatorClient) registerRPCGatewayService(router *mux.Router) error { gatewayAddress := net.JoinHostPort(gatewayHost, fmt.Sprintf("%d", gatewayPort)) timeout := c.cliCtx.Int(cmd.ApiTimeoutFlag.Name) var allowedOrigins []string - if c.cliCtx.IsSet(flags.GPRCGatewayCorsDomain.Name) { - allowedOrigins = strings.Split(c.cliCtx.String(flags.GPRCGatewayCorsDomain.Name), ",") + if c.cliCtx.IsSet(flags.GRPCGatewayCorsDomain.Name) { + allowedOrigins = strings.Split(c.cliCtx.String(flags.GRPCGatewayCorsDomain.Name), ",") } else { - allowedOrigins = strings.Split(flags.GPRCGatewayCorsDomain.Value, ",") + allowedOrigins = strings.Split(flags.GRPCGatewayCorsDomain.Value, ",") } maxCallSize := c.cliCtx.Uint64(cmd.GrpcMaxCallRecvMsgSizeFlag.Name)