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.

Sign up for GitHub

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

Fully Deprecate Batch Aggregation Flag #12151

Merged
merged 4 commits into from
Mar 17, 2023
Merged

Fully Deprecate Batch Aggregation Flag #12151

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfeb02b
fix evaluator
nisdas Mar 17, 2023
5cbf751
fmt
nisdas Mar 17, 2023
f58be60
Merge branch 'develop' of https://github.com/prysmaticlabs/geth-shard…
nisdas Mar 17, 2023
1280051
config
nisdas Mar 17, 2023
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
5 changes: 1 addition & 4 deletions beacon-chain/sync/batch_verifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

pubsub "github.com/libp2p/go-libp2p-pubsub"
"github.com/pkg/errors"
"github.com/prysmaticlabs/prysm/v3/config/features"
"github.com/prysmaticlabs/prysm/v3/crypto/bls"
"github.com/prysmaticlabs/prysm/v3/monitoring/tracing"
"go.opencensus.io/trace"
Expand Down Expand Up @@ -90,9 +89,7 @@ func verifyBatch(verifierBatch []*signatureVerifier) {
}
var verificationErr error

if features.Get().EnableBatchGossipAggregation {
aggSet, verificationErr = performBatchAggregation(aggSet)
}
aggSet, verificationErr = performBatchAggregation(aggSet)
if verificationErr == nil {
verified, err := aggSet.Verify()
switch {
Expand Down
6 changes: 0 additions & 6 deletions config/features/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ type Flags struct {

EnableVectorizedHTR bool // EnableVectorizedHTR specifies whether the beacon state will use the optimized sha256 routines.
DisableForkchoiceDoublyLinkedTree bool // DisableForkChoiceDoublyLinkedTree specifies whether fork choice store will use a doubly linked tree.
EnableBatchGossipAggregation bool // EnableBatchGossipAggregation specifies whether to further aggregate our gossip batches before verifying them.
SaveFullExecutionPayloads bool // Save full beacon blocks with execution payloads in the database.
EnableStartOptimistic bool // EnableStartOptimistic treats every block as optimistic at startup.

Expand Down Expand Up @@ -218,11 +217,6 @@ func ConfigureBeaconChain(ctx *cli.Context) error {
logEnabled(disableForkChoiceDoublyLinkedTree)
cfg.DisableForkchoiceDoublyLinkedTree = true
}
cfg.EnableBatchGossipAggregation = true
if ctx.Bool(disableGossipBatchAggregation.Name) {
logDisabled(disableGossipBatchAggregation)
cfg.EnableBatchGossipAggregation = false
}
if ctx.Bool(SaveFullExecutionPayloads.Name) {
logEnabled(SaveFullExecutionPayloads)
cfg.SaveFullExecutionPayloads = true
Expand Down
6 changes: 6 additions & 0 deletions config/features/deprecated_flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,18 @@ var (
Usage: deprecatedUsage,
Hidden: true,
}
deprecatedDisableGossipBatchAggregation = &cli.BoolFlag{
Name: "disable-gossip-batch-aggregation",
Usage: deprecatedUsage,
Hidden: true,
}
)

// Deprecated flags for both the beacon node and validator client.
var deprecatedFlags = []cli.Flag{
exampleDeprecatedFeatureFlag,
deprecatedDisablePeerScorer,
deprecatedDisableGossipBatchAggregation,
}

// deprecatedBeaconFlags contains flags that are still used by other components
Expand Down
5 changes: 0 additions & 5 deletions config/features/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ var (
Name: "disable-forkchoice-doubly-linked-tree",
Usage: "Disables the new forkchoice store structure that uses doubly linked trees",
}
disableGossipBatchAggregation = &cli.BoolFlag{
Name: "disable-gossip-batch-aggregation",
Usage: "Disables new methods to further aggregate our gossip batches before verifying them.",
}
enableStartupOptimistic = &cli.BoolFlag{
Name: "startup-optimistic",
Usage: "Treats every block as optimistically synced at launch. Use with caution",
Expand Down Expand Up @@ -165,7 +161,6 @@ var BeaconChainFlags = append(deprecatedBeaconFlags, append(deprecatedFlags, []c
disableVecHTR,
disableReorgLateBlocks,
disableForkChoiceDoublyLinkedTree,
disableGossipBatchAggregation,
SaveFullExecutionPayloads,
enableStartupOptimistic,
enableFullSSZDataLogging,
Expand Down