Ignore errors from hasSeenBit and don't pack unaggregated attestations

prysmaticlabs · Feb 28, 2025 · 6dafce5 · nisdas · Feb 28, 2025 · 6dafce5
1 parent fd41691
commit 6dafce5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/beacon-chain/operations/attestations/kv/aggregated.go b/beacon-chain/operations/attestations/kv/aggregated.go
@@ -135,7 +135,7 @@ func (c *AttCaches) SaveAggregatedAttestation(att ethpb.Att) error {
 
 	seen, err := c.hasSeenBit(att)
 	if err != nil {
-		return err
+		log.WithError(err).Debug("Could not check if attestations bits have been seen")
 	}
 	if seen {
 		return nil

diff --git a/beacon-chain/operations/attestations/kv/unaggregated.go b/beacon-chain/operations/attestations/kv/unaggregated.go
@@ -9,6 +9,7 @@ import (
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1/attestation"
 	"github.com/prysmaticlabs/prysm/v5/runtime/version"
+	log "github.com/sirupsen/logrus"
 )
 
 // SaveUnaggregatedAttestation saves an unaggregated attestation in cache.
@@ -22,7 +23,7 @@ func (c *AttCaches) SaveUnaggregatedAttestation(att ethpb.Att) error {
 
 	seen, err := c.hasSeenBit(att)
 	if err != nil {
-		return err
+		log.WithError(err).Debug("Could not check if attestations bits have been seen")
 	}
 	if seen {
 		return nil
@@ -60,7 +61,7 @@ func (c *AttCaches) UnaggregatedAttestations() ([]ethpb.Att, error) {
 	for _, att := range unAggregatedAtts {
 		seen, err := c.hasSeenBit(att)
 		if err != nil {
-			return nil, err
+			log.WithError(err).Debug("Could not check if attestations bits have been seen")
 		}
 		if !seen {
 			atts = append(atts, att.Clone())
@@ -163,7 +164,11 @@ func (c *AttCaches) DeleteSeenUnaggregatedAttestations() (int, error) {
 		if att == nil || att.IsNil() || att.IsAggregated() {
 			continue
 		}
-		if seen, err := c.hasSeenBit(att); err == nil && seen {
+		seen, err := c.hasSeenBit(att)
+		if err != nil {
+			log.WithError(err).Debug("Could not check if attestations bits have been seen")
+		}
+		if seen {
 			delete(c.unAggregatedAtt, r)
 			count++
 		}

diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go
@@ -39,13 +39,6 @@ func (vs *Server) packAttestations(ctx context.Context, latestState state.Beacon
 	} else {
 		atts = vs.AttPool.AggregatedAttestations()
 		atts = vs.validateAndDeleteAttsInPool(ctx, latestState, atts)
-
-		uAtts, err := vs.AttPool.UnaggregatedAttestations()
-		if err != nil {
-			return nil, errors.Wrap(err, "could not get unaggregated attestations")
-		}
-		uAtts = vs.validateAndDeleteAttsInPool(ctx, latestState, uAtts)
-		atts = append(atts, uAtts...)
 	}
 
 	// Checking the state's version here will give the wrong result if the last slot of Deneb is missed.