diff --git a/beacon-chain/sync/batch_verifier.go b/beacon-chain/sync/batch_verifier.go index b9bf013a9db5..412152e66285 100644 --- a/beacon-chain/sync/batch_verifier.go +++ b/beacon-chain/sync/batch_verifier.go @@ -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" @@ -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 { diff --git a/config/features/config.go b/config/features/config.go index 952c760f8ba1..6a07f4f6ad78 100644 --- a/config/features/config.go +++ b/config/features/config.go @@ -57,9 +57,8 @@ type Flags struct { EnableSlasher bool // Enable slasher in the beacon node runtime. EnableSlashingProtectionPruning bool // EnableSlashingProtectionPruning for the validator client. - 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. + SaveFullExecutionPayloads bool // Save full beacon blocks with execution payloads in the database. + EnableStartOptimistic bool // EnableStartOptimistic treats every block as optimistic at startup. DisableStakinContractCheck bool // Disables check for deposit contract when proposing blocks @@ -187,11 +186,6 @@ func ConfigureBeaconChain(ctx *cli.Context) error { logEnabled(disableStakinContractCheck) cfg.DisableStakinContractCheck = true } - cfg.EnableBatchGossipAggregation = true - if ctx.Bool(disableGossipBatchAggregation.Name) { - logDisabled(disableGossipBatchAggregation) - cfg.EnableBatchGossipAggregation = false - } if ctx.Bool(SaveFullExecutionPayloads.Name) { logEnabled(SaveFullExecutionPayloads) cfg.SaveFullExecutionPayloads = true diff --git a/config/features/deprecated_flags.go b/config/features/deprecated_flags.go index c64960d19b7b..af8bdff47c94 100644 --- a/config/features/deprecated_flags.go +++ b/config/features/deprecated_flags.go @@ -27,6 +27,11 @@ 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. @@ -35,6 +40,7 @@ var deprecatedFlags = []cli.Flag{ deprecatedDisablePeerScorer, deprecatedDisableVecHTR, deprecatedEnableReorgLateBlocks, + deprecatedDisableGossipBatchAggregation, } // deprecatedBeaconFlags contains flags that are still used by other components diff --git a/config/features/flags.go b/config/features/flags.go index f4bd0b49c1aa..f544b9abd140 100644 --- a/config/features/flags.go +++ b/config/features/flags.go @@ -88,10 +88,6 @@ var ( " (Warning): Once enabled, this feature migrates your database in to a new schema and " + "there is no going back. At worst, your entire database might get corrupted.", } - 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", @@ -155,7 +151,6 @@ var BeaconChainFlags = append(deprecatedBeaconFlags, append(deprecatedFlags, []c enableHistoricalSpaceRepresentation, disableStakinContractCheck, disableReorgLateBlocks, - disableGossipBatchAggregation, SaveFullExecutionPayloads, enableStartupOptimistic, enableFullSSZDataLogging,