mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-25 21:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move to opt-out attestation-aggregation-strategy flag (#6960)

Browse Source 
* inverts attestation-aggregation-strategy flag
* Merge refs/heads/master into att-aggregation-opt-out-flag
* marks deprected flag as hidden
* Merge branch 'att-aggregation-opt-out-flag' of github.com:prysmaticlabs/prysm into att-aggregation-opt-out-flag
* Merge refs/heads/master into att-aggregation-opt-out-flag
This commit is contained in:
Victor Farazdagi 2020-08-11 15:42:08 +03:00 committed by GitHub
parent a5f0fd29fc
commit a279f374bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shared/featureconfig/config.go
View File

@ -229,16 +229,13 @@ func ConfigureBeaconChain(ctx *cli.Context) {
cfg.DisableGRPCConnectionLogs = true
}
cfg.AttestationAggregationStrategy = ctx.String(attestationAggregationStrategy.Name)
log.Infof("Using %q strategy on attestation aggregation", cfg.AttestationAggregationStrategy)
cfg.NewBeaconStateLocks = true
if ctx.Bool(disableNewBeaconStateLocks.Name) {
log.Warn("Disabling new beacon state locks")
cfg.NewBeaconStateLocks = false
}
if ctx.Bool(forceMaxCoverAttestationAggregation.Name) {
log.Warn("Forcing max_cover strategy on attestation aggregation")
cfg.AttestationAggregationStrategy = "max_cover"
}
if ctx.Bool(batchBlockVerify.Name) {
log.Warn("Performing batch block verification when syncing.")
cfg.BatchBlockVerify = true

14
shared/featureconfig/flags.go
View File

@ -136,16 +136,12 @@ var (
attestationAggregationStrategy = &cli.StringFlag{
Name: "attestation-aggregation-strategy",
Usage: "Which strategy to use when aggregating attestations, one of: naive, max_cover.",
Value: "naive",
Value: "max_cover",
}
disableNewBeaconStateLocks = &cli.BoolFlag{
Name: "disable-new-beacon-state-locks",
Usage: "Disable new beacon state locking",
}
forceMaxCoverAttestationAggregation = &cli.BoolFlag{
Name: "attestation-aggregation-force-maxcover",
Usage: "When enabled, forces --attestation-aggregation-strategy=max_cover setting.",
}
batchBlockVerify = &cli.BoolFlag{
Name: "batch-block-verify",
Usage: "When enabled we will perform full signature verification of blocks in batches instead of singularly.",
@ -174,7 +170,6 @@ var (
// devModeFlags holds list of flags that are set when development mode is on.
var devModeFlags = []cli.Flag{
forceMaxCoverAttestationAggregation,
batchBlockVerify,
enableAttBroadcastDiscoveryAttempts,
}
@ -524,6 +519,11 @@ var (
Usage: deprecatedUsage,
Hidden: true,
}
deprectedForceMaxCoverAttestationAggregation = &cli.BoolFlag{
Name: "attestation-aggregation-force-maxcover",
Usage: deprecatedUsage,
Hidden: true,
}
)
var deprecatedFlags = []cli.Flag{
@ -595,6 +595,7 @@ var deprecatedFlags = []cli.Flag{
deprecatedEnableAccountsV2,
deprecatedCustomGenesisDelay,
deprecatedNewBeaconStateLocks,
deprectedForceMaxCoverAttestationAggregation,
}
// ValidatorFlags contains a list of all the feature flags that apply to the validator client.
@ -646,7 +647,6 @@ var BeaconChainFlags = append(deprecatedFlags, []cli.Flag{
disableGRPCConnectionLogging,
attestationAggregationStrategy,
disableNewBeaconStateLocks,
forceMaxCoverAttestationAggregation,
AltonaTestnet,
OnyxTestnet,
batchBlockVerify,