diff --git a/cmd/validator/flags/flags.go b/cmd/validator/flags/flags.go index 2acd1dc5b4..dbd624d669 100644 --- a/cmd/validator/flags/flags.go +++ b/cmd/validator/flags/flags.go @@ -365,9 +365,9 @@ var ( Value: fmt.Sprint(params.BeaconConfig().DefaultBuilderGasLimit), } - // ValidatorRegistrationBatchSizeFlag sets the maximum size for one batch of validator registrations. Use a non-positive value to disable batching. - ValidatorRegistrationBatchSizeFlag = &cli.IntFlag{ - Name: "validator-registration-batch-size", + // 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, } diff --git a/cmd/validator/main.go b/cmd/validator/main.go index 40784aeba2..6fd186d638 100644 --- a/cmd/validator/main.go +++ b/cmd/validator/main.go @@ -79,7 +79,7 @@ var appFlags = []cli.Flag{ flags.ProposerSettingsFlag, flags.EnableBuilderFlag, flags.BuilderGasLimitFlag, - flags.ValidatorRegistrationBatchSizeFlag, + flags.ValidatorsRegistrationBatchSizeFlag, //////////////////// cmd.DisableMonitoringFlag, cmd.MonitoringHostFlag, diff --git a/cmd/validator/usage.go b/cmd/validator/usage.go index 071f38a9bb..2ab66b6dd5 100644 --- a/cmd/validator/usage.go +++ b/cmd/validator/usage.go @@ -113,7 +113,7 @@ var appHelpFlagGroups = []flagGroup{ flags.SuggestedFeeRecipientFlag, flags.EnableBuilderFlag, flags.BuilderGasLimitFlag, - flags.ValidatorRegistrationBatchSizeFlag, + flags.ValidatorsRegistrationBatchSizeFlag, }, }, { diff --git a/validator/client/service.go b/validator/client/service.go index 0f80f7a0ac..566ed05153 100644 --- a/validator/client/service.go +++ b/validator/client/service.go @@ -51,29 +51,29 @@ type GenesisFetcher interface { // ValidatorService represents a service to manage the validator client // routine. type ValidatorService struct { - useWeb bool - emitAccountMetrics bool - logValidatorBalances bool - interopKeysConfig *local.InteropKeymanagerConfig - conn validatorHelpers.NodeConnection - grpcRetryDelay time.Duration - grpcRetries uint - maxCallRecvMsgSize int - cancel context.CancelFunc - walletInitializedFeed *event.Feed - wallet *wallet.Wallet - graffitiStruct *graffiti.Graffiti - dataDir string - withCert string - endpoint string - ctx context.Context - validator iface.Validator - db db.Database - grpcHeaders []string - graffiti []byte - Web3SignerConfig *remoteweb3signer.SetupConfig - proposerSettings *validatorserviceconfig.ProposerSettings - validatorRegBatchSize int + useWeb bool + emitAccountMetrics bool + logValidatorBalances bool + interopKeysConfig *local.InteropKeymanagerConfig + conn validatorHelpers.NodeConnection + grpcRetryDelay time.Duration + grpcRetries uint + maxCallRecvMsgSize int + cancel context.CancelFunc + walletInitializedFeed *event.Feed + wallet *wallet.Wallet + graffitiStruct *graffiti.Graffiti + dataDir string + withCert string + endpoint string + ctx context.Context + validator iface.Validator + db db.Database + grpcHeaders []string + graffiti []byte + Web3SignerConfig *remoteweb3signer.SetupConfig + proposerSettings *validatorserviceconfig.ProposerSettings + validatorsRegBatchSize int } // Config for the validator service. @@ -99,7 +99,7 @@ type Config struct { ProposerSettings *validatorserviceconfig.ProposerSettings BeaconApiEndpoint string BeaconApiTimeout time.Duration - ValidatorRegBatchSize int + ValidatorsRegBatchSize int } // NewValidatorService creates a new validator service for the service @@ -107,28 +107,28 @@ type Config struct { func NewValidatorService(ctx context.Context, cfg *Config) (*ValidatorService, error) { ctx, cancel := context.WithCancel(ctx) s := &ValidatorService{ - ctx: ctx, - cancel: cancel, - endpoint: cfg.Endpoint, - withCert: cfg.CertFlag, - dataDir: cfg.DataDir, - graffiti: []byte(cfg.GraffitiFlag), - logValidatorBalances: cfg.LogValidatorBalances, - emitAccountMetrics: cfg.EmitAccountMetrics, - maxCallRecvMsgSize: cfg.GrpcMaxCallRecvMsgSizeFlag, - grpcRetries: cfg.GrpcRetriesFlag, - grpcRetryDelay: cfg.GrpcRetryDelay, - grpcHeaders: strings.Split(cfg.GrpcHeadersFlag, ","), - validator: cfg.Validator, - db: cfg.ValDB, - wallet: cfg.Wallet, - walletInitializedFeed: cfg.WalletInitializedFeed, - useWeb: cfg.UseWeb, - interopKeysConfig: cfg.InteropKeysConfig, - graffitiStruct: cfg.GraffitiStruct, - Web3SignerConfig: cfg.Web3SignerConfig, - proposerSettings: cfg.ProposerSettings, - validatorRegBatchSize: cfg.ValidatorRegBatchSize, + ctx: ctx, + cancel: cancel, + endpoint: cfg.Endpoint, + withCert: cfg.CertFlag, + dataDir: cfg.DataDir, + graffiti: []byte(cfg.GraffitiFlag), + logValidatorBalances: cfg.LogValidatorBalances, + emitAccountMetrics: cfg.EmitAccountMetrics, + maxCallRecvMsgSize: cfg.GrpcMaxCallRecvMsgSizeFlag, + grpcRetries: cfg.GrpcRetriesFlag, + grpcRetryDelay: cfg.GrpcRetryDelay, + grpcHeaders: strings.Split(cfg.GrpcHeadersFlag, ","), + validator: cfg.Validator, + db: cfg.ValDB, + wallet: cfg.Wallet, + walletInitializedFeed: cfg.WalletInitializedFeed, + useWeb: cfg.UseWeb, + interopKeysConfig: cfg.InteropKeysConfig, + graffitiStruct: cfg.GraffitiStruct, + Web3SignerConfig: cfg.Web3SignerConfig, + proposerSettings: cfg.ProposerSettings, + validatorsRegBatchSize: cfg.ValidatorsRegBatchSize, } dialOpts := ConstructDialOptions( @@ -222,7 +222,7 @@ func (v *ValidatorService) Start() { proposerSettings: v.proposerSettings, walletInitializedChannel: make(chan *wallet.Wallet, 1), prysmBeaconClient: prysmBeaconClient, - validatorRegBatchSize: v.validatorRegBatchSize, + validatorsRegBatchSize: v.validatorsRegBatchSize, } v.validator = valStruct diff --git a/validator/client/validator.go b/validator/client/validator.go index 8034f9170b..9678992320 100644 --- a/validator/client/validator.go +++ b/validator/client/validator.go @@ -104,7 +104,7 @@ type validator struct { proposerSettings *validatorserviceconfig.ProposerSettings walletInitializedChannel chan *wallet.Wallet prysmBeaconClient iface.PrysmBeaconChainClient - validatorRegBatchSize int + validatorsRegBatchSize int } type validatorStatus struct { @@ -1029,7 +1029,7 @@ func (v *validator) PushProposerSettings(ctx context.Context, km keymanager.IKey } signedRegReqs := v.buildSignedRegReqs(ctx, filteredKeys, km.Sign) - if err := SubmitValidatorRegistrations(ctx, v.validatorClient, signedRegReqs, v.validatorRegBatchSize); err != nil { + if err := SubmitValidatorRegistrations(ctx, v.validatorClient, signedRegReqs, v.validatorsRegBatchSize); err != nil { return errors.Wrap(ErrBuilderValidatorRegistration, err.Error()) } return nil diff --git a/validator/node/node.go b/validator/node/node.go index ce56207e50..aa21ae5fcd 100644 --- a/validator/node/node.go +++ b/validator/node/node.go @@ -481,7 +481,7 @@ func (c *ValidatorClient) registerValidatorService(cliCtx *cli.Context) error { ProposerSettings: bpc, BeaconApiTimeout: time.Second * 30, BeaconApiEndpoint: c.cliCtx.String(flags.BeaconRESTApiProviderFlag.Name), - ValidatorRegBatchSize: c.cliCtx.Int(flags.ValidatorRegistrationBatchSizeFlag.Name), + ValidatorsRegBatchSize: c.cliCtx.Int(flags.ValidatorsRegistrationBatchSizeFlag.Name), }) if err != nil { return errors.Wrap(err, "could not initialize validator service")