Reverse historical detection flag for slasher (#5958)

* Reverse historical detection flag
* Merge branch 'master' of github.com:prysmaticlabs/prysm into reverse-historical-flag
* Merge branch 'master' of github.com:prysmaticlabs/prysm into reverse-historical-flag
* Fix build
* Merge refs/heads/master into reverse-historical-flag
* Fix test
* Merge branch 'reverse-historical-flag' of github.com:prysmaticlabs/prysm into reverse-historical-flag
* Merge refs/heads/master into reverse-historical-flag

beacon-chain/rpc/beacon/attestations.go

@@ -272,7 +272,7 @@ func (bs *Server) StreamIndexedAttestations(
 					log.Info("Indexed attestations stream got nil attestation or nil attestation aggregate")
 					continue
 				}
-				bs.CollectedAttestationsBuffer <- []*ethpb.Attestation{data.Attestation.Aggregate}
+				bs.ReceivedAttestationsBuffer <- data.Attestation.Aggregate
 			}
 		case atts, ok := <-bs.CollectedAttestationsBuffer:
 			if !ok {

shared/featureconfig/config.go

@@ -60,10 +60,10 @@ type Flags struct {
 	// as the chain head. UNSAFE, use with caution.
 	DisableForkChoice bool
 
-	// DisableBroadcastSlashings disables p2p broadcasting of proposer and attester slashings.
-	DisableBroadcastSlashings  bool
-	DisableHistoricalDetection bool // DisableHistoricalDetection disables historical attestation detection and performs detection on the chain head immediately.
-	DisableLookback            bool // DisableLookback updates slasher to not use the lookback and update validator histories until epoch 0.
+	// Slasher toggles.
+	DisableBroadcastSlashings bool // DisableBroadcastSlashings disables p2p broadcasting of proposer and attester slashings.
+	EnableHistoricalDetection bool // EnableHistoricalDetection disables historical attestation detection and performs detection on the chain head immediately.
+	DisableLookback           bool // DisableLookback updates slasher to not use the lookback and update validator histories until epoch 0.
 
 	// Cache toggles.
 	EnableSSZCache          bool // EnableSSZCache see https://github.com/prysmaticlabs/prysm/pull/4558.
@@ -218,9 +218,9 @@ func ConfigureSlasher(ctx *cli.Context) {
 	complainOnDeprecatedFlags(ctx)
 	cfg := &Flags{}
 	cfg = configureConfig(ctx, cfg)
-	if ctx.Bool(disableHistoricalDetectionFlag.Name) {
-		log.Warn("Disabling historical attestation detection")
-		cfg.DisableHistoricalDetection = true
+	if ctx.Bool(enableHistoricalDetectionFlag.Name) {
+		log.Warn("Enabling historical attestation detection")
+		cfg.EnableHistoricalDetection = true
 	}
 	if ctx.Bool(disableLookbackFlag.Name) {
 		log.Warn("Disabling slasher lookback")

shared/featureconfig/flags.go

@@ -136,9 +136,9 @@ var (
 		Name:  "wait-for-synced",
 		Usage: "Uses WaitForSynced for validator startup, to ensure a validator is able to communicate with the beacon node as quick as possible",
 	}
-	disableHistoricalDetectionFlag = &cli.BoolFlag{
-		Name:  "disable-historical-detection",
-		Usage: "Disables historical attestation detection for the slasher",
+	enableHistoricalDetectionFlag = &cli.BoolFlag{
+		Name:  "enable-historical-detection",
+		Usage: "Enables historical attestation detection for the slasher",
 	}
 	disableLookbackFlag = &cli.BoolFlag{
 		Name:  "disable-lookback",
@@ -362,6 +362,11 @@ var (
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
+	deprecatedDisableHistoricalDetectionFlag = &cli.BoolFlag{
+		Name:   "disable-historical-detection",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
 )
 
 var deprecatedFlags = []cli.Flag{
@@ -404,6 +409,7 @@ var deprecatedFlags = []cli.Flag{
 	deprecatedEnableDomainDataCacheFlag,
 	deprecatedEnableByteMempool,
 	deprecatedBroadcastSlashingFlag,
+	deprecatedDisableHistoricalDetectionFlag,
 }
 
 // ValidatorFlags contains a list of all the feature flags that apply to the validator client.
@@ -418,7 +424,7 @@ var ValidatorFlags = append(deprecatedFlags, []cli.Flag{
 
 // SlasherFlags contains a list of all the feature flags that apply to the slasher client.
 var SlasherFlags = append(deprecatedFlags, []cli.Flag{
-	disableHistoricalDetectionFlag,
+	enableHistoricalDetectionFlag,
 	disableLookbackFlag,
 }...)
 

slasher/beaconclient/BUILD.bazel

@@ -16,9 +16,11 @@ go_library(
     visibility = ["//slasher:__subpackages__"],
     deps = [
         "//beacon-chain/core/helpers:go_default_library",
+        "//beacon-chain/state/stateutil:go_default_library",
         "//shared/event:go_default_library",
         "//shared/params:go_default_library",
         "//shared/sliceutil:go_default_library",
+        "//shared/slotutil:go_default_library",
         "//slasher/cache:go_default_library",
         "//slasher/db:go_default_library",
         "@com_github_gogo_protobuf//types:go_default_library",
@@ -29,7 +31,6 @@ go_library(
         "@com_github_prometheus_client_golang//prometheus:go_default_library",
         "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library",
         "@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library",
-        "@com_github_prysmaticlabs_go_ssz//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@io_opencensus_go//plugin/ocgrpc:go_default_library",
         "@io_opencensus_go//trace:go_default_library",

slasher/beaconclient/receivers.go

@@ -9,7 +9,8 @@ import (
 
 	ptypes "github.com/gogo/protobuf/types"
 	ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
-	"github.com/prysmaticlabs/go-ssz"
+	"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
+	"github.com/prysmaticlabs/prysm/shared/slotutil"
 	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 	"google.golang.org/grpc/codes"
@@ -64,7 +65,7 @@ func (bs *Service) receiveBlocks(ctx context.Context) {
 		if res == nil {
 			continue
 		}
-		root, err := ssz.HashTreeRoot(res.Block)
+		root, err := stateutil.BlockRoot(res.Block)
 		if err != nil {
 			log.WithError(err).Error("Could not hash block")
 			return
@@ -135,7 +136,8 @@ func (bs *Service) collectReceivedAttestations(ctx context.Context) {
 	defer span.End()
 
 	var atts []*ethpb.IndexedAttestation
-	ticker := time.NewTicker(500 * time.Millisecond)
+	quarterSlot := slotutil.DivideSlotBy(4 /* 1/4 slot duration */)
+	ticker := time.NewTicker(quarterSlot)
 	for {
 		select {
 		case <-ticker.C:

slasher/beaconclient/receivers_test.go

@@ -103,7 +103,7 @@ func TestService_ReceiveAttestations_Batched(t *testing.T) {
 		att,
 		nil,
 	).Do(func() {
-		time.Sleep(2 * time.Second)
+		time.Sleep(4 * time.Second)
 		cancel()
 	})
 

slasher/detection/service.go

@@ -85,7 +85,7 @@ func (ds *Service) Start() {
 	<-ch
 	sub.Unsubscribe()
 
-	if !featureconfig.Get().DisableHistoricalDetection {
+	if featureconfig.Get().EnableHistoricalDetection {
 		// The detection service runs detection on all historical
 		// chain data since genesis.
 		go ds.detectHistoricalChainData(ds.ctx)