Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Invert proposer-atts-selection-using-max-cover flag #8828

Merged
merged 3 commits into from
Apr 28, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions shared/featureconfig/config.go
Original file line number Diff line number Diff line change
@@ -186,9 +186,10 @@ func ConfigureBeaconChain(ctx *cli.Context) {
log.WithField(updateHeadTimely.Name, updateHeadTimely.Usage).Warn(enabledFeatureFlag)
cfg.UpdateHeadTimely = true
}
if ctx.Bool(proposerAttsSelectionUsingMaxCover.Name) {
log.WithField(proposerAttsSelectionUsingMaxCover.Name, proposerAttsSelectionUsingMaxCover.Usage).Warn(enabledFeatureFlag)
cfg.ProposerAttsSelectionUsingMaxCover = true
cfg.ProposerAttsSelectionUsingMaxCover = true
if ctx.Bool(disableProposerAttsSelectionUsingMaxCover.Name) {
log.WithField(disableProposerAttsSelectionUsingMaxCover.Name, disableProposerAttsSelectionUsingMaxCover.Usage).Warn(enabledFeatureFlag)
cfg.ProposerAttsSelectionUsingMaxCover = false
}
Init(cfg)
}
6 changes: 6 additions & 0 deletions shared/featureconfig/deprecated_flags.go
Original file line number Diff line number Diff line change
@@ -37,6 +37,11 @@ var (
Usage: deprecatedUsage,
Hidden: true,
}
deprecatedProposerAttsSelectionUsingMaxCover = &cli.BoolFlag{
Name: "proposer-atts-selection-using-max-cover",
Usage: deprecatedUsage,
Hidden: true,
}
)

var deprecatedFlags = []cli.Flag{
@@ -46,4 +51,5 @@ var deprecatedFlags = []cli.Flag{
deprecatedDisablePruningDepositProofs,
deprecatedDisableEth1DataMajorityVote,
deprecatedDisableBlst,
deprecatedProposerAttsSelectionUsingMaxCover,
}
9 changes: 4 additions & 5 deletions shared/featureconfig/flags.go
Original file line number Diff line number Diff line change
@@ -110,9 +110,9 @@ var (
Name: "update-head-timely",
Usage: "Improves update head time by updating head right after state transition",
}
proposerAttsSelectionUsingMaxCover = &cli.BoolFlag{
Name: "proposer-atts-selection-using-max-cover",
Usage: "Rely on max-cover algorithm when selecting attestations for proposer",
disableProposerAttsSelectionUsingMaxCover = &cli.BoolFlag{
Name: "disable-proposer-atts-selection-using-max-cover",
Usage: "Disable max-cover algorithm when selecting attestations for proposer",
}
enableSlashingProtectionPruning = &cli.BoolFlag{
Name: "enable-slashing-protection-pruning",
@@ -126,7 +126,6 @@ var devModeFlags = []cli.Flag{
enableNextSlotStateCache,
forceOptMaxCoverAggregationStategy,
updateHeadTimely,
proposerAttsSelectionUsingMaxCover,
}

// ValidatorFlags contains a list of all the feature flags that apply to the validator client.
@@ -174,7 +173,7 @@ var BeaconChainFlags = append(deprecatedFlags, []cli.Flag{
enableNextSlotStateCache,
forceOptMaxCoverAggregationStategy,
updateHeadTimely,
proposerAttsSelectionUsingMaxCover,
disableProposerAttsSelectionUsingMaxCover,
}...)

// E2EBeaconChainFlags contains a list of the beacon chain feature flags to be tested in E2E.