EIP-7549: Add aggregate attestation interfaces

beacon-chain/blockchain/head_test.go

@@ -13,7 +13,6 @@ import (
  "github.com/prysmaticlabs/prysm/v5/beacon-chain/operations/blstoexec"
  "github.com/prysmaticlabs/prysm/v5/config/params"
  "github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
- "github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
  "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
  "github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
  ethpbv1 "github.com/prysmaticlabs/prysm/v5/proto/eth/v1"
@@ -313,7 +312,7 @@ func TestSaveOrphanedAtts(t *testing.T) {
 
  require.NoError(t, service.saveOrphanedOperations(ctx, r3, r4))
  require.Equal(t, 3, service.cfg.AttPool.AggregatedAttestationCount())
- wantAtts := []interfaces.Attestation{
+ wantAtts := []ethpb.Att{
  blk3.Block.Body.Attestations[0],
  blk2.Block.Body.Attestations[0],
  blk1.Block.Body.Attestations[0],
@@ -390,7 +389,7 @@ func TestSaveOrphanedOps(t *testing.T) {
 
  require.NoError(t, service.saveOrphanedOperations(ctx, r3, r4))
  require.Equal(t, 3, service.cfg.AttPool.AggregatedAttestationCount())
- wantAtts := []interfaces.Attestation{
+ wantAtts := []ethpb.Att{
  blk3.Block.Body.Attestations[0],
  blk2.Block.Body.Attestations[0],
  blk1.Block.Body.Attestations[0],
@@ -518,7 +517,7 @@ func TestSaveOrphanedAtts_DoublyLinkedTrie(t *testing.T) {
 
  require.NoError(t, service.saveOrphanedOperations(ctx, r3, r4))
  require.Equal(t, 3, service.cfg.AttPool.AggregatedAttestationCount())
- wantAtts := []interfaces.Attestation{
+ wantAtts := []ethpb.Att{
  blk3.Block.Body.Attestations[0],
  blk2.Block.Body.Attestations[0],
  blk1.Block.Body.Attestations[0],

beacon-chain/blockchain/process_attestation.go

@@ -6,7 +6,6 @@ import (
 
  "github.com/pkg/errors"
  "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
- "github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
  "github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
  ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
  "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1/attestation"
@@ -37,7 +36,7 @@ import (
 //
 // # Update latest messages for attesting indices
 // update_latest_messages(store, indexed_attestation.attesting_indices, attestation)
-func (s *Service) OnAttestation(ctx context.Context, a interfaces.Attestation, disparity time.Duration) error {
+func (s *Service) OnAttestation(ctx context.Context, a ethpb.Att, disparity time.Duration) error {
  ctx, span := trace.StartSpan(ctx, "blockChain.onAttestation")
  defer span.End()
 

beacon-chain/blockchain/process_attestation_test.go

@@ -9,7 +9,6 @@ import (
  "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/transition"
  fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
  "github.com/prysmaticlabs/prysm/v5/config/params"
- "github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
  "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
  "github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
  ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
@@ -74,7 +73,7 @@ func TestStore_OnAttestation_ErrorConditions(t *testing.T) {
 
  tests := []struct {
  name string
- a interfaces.Attestation
+ a ethpb.Att
  wantedErr string
  }{
  {

beacon-chain/blockchain/process_block.go

@@ -387,7 +387,7 @@ func (s *Service) handleBlockAttestations(ctx context.Context, blk interfaces.Re
 // InsertSlashingsToForkChoiceStore inserts attester slashing indices to fork choice store.
 // To call this function, it's caller's responsibility to ensure the slashing object is valid.
 // This function requires a write lock on forkchoice.
-func (s *Service) InsertSlashingsToForkChoiceStore(ctx context.Context, slashings []interfaces.AttesterSlashing) {
+func (s *Service) InsertSlashingsToForkChoiceStore(ctx context.Context, slashings []ethpb.AttSlashing) {
  for _, slashing := range slashings {
  indices := blocks.SlashableAttesterIndices(slashing)
  for _, index := range indices {

beacon-chain/blockchain/process_block_test.go

@@ -824,7 +824,7 @@ func TestRemoveBlockAttestationsInPool(t *testing.T) {
  require.NoError(t, service.cfg.BeaconDB.SaveStateSummary(ctx, &ethpb.StateSummary{Root: r[:]}))
  require.NoError(t, service.cfg.BeaconDB.SaveGenesisBlockRoot(ctx, r))
 
- atts := make([]interfaces.Attestation, len(b.Block.Body.Attestations))
+ atts := make([]ethpb.Att, len(b.Block.Body.Attestations))
  for i, a := range b.Block.Body.Attestations {
  atts[i] = a
  }

beacon-chain/blockchain/receive_attestation.go

@@ -10,7 +10,6 @@ import (
  "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
  "github.com/prysmaticlabs/prysm/v5/beacon-chain/state"
  "github.com/prysmaticlabs/prysm/v5/config/params"
- "github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
  "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
  "github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
  ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
@@ -32,7 +31,7 @@ type AttestationStateFetcher interface {
 // AttestationReceiver interface defines the methods of chain service receive and processing new attestations.
 type AttestationReceiver interface {
  AttestationStateFetcher
- VerifyLmdFfgConsistency(ctx context.Context, att interfaces.Attestation) error
+ VerifyLmdFfgConsistency(ctx context.Context, att ethpb.Att) error
  InForkchoice([32]byte) bool
 }
 
@@ -52,7 +51,7 @@ func (s *Service) AttestationTargetState(ctx context.Context, target *ethpb.Chec
 }
 
 // VerifyLmdFfgConsistency verifies that attestation's LMD and FFG votes are consistency to each other.
-func (s *Service) VerifyLmdFfgConsistency(ctx context.Context, a interfaces.Attestation) error {
+func (s *Service) VerifyLmdFfgConsistency(ctx context.Context, a ethpb.Att) error {
  r, err := s.TargetRootForEpoch([32]byte(a.GetData().BeaconBlockRoot), a.GetData().Target.Epoch)
  if err != nil {
  return err
@@ -207,7 +206,7 @@ func (s *Service) processAttestations(ctx context.Context, disparity time.Durati
 // 1. Validate attestation, update validator's latest vote
 // 2. Apply fork choice to the processed attestation
 // 3. Save latest head info
-func (s *Service) receiveAttestationNoPubsub(ctx context.Context, att interfaces.Attestation, disparity time.Duration) error {
+func (s *Service) receiveAttestationNoPubsub(ctx context.Context, att ethpb.Att, disparity time.Duration) error {
  ctx, span := trace.StartSpan(ctx, "beacon-chain.blockchain.receiveAttestationNoPubsub")
  defer span.End()
 

beacon-chain/blockchain/receive_attestation_test.go

@@ -10,7 +10,6 @@ import (
  forkchoicetypes "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice/types"
  "github.com/prysmaticlabs/prysm/v5/config/params"
  "github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
- "github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
  "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
  "github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
  ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
@@ -84,7 +83,7 @@ func TestProcessAttestations_Ok(t *testing.T) {
  state, blkRoot, err := prepareForkchoiceState(ctx, 0, tRoot, tRoot, params.BeaconConfig().ZeroHash, ojc, ofc)
  require.NoError(t, err)
  require.NoError(t, service.cfg.ForkChoiceStore.InsertNode(ctx, state, blkRoot))
- attsToSave := make([]interfaces.Attestation, len(atts))
+ attsToSave := make([]ethpb.Att, len(atts))
  for i, a := range atts {
  attsToSave[i] = a
  }
@@ -126,7 +125,7 @@ func TestService_ProcessAttestationsAndUpdateHead(t *testing.T) {
  // Generate attestations for this block in Slot 1
  atts, err := util.GenerateAttestations(copied, pks, 1, 1, false)
  require.NoError(t, err)
- attsToSave := make([]interfaces.Attestation, len(atts))
+ attsToSave := make([]ethpb.Att, len(atts))
  for i, a := range atts {
  attsToSave[i] = a
  }

beacon-chain/blockchain/receive_block.go

@@ -52,7 +52,7 @@ type BlobReceiver interface {
 
 // SlashingReceiver interface defines the methods of chain service for receiving validated slashing over the wire.
 type SlashingReceiver interface {
- ReceiveAttesterSlashing(ctx context.Context, slashing interfaces.AttesterSlashing)
+ ReceiveAttesterSlashing(ctx context.Context, slashing ethpb.AttSlashing)
 }
 
 // ReceiveBlock is a function that defines the operations (minus pubsub)
@@ -295,10 +295,10 @@ func (s *Service) HasBlock(ctx context.Context, root [32]byte) bool {
 }
 
 // ReceiveAttesterSlashing receives an attester slashing and inserts it to forkchoice
-func (s *Service) ReceiveAttesterSlashing(ctx context.Context, slashing interfaces.AttesterSlashing) {
+func (s *Service) ReceiveAttesterSlashing(ctx context.Context, slashing ethpb.AttSlashing) {
  s.cfg.ForkChoiceStore.Lock()
  defer s.cfg.ForkChoiceStore.Unlock()
- s.InsertSlashingsToForkChoiceStore(ctx, []interfaces.AttesterSlashing{slashing})
+ s.InsertSlashingsToForkChoiceStore(ctx, []ethpb.AttSlashing{slashing})
 }
 
 // prunePostBlockOperationPools only runs on new head otherwise should return a nil.

beacon-chain/blockchain/setup_test.go

@@ -20,7 +20,6 @@ import (
  "github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p"
  "github.com/prysmaticlabs/prysm/v5/beacon-chain/startup"
  "github.com/prysmaticlabs/prysm/v5/beacon-chain/state/stategen"
- "github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
  ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
  "github.com/prysmaticlabs/prysm/v5/testing/require"
  "google.golang.org/protobuf/proto"
@@ -50,7 +49,7 @@ func (mb *mockBroadcaster) Broadcast(_ context.Context, _ proto.Message) error {
  return nil
 }
 
-func (mb *mockBroadcaster) BroadcastAttestation(_ context.Context, _ uint64, _ interfaces.Attestation) error {
+func (mb *mockBroadcaster) BroadcastAttestation(_ context.Context, _ uint64, _ ethpb.Att) error {
  mb.broadcastCalled = true
  return nil
 }

beacon-chain/blockchain/testing/mock.go

@@ -414,7 +414,7 @@ func (*ChainService) HeadGenesisValidatorsRoot() [32]byte {
 }
 
 // VerifyLmdFfgConsistency mocks VerifyLmdFfgConsistency and always returns nil.
-func (*ChainService) VerifyLmdFfgConsistency(_ context.Context, a interfaces.Attestation) error {
+func (*ChainService) VerifyLmdFfgConsistency(_ context.Context, a ethpb.Att) error {
  if !bytes.Equal(a.GetData().BeaconBlockRoot, a.GetData().Target.Root) {
  return errors.New("LMD and FFG miss matched")
  }
@@ -495,7 +495,7 @@ func (s *ChainService) UpdateHead(ctx context.Context, slot primitives.Slot) {
 }
 
 // ReceiveAttesterSlashing mocks the same method in the chain service.
-func (*ChainService) ReceiveAttesterSlashing(context.Context, interfaces.AttesterSlashing) {}
+func (*ChainService) ReceiveAttesterSlashing(context.Context, ethpb.AttSlashing) {}
 
 // IsFinalized mocks the same method in the chain service.
 func (s *ChainService) IsFinalized(_ context.Context, blockRoot [32]byte) bool {

beacon-chain/core/altair/attestation.go

@@ -48,7 +48,7 @@ func ProcessAttestationsNoVerifySignature(
 func ProcessAttestationNoVerifySignature(
  ctx context.Context,
  beaconState state.BeaconState,
- att interfaces.Attestation,
+ att ethpb.Att,
  totalBalance uint64,
 ) (state.BeaconState, error) {
  ctx, span := trace.StartSpan(ctx, "altair.ProcessAttestationNoVerifySignature")

beacon-chain/core/blocks/attestation.go

@@ -46,7 +46,7 @@ func ProcessAttestationsNoVerifySignature(
 func VerifyAttestationNoVerifySignature(
  ctx context.Context,
  beaconState state.ReadOnlyBeaconState,
- att interfaces.Attestation,
+ att ethpb.Att,
 ) error {
  ctx, span := trace.StartSpan(ctx, "core.VerifyAttestationNoVerifySignature")
  defer span.End()
@@ -133,7 +133,7 @@ func VerifyAttestationNoVerifySignature(
  return errors.New("committee index must be 0 post-Electra")
  }
 
- committeeIndices := att.GetCommitteeBitsVal().BitIndices()
+ committeeIndices := att.CommitteeBitsVal().BitIndices()
  committees := make([][]primitives.ValidatorIndex, len(committeeIndices))
  participantsCount := 0
  var err error
@@ -164,7 +164,7 @@ func VerifyAttestationNoVerifySignature(
 func ProcessAttestationNoVerifySignature(
  ctx context.Context,
  beaconState state.BeaconState,
- att interfaces.Attestation,
+ att ethpb.Att,
 ) (state.BeaconState, error) {
  ctx, span := trace.StartSpan(ctx, "core.ProcessAttestationNoVerifySignature")
  defer span.End()
@@ -202,7 +202,7 @@ func ProcessAttestationNoVerifySignature(
 
 // VerifyAttestationSignature converts and attestation into an indexed attestation and verifies
 // the signature in that attestation.
-func VerifyAttestationSignature(ctx context.Context, beaconState state.ReadOnlyBeaconState, att interfaces.Attestation) error {
+func VerifyAttestationSignature(ctx context.Context, beaconState state.ReadOnlyBeaconState, att ethpb.Att) error {
  if err := helpers.ValidateNilAttestation(att); err != nil {
  return err
  }

beacon-chain/core/blocks/attestation_test.go

@@ -11,7 +11,6 @@ import (
  state_native "github.com/prysmaticlabs/prysm/v5/beacon-chain/state/state-native"
  fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
  "github.com/prysmaticlabs/prysm/v5/config/params"
- "github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
  "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
  "github.com/prysmaticlabs/prysm/v5/crypto/bls"
  "github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
@@ -464,7 +463,7 @@ func TestValidateIndexedAttestation_BadAttestationsSignatureSet(t *testing.T) {
 
  sig := keys[0].Sign([]byte{'t', 'e', 's', 't'})
  list := bitfield.Bitlist{0b11111}
- var atts []interfaces.Attestation
+ var atts []ethpb.Att
  for i := uint64(0); i < 1000; i++ {
  atts = append(atts, &ethpb.Attestation{
  Data: &ethpb.AttestationData{
@@ -480,7 +479,7 @@ func TestValidateIndexedAttestation_BadAttestationsSignatureSet(t *testing.T) {
  _, err := blocks.AttestationSignatureBatch(context.Background(), beaconState, atts)
  assert.ErrorContains(t, want, err)
 
- atts = []interfaces.Attestation{}
+ atts = []ethpb.Att{}
  list = bitfield.Bitlist{0b10000}
  for i := uint64(0); i < 1000; i++ {
  atts = append(atts, &ethpb.Attestation{
@@ -621,7 +620,7 @@ func TestRetrieveAttestationSignatureSet_VerifiesMultipleAttestations(t *testing
  }
  att2.Signature = bls.AggregateSignatures(sigs).Marshal()
 
- set, err := blocks.AttestationSignatureBatch(ctx, st, []interfaces.Attestation{att1, att2})
+ set, err := blocks.AttestationSignatureBatch(ctx, st, []ethpb.Att{att1, att2})
  require.NoError(t, err)
  verified, err := set.Verify()
  require.NoError(t, err)
@@ -685,6 +684,6 @@ func TestRetrieveAttestationSignatureSet_AcrossFork(t *testing.T) {
  }
  att2.Signature = bls.AggregateSignatures(sigs).Marshal()
 
- _, err = blocks.AttestationSignatureBatch(ctx, st, []interfaces.Attestation{att1, att2})
+ _, err = blocks.AttestationSignatureBatch(ctx, st, []ethpb.Att{att1, att2})
  require.NoError(t, err)
 }

beacon-chain/core/blocks/attester_slashing.go

@@ -7,7 +7,6 @@ import (
  "github.com/pkg/errors"
  "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
  "github.com/prysmaticlabs/prysm/v5/beacon-chain/state"
- "github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
  "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
  "github.com/prysmaticlabs/prysm/v5/container/slice"
  ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
@@ -39,7 +38,7 @@ import (
 func ProcessAttesterSlashings(
  ctx context.Context,
  beaconState state.BeaconState,
- slashings []interfaces.AttesterSlashing,
+ slashings []ethpb.AttSlashing,
  slashFunc slashValidatorFunc,
 ) (state.BeaconState, error) {
  var err error
@@ -56,7 +55,7 @@ func ProcessAttesterSlashings(
 func ProcessAttesterSlashing(
  ctx context.Context,
  beaconState state.BeaconState,
- slashing interfaces.AttesterSlashing,
+ slashing ethpb.AttSlashing,
  slashFunc slashValidatorFunc,
 ) (state.BeaconState, error) {
  if err := VerifyAttesterSlashing(ctx, beaconState, slashing); err != nil {
@@ -91,18 +90,18 @@ func ProcessAttesterSlashing(
 }
 
 // VerifyAttesterSlashing validates the attestation data in both attestations in the slashing object.
-func VerifyAttesterSlashing(ctx context.Context, beaconState state.ReadOnlyBeaconState, slashing interfaces.AttesterSlashing) error {
+func VerifyAttesterSlashing(ctx context.Context, beaconState state.ReadOnlyBeaconState, slashing ethpb.AttSlashing) error {
  if slashing == nil {
  return errors.New("nil slashing")
  }
- if slashing.GetFirstAttestation() == nil || slashing.GetSecondAttestation() == nil {
+ if slashing.FirstAttestation() == nil || slashing.SecondAttestation() == nil {
  return errors.New("nil attestation")
  }
- if slashing.GetFirstAttestation().GetData() == nil || slashing.GetSecondAttestation().GetData() == nil {
+ if slashing.FirstAttestation().GetData() == nil || slashing.SecondAttestation().GetData() == nil {
  return errors.New("nil attestation data")
  }
- att1 := slashing.GetFirstAttestation()
- att2 := slashing.GetSecondAttestation()
+ att1 := slashing.FirstAttestation()
+ att2 := slashing.SecondAttestation()
  data1 := att1.GetData()
  data2 := att2.GetData()
  if !IsSlashableAttestationData(data1, data2) {
@@ -144,11 +143,11 @@ func IsSlashableAttestationData(data1, data2 *ethpb.AttestationData) bool {
 }
 
 // SlashableAttesterIndices returns the intersection of attester indices from both attestations in this slashing.
-func SlashableAttesterIndices(slashing interfaces.AttesterSlashing) []uint64 {
- if slashing == nil || slashing.GetFirstAttestation() == nil || slashing.GetSecondAttestation() == nil {
+func SlashableAttesterIndices(slashing ethpb.AttSlashing) []uint64 {
+ if slashing == nil || slashing.FirstAttestation() == nil || slashing.SecondAttestation() == nil {
  return nil
  }
- indices1 := slashing.GetFirstAttestation().GetAttestingIndices()
- indices2 := slashing.GetSecondAttestation().GetAttestingIndices()
+ indices1 := slashing.FirstAttestation().GetAttestingIndices()
+ indices2 := slashing.SecondAttestation().GetAttestingIndices()
  return slice.IntersectionUint64(indices1, indices2)
 }