mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-23 03:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Full Deprecation of Fee Recipient File Flags (#11033)

Browse Source
This commit is contained in:
james-prysm 2022-07-12 14:10:44 -04:00 committed by GitHub
parent c33acde64e
commit c0f3946f58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/validator/flags/flags.go
View File

@ -324,19 +324,6 @@ var (
Value: false, Value: false,
} }
// FeeRecipientConfigFileFlag defines the path or URL to a file with proposer config.
FeeRecipientConfigFileFlag = &cli.StringFlag{
Name: "fee-recipient-config-file",
Usage: "DEPRECATED, please use proposer-settings-file",
Value: "",
}
// FeeRecipientConfigURLFlag defines the path or URL to a file with proposer config.
FeeRecipientConfigURLFlag = &cli.StringFlag{
Name: "fee-recipient-config-url",
Usage: "DEPRECATED, please use proposer-settings-url",
Value: "",
}
// ProposerSettingsFlag defines the path or URL to a file with proposer config. // ProposerSettingsFlag defines the path or URL to a file with proposer config.
ProposerSettingsFlag = &cli.StringFlag{ ProposerSettingsFlag = &cli.StringFlag{
Name: "proposer-settings-file", Name: "proposer-settings-file",

2
cmd/validator/main.go
View File

@ -75,8 +75,6 @@ var appFlags = []cli.Flag{
// Consensys' Web3Signer flags // Consensys' Web3Signer flags
flags.Web3SignerURLFlag, flags.Web3SignerURLFlag,
flags.Web3SignerPublicValidatorKeysFlag, flags.Web3SignerPublicValidatorKeysFlag,
flags.FeeRecipientConfigFileFlag,
flags.FeeRecipientConfigURLFlag,
flags.SuggestedFeeRecipientFlag, flags.SuggestedFeeRecipientFlag,
flags.ProposerSettingsURLFlag, flags.ProposerSettingsURLFlag,
flags.ProposerSettingsFlag, flags.ProposerSettingsFlag,

2
cmd/validator/usage.go
View File

@ -109,8 +109,6 @@ var appHelpFlagGroups = []flagGroup{
flags.EnableDutyCountDown, flags.EnableDutyCountDown,
flags.Web3SignerURLFlag, flags.Web3SignerURLFlag,
flags.Web3SignerPublicValidatorKeysFlag, flags.Web3SignerPublicValidatorKeysFlag,
flags.FeeRecipientConfigFileFlag,
flags.FeeRecipientConfigURLFlag,
flags.ProposerSettingsFlag, flags.ProposerSettingsFlag,
flags.ProposerSettingsURLFlag, flags.ProposerSettingsURLFlag,
flags.SuggestedFeeRecipientFlag, flags.SuggestedFeeRecipientFlag,

12
validator/node/node.go
View File

@ -476,10 +476,6 @@ func web3SignerConfig(cliCtx *cli.Context) (*remoteweb3signer.SetupConfig, error
func proposerSettings(cliCtx *cli.Context) (*validatorServiceConfig.ProposerSettings, error) { func proposerSettings(cliCtx *cli.Context) (*validatorServiceConfig.ProposerSettings, error) {
var fileConfig *validatorServiceConfig.ProposerSettingsPayload var fileConfig *validatorServiceConfig.ProposerSettingsPayload
//TODO(10809): remove when fully deprecated
if cliCtx.IsSet(flags.FeeRecipientConfigFileFlag.Name) && cliCtx.IsSet(flags.FeeRecipientConfigURLFlag.Name) {
return nil, fmt.Errorf("cannot specify both --%s and --%s", flags.FeeRecipientConfigFileFlag.Name, flags.FeeRecipientConfigURLFlag.Name)
}
if cliCtx.IsSet(flags.ProposerSettingsFlag.Name) && cliCtx.IsSet(flags.ProposerSettingsURLFlag.Name) { if cliCtx.IsSet(flags.ProposerSettingsFlag.Name) && cliCtx.IsSet(flags.ProposerSettingsURLFlag.Name) {
return nil, errors.New("cannot specify both " + flags.ProposerSettingsFlag.Name + " and " + flags.ProposerSettingsURLFlag.Name) return nil, errors.New("cannot specify both " + flags.ProposerSettingsFlag.Name + " and " + flags.ProposerSettingsURLFlag.Name)
@ -506,14 +502,6 @@ func proposerSettings(cliCtx *cli.Context) (*validatorServiceConfig.ProposerSett
} }
} }
if cliCtx.IsSet(flags.FeeRecipientConfigFileFlag.Name) {
return nil, errors.New(flags.FeeRecipientConfigFileFlag.Usage)
}
if cliCtx.IsSet(flags.FeeRecipientConfigURLFlag.Name) {
return nil, errors.New(flags.FeeRecipientConfigURLFlag.Usage)
}
if cliCtx.IsSet(flags.ProposerSettingsFlag.Name) { if cliCtx.IsSet(flags.ProposerSettingsFlag.Name) {
if err := unmarshalFromFile(cliCtx.Context, cliCtx.String(flags.ProposerSettingsFlag.Name), &fileConfig); err != nil { if err := unmarshalFromFile(cliCtx.Context, cliCtx.String(flags.ProposerSettingsFlag.Name), &fileConfig); err != nil {
return nil, err return nil, err