Decompose Electra block attestations

Author: rkapka

beacon-chain/blockchain/BUILD.bazel

@@ -96,6 +96,7 @@ go_library(
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_prometheus_client_golang//prometheus:go_default_library",
         "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library",
+        "@com_github_prysmaticlabs_go_bitfield//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@org_golang_x_sync//errgroup:go_default_library",
     ],
@@ -154,6 +155,7 @@ go_test(
         "//beacon-chain/forkchoice/doubly-linked-tree:go_default_library",
         "//beacon-chain/forkchoice/types:go_default_library",
         "//beacon-chain/operations/attestations:go_default_library",
+        "//beacon-chain/operations/attestations/kv:go_default_library",
         "//beacon-chain/operations/blstoexec:go_default_library",
         "//beacon-chain/operations/slashings:go_default_library",
         "//beacon-chain/operations/voluntaryexits:go_default_library",
@@ -185,6 +187,7 @@ go_test(
         "@com_github_ethereum_go_ethereum//core/types:go_default_library",
         "@com_github_holiman_uint256//:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
+        "@com_github_prysmaticlabs_go_bitfield//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_sirupsen_logrus//hooks/test:go_default_library",
         "@org_golang_google_protobuf//proto:go_default_library",

beacon-chain/blockchain/forkchoice_update_execution.go

@@ -103,7 +103,7 @@ func (s *Service) forkchoiceUpdateWithExecution(ctx context.Context, args *fcuCo
 	}
 
 	// Only need to prune attestations from pool if the head has changed.
-	if err := s.pruneAttsFromPool(args.headBlock); err != nil {
+	if err := s.pruneAttsFromPool(s.ctx, args.headState, args.headBlock); err != nil {
 		log.WithError(err).Error("could not prune attestations from pool")
 	}
 	return nil

beacon-chain/blockchain/process_block.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/go-bitfield"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/blocks"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
 	coreTime "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/time"
@@ -420,21 +421,58 @@ func (s *Service) savePostStateInfo(ctx context.Context, r [32]byte, b interface
 }
 
 // This removes the attestations in block `b` from the attestation mem pool.
-func (s *Service) pruneAttsFromPool(headBlock interfaces.ReadOnlySignedBeaconBlock) error {
+func (s *Service) pruneAttsFromPool(ctx context.Context, headState state.BeaconState, headBlock interfaces.ReadOnlySignedBeaconBlock) error {
 	atts := headBlock.Block().Body().Attestations()
 	for _, att := range atts {
-		if features.Get().EnableExperimentalAttestationPool {
-			if err := s.cfg.AttestationCache.DeleteCovered(att); err != nil {
-				return errors.Wrap(err, "could not delete attestation")
+		if !att.IsAggregated() {
+			if err := s.cfg.AttPool.DeleteUnaggregatedAttestation(att); err != nil {
+				return err
 			}
-		} else if att.IsAggregated() {
-			if err := s.cfg.AttPool.DeleteAggregatedAttestation(att); err != nil {
+			continue
+		}
+
+		if att.Version() == version.Phase0 {
+			if features.Get().EnableExperimentalAttestationPool {
+				if err := s.cfg.AttestationCache.DeleteCovered(att); err != nil {
+					return err
+				}
+			} else if err := s.cfg.AttPool.DeleteAggregatedAttestation(att); err != nil {
 				return err
 			}
-		} else {
-			if err := s.cfg.AttPool.DeleteUnaggregatedAttestation(att); err != nil {
+			continue
+		}
+
+		offset := uint64(0)
+
+		committeeIndices := att.CommitteeBitsVal().BitIndices()
+		committees, err := helpers.AttestationCommittees(ctx, headState, att)
+		if err != nil {
+			return err
+		}
+		for i, c := range committees {
+			ab := bitfield.NewBitlist(uint64(len(c)))
+			for j := uint64(0); j < uint64(len(c)); j++ {
+				ab.SetBitAt(j, att.GetAggregationBits().BitAt(j+offset) == true)
+			}
+
+			cb := primitives.NewAttestationCommitteeBits()
+			cb.SetBitAt(uint64(committeeIndices[i]), true)
+
+			a := &ethpb.AttestationElectra{
+				AggregationBits: ab,
+				Data:            att.GetData(),
+				CommitteeBits:   cb,
+			}
+
+			if features.Get().EnableExperimentalAttestationPool {
+				if err := s.cfg.AttestationCache.DeleteCovered(a); err != nil {
+					return err
+				}
+			} else if err := s.cfg.AttPool.DeleteAggregatedAttestation(a); err != nil {
 				return err
 			}
+
+			offset += uint64(len(c))
 		}
 	}
 	return nil