get_attesting_indices

beacon-chain/core/helpers/beacon_committee.go

@@ -296,7 +296,7 @@ func ShuffledIndices(s state.ReadOnlyBeaconState, epoch primitives.Epoch) ([]pri
 }
 
 // TODO: doc
-func GetCommitteeIndices(committeeBits bitfield.Bitlist) []primitives.CommitteeIndex {
+func CommitteeIndices(committeeBits bitfield.Bitlist) []primitives.CommitteeIndex {
 	indices := committeeBits.BitIndices()
 	committeeIndices := make([]primitives.CommitteeIndex, len(indices))
 	for i, ix := range indices {

beacon-chain/monitor/process_attestation.go

@@ -34,11 +34,36 @@ func (s *Service) canUpdateAttestedValidator(idx primitives.ValidatorIndex, slot
 
 // attestingIndices returns the indices of validators that participated in the given aggregated attestation.
 func attestingIndices(ctx context.Context, state state.BeaconState, att interfaces.Attestation) ([]uint64, error) {
-	committee, err := helpers.BeaconCommitteeFromState(ctx, state, att.GetData().Slot, att.GetData().CommitteeIndex)
-	if err != nil {
-		return nil, err
+	aggBits := att.GetAggregationBits()
+
+	if att.Version() < version.Electra {
+		committee, err := helpers.BeaconCommitteeFromState(ctx, state, att.GetData().Slot, att.GetData().CommitteeIndex)
+		if err != nil {
+			return nil, err
+		}
+		return attestation.AttestingIndices(aggBits, committee)
+	}
+
+	attesters := make([]uint64, 0, len(att.GetAggregationBits()))
+	committeeIndices := helpers.CommitteeIndices(att.GetCommitteeBits())
+	committeeOffset := 0
+	for _, ci := range committeeIndices {
+		committee, err := helpers.BeaconCommitteeFromState(ctx, state, att.GetData().Slot, ci)
+		if err != nil {
+			return nil, err
+		}
+		committeeAttesters := make([]uint64, 0, len(committee))
+		for i, vi := range committee {
+			if aggBits[committeeOffset+i] == 1 {
+				committeeAttesters = append(committeeAttesters, uint64(committee[vi]))
+			}
+		}
+		attesters = append(attesters, committeeAttesters...)
+
+		committeeOffset += len(committee)
 	}
-	return attestation.AttestingIndices(att.GetAggregationBits(), committee)
+
+	return attesters, nil
 }
 
 // logMessageTimelyFlagsForIndex returns the log message with performance info for the attestation (head, source, target)

consensus-types/interfaces/beacon_block.go

@@ -142,6 +142,7 @@ type Attestation interface {
 	ssz.Marshaler
 	ssz.Unmarshaler
 	ssz.HashRoot
+	Version() int
 	GetAggregationBits() bitfield.Bitlist
 	SetAggregationBits(bits bitfield.Bitlist)
 	GetData() *ethpb.AttestationData

proto/prysm/v1alpha1/attestation.go

@@ -2,8 +2,13 @@ package eth
 
 import (
 	"github.com/prysmaticlabs/go-bitfield"
+	"github.com/prysmaticlabs/prysm/v5/runtime/version"
 )
 
+func (a *Attestation) Version() int {
+	return version.Phase0
+}
+
 func (a *Attestation) GetCommitteeBits() bitfield.Bitlist {
 	return nil
 }
@@ -24,6 +29,10 @@ func (a *Attestation) SetSignature(sig []byte) {
 	a.Signature = sig
 }
 
+func (a *AttestationElectra) Version() int {
+	return version.Electra
+}
+
 func (a *AttestationElectra) SetAggregationBits(bits bitfield.Bitlist) {
 	a.AggregationBits = bits
 }

runtime/version/fork.go

@@ -8,6 +8,7 @@ const (
 	Bellatrix
 	Capella
 	Deneb
+	Electra
 )
 
 var versionToString = map[int]string{
@@ -16,6 +17,7 @@ var versionToString = map[int]string{
 	Bellatrix: "bellatrix",
 	Capella:   "capella",
 	Deneb:     "deneb",
+	Electra:   "electra",
 }
 
 // stringToVersion and allVersions are populated in init()