Save attestation to DB gated by archival flag (prysmaticlabs#4776)

* Gated by flag * Gaz * Merge branch 'master' into archival-saves-att
cryptomental · Feb 28, 2020 · 7008f8f · 7008f8f
1 parent 0f1f4f5
commit 7008f8f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/beacon-chain/blockchain/BUILD.bazel b/beacon-chain/blockchain/BUILD.bazel
@@ -29,6 +29,7 @@ go_library(
         "//beacon-chain/core/state:go_default_library",
         "//beacon-chain/db:go_default_library",
         "//beacon-chain/db/filters:go_default_library",
+        "//beacon-chain/flags:go_default_library",
         "//beacon-chain/forkchoice:go_default_library",
         "//beacon-chain/forkchoice/protoarray:go_default_library",
         "//beacon-chain/operations/attestations:go_default_library",

diff --git a/beacon-chain/blockchain/forkchoice/process_attestation.go b/beacon-chain/blockchain/forkchoice/process_attestation.go
@@ -13,6 +13,7 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
+	"github.com/prysmaticlabs/prysm/beacon-chain/flags"
 	stateTrie "github.com/prysmaticlabs/prysm/beacon-chain/state"
 	pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
 	"github.com/prysmaticlabs/prysm/shared/attestationutil"
@@ -130,8 +131,11 @@ func (s *Store) OnAttestation(ctx context.Context, a *ethpb.Attestation) ([]uint
 		return nil, err
 	}
 
-	if err := s.db.SaveAttestation(ctx, a); err != nil {
-		return nil, err
+	// Only save attestation in DB for archival node.
+	if flags.Get().EnableArchive {
+		if err := s.db.SaveAttestation(ctx, a); err != nil {
+			return nil, err
+		}
 	}
 
 	log := log.WithFields(logrus.Fields{

diff --git a/beacon-chain/blockchain/forkchoice/process_block.go b/beacon-chain/blockchain/forkchoice/process_block.go
@@ -125,8 +125,11 @@ func (s *Store) OnBlock(ctx context.Context, signed *ethpb.SignedBeaconBlock) (*
 		return nil, errors.Wrap(err, "could not save finalized checkpoint")
 	}
 	// Save the unseen attestations from block to db.
-	if err := s.saveNewBlockAttestations(ctx, b.Body.Attestations); err != nil {
-		return nil, errors.Wrap(err, "could not save attestations")
+	// Only save attestation in DB for archival node.
+	if flags.Get().EnableArchive {
+		if err := s.saveNewBlockAttestations(ctx, b.Body.Attestations); err != nil {
+			return nil, errors.Wrap(err, "could not save attestations")
+		}
 	}
 
 	// Epoch boundary bookkeeping such as logging epoch summaries.

diff --git a/beacon-chain/blockchain/process_attestation.go b/beacon-chain/blockchain/process_attestation.go
@@ -9,6 +9,7 @@ import (
 	"github.com/pkg/errors"
 	ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
+	"github.com/prysmaticlabs/prysm/beacon-chain/flags"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"go.opencensus.io/trace"
 )
@@ -117,8 +118,11 @@ func (s *Service) onAttestation(ctx context.Context, a *ethpb.Attestation) ([]ui
 		return nil, err
 	}
 
-	if err := s.beaconDB.SaveAttestation(ctx, a); err != nil {
-		return nil, err
+	// Only save attestation in DB for archival node.
+	if flags.Get().EnableArchive {
+		if err := s.beaconDB.SaveAttestation(ctx, a); err != nil {
+			return nil, err
+		}
 	}
 
 	return indexedAtt.AttestingIndices, nil

diff --git a/beacon-chain/state/references_test.go b/beacon-chain/state/references_test.go
@@ -15,7 +15,7 @@ func TestStateReferenceSharing_Finalizer(t *testing.T) {
 		t.Error("Expected a single reference for Randao mixes")
 	}
 
-	func () {
+	func() {
 		// Create object in a different scope for GC
 		b := a.Copy()
 		if a.sharedFieldReferences[randaoMixes].refs != 2 {