Use errgroup in OptimizedValidatorRoots

**What type of PR is this?**

Feature

**What does this PR do? Why is it needed?**

This PR allows devs to test against a specific run of the nightly
reference test generator.

**Acknowledgements**

- [x] I have read
[CONTRIBUTING.md](https://github.com/prysmaticlabs/prysm/blob/develop/CONTRIBUTING.md).
- [x] I have included a uniquely named [changelog fragment
file](https://github.com/prysmaticlabs/prysm/blob/develop/CONTRIBUTING.md#maintaining-changelogmd).
- [x] I have added a description with sufficient context for reviewers
to understand this PR.
- [x] I have tested that my changes work as expected and I added a
testing plan to the PR description (if applicable).

api/server/structs/block.go

@@ -540,12 +540,6 @@ type PayloadAttestation struct {
 	Signature       string                  `json:"signature"`
 }
 
-type PayloadAttestationMessage struct {
-	ValidatorIndex string                  `json:"validator_index"`
-	Data           *PayloadAttestationData `json:"data"`
-	Signature      string                  `json:"signature"`
-}
-
 type BeaconBlockBodyGloas struct {
 	RandaoReveal              string                        `json:"randao_reveal"`
 	Eth1Data                  *Eth1Data                     `json:"eth1_data"`

api/server/structs/conversions_block.go

@@ -3263,34 +3263,3 @@ func (d *PayloadAttestationData) ToConsensus() (*eth.PayloadAttestationData, err
 		BlobDataAvailable: d.BlobDataAvailable,
 	}, nil
 }
-
-func PayloadAttestationMessageFromConsensus(msg *eth.PayloadAttestationMessage) *PayloadAttestationMessage {
-	return &PayloadAttestationMessage{
-		ValidatorIndex: fmt.Sprintf("%d", msg.ValidatorIndex),
-		Data:           PayloadAttestationDataFromConsensus(msg.Data),
-		Signature:      hexutil.Encode(msg.Signature),
-	}
-}
-
-func (p *PayloadAttestationMessage) ToConsensus() (*eth.PayloadAttestationMessage, error) {
-	if p == nil {
-		return nil, errNilValue
-	}
-	validatorIndex, err := strconv.ParseUint(p.ValidatorIndex, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ValidatorIndex")
-	}
-	data, err := p.Data.ToConsensus()
-	if err != nil {
-		return nil, server.NewDecodeError(err, "Data")
-	}
-	sig, err := bytesutil.DecodeHexWithLength(p.Signature, fieldparams.BLSSignatureLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "Signature")
-	}
-	return &eth.PayloadAttestationMessage{
-		ValidatorIndex: primitives.ValidatorIndex(validatorIndex),
-		Data:           data,
-		Signature:      sig,
-	}, nil
-}

api/server/structs/endpoints_beacon.go

@@ -188,11 +188,6 @@ type BLSToExecutionChangesPoolResponse struct {
 	Data []*SignedBLSToExecutionChange `json:"data"`
 }
 
-type GetPoolPayloadAttestationsResponse struct {
-	Version string                `json:"version"`
-	Data    []*PayloadAttestation `json:"data"`
-}
-
 type GetAttesterSlashingsResponse struct {
 	Version string          `json:"version,omitempty"`
 	Data    json.RawMessage `json:"data"` // Accepts both `[]*AttesterSlashing` and `[]*AttesterSlashingElectra` types

api/server/structs/endpoints_validator.go

@@ -31,11 +31,6 @@ type GetAttestationDataResponse struct {
 	Data *AttestationData `json:"data"`
 }
 
-type GetPayloadAttestationDataResponse struct {
-	Version string                  `json:"version"`
-	Data    *PayloadAttestationData `json:"data"`
-}
-
 type ProduceSyncCommitteeContributionResponse struct {
 	Data *SyncCommitteeContribution `json:"data"`
 }

beacon-chain/node/BUILD.bazel

@@ -37,7 +37,6 @@ go_library(
         "//beacon-chain/node/registration:go_default_library",
         "//beacon-chain/operations/attestations:go_default_library",
         "//beacon-chain/operations/blstoexec:go_default_library",
-        "//beacon-chain/operations/payloadattestation:go_default_library",
         "//beacon-chain/operations/slashings:go_default_library",
         "//beacon-chain/operations/synccommittee:go_default_library",
         "//beacon-chain/operations/voluntaryexits:go_default_library",

beacon-chain/node/node.go

@@ -40,7 +40,6 @@ import (
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/node/registration"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/attestations"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/blstoexec"
-	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/payloadattestation"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/slashings"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/synccommittee"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/voluntaryexits"
@@ -102,7 +101,6 @@ type BeaconNode struct {
 	slashingsPool            slashings.PoolManager
 	syncCommitteePool        synccommittee.Pool
 	blsToExecPool            blstoexec.PoolManager
-	payloadAttestationPool   payloadattestation.PoolManager
 	depositCache             cache.DepositCache
 	trackedValidatorsCache   *cache.TrackedValidatorsCache
 	payloadIDCache           *cache.PayloadIDCache
@@ -157,7 +155,6 @@ func New(cliCtx *cli.Context, cancel context.CancelFunc, opts ...Option) (*Beaco
 		slashingsPool:           slashings.NewPool(),
 		syncCommitteePool:       synccommittee.NewPool(),
 		blsToExecPool:           blstoexec.NewPool(),
-		payloadAttestationPool:  payloadattestation.NewPool(),
 		trackedValidatorsCache:  cache.NewTrackedValidatorsCache(),
 		payloadIDCache:          cache.NewPayloadIDCache(),
 		slasherBlockHeadersFeed: new(event.Feed),
@@ -975,7 +972,6 @@ func (b *BeaconNode) registerRPCService(router *http.ServeMux) error {
 		SlashingsPool:             b.slashingsPool,
 		BLSChangesPool:            b.blsToExecPool,
 		SyncCommitteeObjectPool:   b.syncCommitteePool,
-		PayloadAttestationPool:    b.payloadAttestationPool,
 		ExecutionChainService:     web3Service,
 		ExecutionChainInfoFetcher: web3Service,
 		ChainStartFetcher:         chainStartFetcher,

beacon-chain/operations/payloadattestation/BUILD.bazel

@@ -1,27 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["pool.go"],
-    importpath = "github.com/OffchainLabs/prysm/v7/beacon-chain/operations/payloadattestation",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//consensus-types/primitives:go_default_library",
-        "//crypto/hash:go_default_library",
-        "//proto/prysm/v1alpha1:go_default_library",
-        "@com_github_pkg_errors//:go_default_library",
-        "@org_golang_google_protobuf//proto:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["pool_test.go"],
-    embed = [":go_default_library"],
-    deps = [
-        "//consensus-types/primitives:go_default_library",
-        "//proto/prysm/v1alpha1:go_default_library",
-        "//testing/assert:go_default_library",
-        "//testing/require:go_default_library",
-    ],
-)

beacon-chain/operations/payloadattestation/pool.go

@@ -1,108 +0,0 @@
-package payloadattestation
-
-import (
-	"sync"
-
-	"github.com/OffchainLabs/prysm/v7/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v7/crypto/hash"
-	ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
-	"github.com/pkg/errors"
-	"google.golang.org/protobuf/proto"
-)
-
-// PoolManager maintains pending payload attestations.
-// This pool is used by proposers to insert payload attestations into new blocks.
-type PoolManager interface {
-	PendingPayloadAttestations(slot ...primitives.Slot) []*ethpb.PayloadAttestation
-	InsertPayloadAttestation(msg *ethpb.PayloadAttestationMessage) error
-	MarkIncluded(att *ethpb.PayloadAttestation)
-}
-
-// Pool is a concrete implementation of PoolManager.
-type Pool struct {
-	lock    sync.RWMutex
-	pending map[[32]byte]*ethpb.PayloadAttestation
-}
-
-// NewPool returns an initialized pool.
-func NewPool() *Pool {
-	return &Pool{
-		pending: make(map[[32]byte]*ethpb.PayloadAttestation),
-	}
-}
-
-// PendingPayloadAttestations returns all pending payload attestations from the pool.
-// If a slot is provided, only attestations for that slot are returned.
-func (p *Pool) PendingPayloadAttestations(slot ...primitives.Slot) []*ethpb.PayloadAttestation {
-	p.lock.RLock()
-	defer p.lock.RUnlock()
-
-	result := make([]*ethpb.PayloadAttestation, 0, len(p.pending))
-	for _, att := range p.pending {
-		if len(slot) > 0 && att.Data.Slot != slot[0] {
-			continue
-		}
-		result = append(result, att)
-	}
-	return result
-}
-
-// InsertPayloadAttestation inserts a payload attestation message into the pool.
-// The message is converted to an aggregated PayloadAttestation and merged with
-// any existing attestation that has matching PayloadAttestationData.
-func (p *Pool) InsertPayloadAttestation(msg *ethpb.PayloadAttestationMessage) error {
-	if msg == nil || msg.Data == nil {
-		return errors.New("nil payload attestation message")
-	}
-
-	key, err := dataKey(msg.Data)
-	if err != nil {
-		return errors.Wrap(err, "could not compute data key")
-	}
-
-	p.lock.Lock()
-	defer p.lock.Unlock()
-
-	existing, ok := p.pending[key]
-	if !ok {
-		// Create a new aggregated PayloadAttestation from this message.
-		p.pending[key] = &ethpb.PayloadAttestation{
-			AggregationBits: []byte{},
-			Data:            proto.Clone(msg.Data).(*ethpb.PayloadAttestationData),
-			Signature:       msg.Signature,
-		}
-		return nil
-	}
-
-	// Merge: for now just replace the signature since proper BLS aggregation
-	// requires knowing the PTC committee position. Full aggregation is a TODO.
-	_ = existing
-	return nil
-}
-
-// MarkIncluded removes the attestation with matching data from the pool.
-func (p *Pool) MarkIncluded(att *ethpb.PayloadAttestation) {
-	if att == nil || att.Data == nil {
-		return
-	}
-
-	key, err := dataKey(att.Data)
-	if err != nil {
-		return
-	}
-
-	p.lock.Lock()
-	defer p.lock.Unlock()
-
-	delete(p.pending, key)
-}
-
-// dataKey computes a deterministic key for PayloadAttestationData
-// by hashing its serialized form.
-func dataKey(data *ethpb.PayloadAttestationData) ([32]byte, error) {
-	enc, err := proto.Marshal(data)
-	if err != nil {
-		return [32]byte{}, err
-	}
-	return hash.Hash(enc), nil
-}

beacon-chain/operations/payloadattestation/pool_test.go

@@ -1,201 +0,0 @@
-package payloadattestation
-
-import (
-	"testing"
-
-	"github.com/OffchainLabs/prysm/v7/consensus-types/primitives"
-	ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v7/testing/assert"
-	"github.com/OffchainLabs/prysm/v7/testing/require"
-)
-
-func TestPool_PendingPayloadAttestations(t *testing.T) {
-	t.Run("empty pool", func(t *testing.T) {
-		pool := NewPool()
-		atts := pool.PendingPayloadAttestations()
-		assert.Equal(t, 0, len(atts))
-	})
-
-	t.Run("non-empty pool", func(t *testing.T) {
-		pool := NewPool()
-		msg1 := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 0,
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              1,
-				PayloadPresent:    true,
-				BlobDataAvailable: false,
-			},
-			Signature: make([]byte, 96),
-		}
-		msg2 := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 1,
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              2,
-				PayloadPresent:    false,
-				BlobDataAvailable: true,
-			},
-			Signature: make([]byte, 96),
-		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg1))
-		require.NoError(t, pool.InsertPayloadAttestation(msg2))
-		atts := pool.PendingPayloadAttestations()
-		assert.Equal(t, 2, len(atts))
-	})
-
-	t.Run("filter by slot", func(t *testing.T) {
-		pool := NewPool()
-		msg1 := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 0,
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              1,
-				PayloadPresent:    true,
-				BlobDataAvailable: false,
-			},
-			Signature: make([]byte, 96),
-		}
-		msg2 := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 1,
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              2,
-				PayloadPresent:    false,
-				BlobDataAvailable: true,
-			},
-			Signature: make([]byte, 96),
-		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg1))
-		require.NoError(t, pool.InsertPayloadAttestation(msg2))
-
-		atts := pool.PendingPayloadAttestations(primitives.Slot(1))
-		assert.Equal(t, 1, len(atts))
-		assert.Equal(t, primitives.Slot(1), atts[0].Data.Slot)
-
-		atts = pool.PendingPayloadAttestations(primitives.Slot(2))
-		assert.Equal(t, 1, len(atts))
-		assert.Equal(t, primitives.Slot(2), atts[0].Data.Slot)
-
-		atts = pool.PendingPayloadAttestations(primitives.Slot(99))
-		assert.Equal(t, 0, len(atts))
-	})
-}
-
-func TestPool_InsertPayloadAttestation(t *testing.T) {
-	t.Run("nil message", func(t *testing.T) {
-		pool := NewPool()
-		err := pool.InsertPayloadAttestation(nil)
-		require.ErrorContains(t, "nil payload attestation message", err)
-	})
-
-	t.Run("nil data", func(t *testing.T) {
-		pool := NewPool()
-		err := pool.InsertPayloadAttestation(&ethpb.PayloadAttestationMessage{})
-		require.ErrorContains(t, "nil payload attestation message", err)
-	})
-
-	t.Run("insert creates new entry", func(t *testing.T) {
-		pool := NewPool()
-		msg := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 0,
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              1,
-				PayloadPresent:    true,
-				BlobDataAvailable: false,
-			},
-			Signature: make([]byte, 96),
-		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg))
-		atts := pool.PendingPayloadAttestations()
-		assert.Equal(t, 1, len(atts))
-	})
-
-	t.Run("duplicate data does not create second entry", func(t *testing.T) {
-		pool := NewPool()
-		msg1 := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 0,
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              1,
-				PayloadPresent:    true,
-				BlobDataAvailable: false,
-			},
-			Signature: make([]byte, 96),
-		}
-		msg2 := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 1,
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              1,
-				PayloadPresent:    true,
-				BlobDataAvailable: false,
-			},
-			Signature: make([]byte, 96),
-		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg1))
-		require.NoError(t, pool.InsertPayloadAttestation(msg2))
-		atts := pool.PendingPayloadAttestations()
-		assert.Equal(t, 1, len(atts))
-	})
-}
-
-func TestPool_MarkIncluded(t *testing.T) {
-	t.Run("mark included removes from pool", func(t *testing.T) {
-		pool := NewPool()
-		msg := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 0,
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              1,
-				PayloadPresent:    true,
-				BlobDataAvailable: false,
-			},
-			Signature: make([]byte, 96),
-		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg))
-		assert.Equal(t, 1, len(pool.PendingPayloadAttestations()))
-
-		pool.MarkIncluded(&ethpb.PayloadAttestation{
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              1,
-				PayloadPresent:    true,
-				BlobDataAvailable: false,
-			},
-		})
-		assert.Equal(t, 0, len(pool.PendingPayloadAttestations()))
-	})
-
-	t.Run("mark included with non-matching data does nothing", func(t *testing.T) {
-		pool := NewPool()
-		msg := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 0,
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              1,
-				PayloadPresent:    true,
-				BlobDataAvailable: false,
-			},
-			Signature: make([]byte, 96),
-		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg))
-
-		pool.MarkIncluded(&ethpb.PayloadAttestation{
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              999,
-				PayloadPresent:    true,
-				BlobDataAvailable: false,
-			},
-		})
-		assert.Equal(t, 1, len(pool.PendingPayloadAttestations()))
-	})
-
-	t.Run("mark included with nil is safe", func(t *testing.T) {
-		pool := NewPool()
-		pool.MarkIncluded(nil)
-		pool.MarkIncluded(&ethpb.PayloadAttestation{})
-	})
-}

beacon-chain/rpc/BUILD.bazel

@@ -26,7 +26,6 @@ go_library(
         "//beacon-chain/light-client:go_default_library",
         "//beacon-chain/operations/attestations:go_default_library",
         "//beacon-chain/operations/blstoexec:go_default_library",
-        "//beacon-chain/operations/payloadattestation:go_default_library",
         "//beacon-chain/operations/slashings:go_default_library",
         "//beacon-chain/operations/synccommittee:go_default_library",
         "//beacon-chain/operations/voluntaryexits:go_default_library",

beacon-chain/rpc/endpoints.go

@@ -217,7 +217,6 @@ func (s *Service) validatorEndpoints(
 		OperationNotifier:      s.cfg.OperationNotifier,
 		TrackedValidatorsCache: s.cfg.TrackedValidatorsCache,
 		PayloadIDCache:         s.cfg.PayloadIDCache,
-		PayloadAttestationPool: s.cfg.PayloadAttestationPool,
 		CoreService:            coreService,
 		BlockRewardFetcher:     rewardFetcher,
 	}
@@ -391,16 +390,6 @@ func (s *Service) validatorEndpoints(
 			handler: server.SyncCommitteeSelections,
 			methods: []string{http.MethodPost},
 		},
-		{
-			template: "/eth/v1/validator/payload_attestation_data/{slot}",
-			name:     namespace + ".GetPayloadAttestationData",
-			middleware: []middleware.Middleware{
-				middleware.AcceptHeaderHandler([]string{api.JsonMediaType, api.OctetStreamMediaType}),
-				middleware.AcceptEncodingHeaderHandler(),
-			},
-			handler: server.GetPayloadAttestationData,
-			methods: []string{http.MethodGet},
-		},
 	}
 }
 
@@ -523,7 +512,6 @@ func (s *Service) beaconEndpoints(
 		SyncChecker:             s.cfg.SyncService,
 		ExecutionReconstructor:  s.cfg.ExecutionReconstructor,
 		BLSChangesPool:          s.cfg.BLSChangesPool,
-		PayloadAttestationPool:  s.cfg.PayloadAttestationPool,
 		FinalizationFetcher:     s.cfg.FinalizationFetcher,
 		ForkchoiceFetcher:       s.cfg.ForkchoiceFetcher,
 		CoreService:             coreService,
@@ -881,27 +869,6 @@ func (s *Service) beaconEndpoints(
 			handler: server.GetProposerLookahead,
 			methods: []string{http.MethodGet},
 		},
-		{
-			template: "/eth/v1/beacon/pool/payload_attestations",
-			name:     namespace + ".ListPayloadAttestations",
-			middleware: []middleware.Middleware{
-				middleware.AcceptHeaderHandler([]string{api.JsonMediaType}),
-				middleware.AcceptEncodingHeaderHandler(),
-			},
-			handler: server.ListPayloadAttestations,
-			methods: []string{http.MethodGet},
-		},
-		{
-			template: "/eth/v1/beacon/pool/payload_attestations",
-			name:     namespace + ".SubmitPayloadAttestations",
-			middleware: []middleware.Middleware{
-				middleware.ContentTypeHandler([]string{api.JsonMediaType}),
-				middleware.AcceptHeaderHandler([]string{api.JsonMediaType}),
-				middleware.AcceptEncodingHeaderHandler(),
-			},
-			handler: server.SubmitPayloadAttestations,
-			methods: []string{http.MethodPost},
-		},
 	}
 }
 

beacon-chain/rpc/endpoints_test.go

@@ -48,7 +48,6 @@ func Test_endpoints(t *testing.T) {
 		"/eth/v1/beacon/pool/sync_committees":                          {http.MethodPost},
 		"/eth/v1/beacon/pool/voluntary_exits":                          {http.MethodGet, http.MethodPost},
 		"/eth/v1/beacon/pool/bls_to_execution_changes":                 {http.MethodGet, http.MethodPost},
-		"/eth/v1/beacon/pool/payload_attestations":                     {http.MethodGet, http.MethodPost},
 		"/prysm/v1/beacon/individual_votes":                            {http.MethodPost},
 	}
 
@@ -92,23 +91,22 @@ func Test_endpoints(t *testing.T) {
 	}
 
 	validatorRoutes := map[string][]string{
-		"/eth/v1/validator/duties/attester/{epoch}":         {http.MethodPost},
-		"/eth/v1/validator/duties/proposer/{epoch}":         {http.MethodGet},
-		"/eth/v1/validator/duties/sync/{epoch}":             {http.MethodPost},
-		"/eth/v3/validator/blocks/{slot}":                   {http.MethodGet},
-		"/eth/v1/validator/attestation_data":                {http.MethodGet},
-		"/eth/v2/validator/aggregate_attestation":           {http.MethodGet},
-		"/eth/v2/validator/aggregate_and_proofs":            {http.MethodPost},
-		"/eth/v1/validator/beacon_committee_subscriptions":  {http.MethodPost},
-		"/eth/v1/validator/sync_committee_subscriptions":    {http.MethodPost},
-		"/eth/v1/validator/beacon_committee_selections":     {http.MethodPost},
-		"/eth/v1/validator/sync_committee_selections":       {http.MethodPost},
-		"/eth/v1/validator/sync_committee_contribution":     {http.MethodGet},
-		"/eth/v1/validator/contribution_and_proofs":         {http.MethodPost},
-		"/eth/v1/validator/prepare_beacon_proposer":         {http.MethodPost},
-		"/eth/v1/validator/register_validator":              {http.MethodPost},
-		"/eth/v1/validator/liveness/{epoch}":                {http.MethodPost},
-		"/eth/v1/validator/payload_attestation_data/{slot}": {http.MethodGet},
+		"/eth/v1/validator/duties/attester/{epoch}":        {http.MethodPost},
+		"/eth/v1/validator/duties/proposer/{epoch}":        {http.MethodGet},
+		"/eth/v1/validator/duties/sync/{epoch}":            {http.MethodPost},
+		"/eth/v3/validator/blocks/{slot}":                  {http.MethodGet},
+		"/eth/v1/validator/attestation_data":               {http.MethodGet},
+		"/eth/v2/validator/aggregate_attestation":          {http.MethodGet},
+		"/eth/v2/validator/aggregate_and_proofs":           {http.MethodPost},
+		"/eth/v1/validator/beacon_committee_subscriptions": {http.MethodPost},
+		"/eth/v1/validator/sync_committee_subscriptions":   {http.MethodPost},
+		"/eth/v1/validator/beacon_committee_selections":    {http.MethodPost},
+		"/eth/v1/validator/sync_committee_selections":      {http.MethodPost},
+		"/eth/v1/validator/sync_committee_contribution":    {http.MethodGet},
+		"/eth/v1/validator/contribution_and_proofs":        {http.MethodPost},
+		"/eth/v1/validator/prepare_beacon_proposer":        {http.MethodPost},
+		"/eth/v1/validator/register_validator":             {http.MethodPost},
+		"/eth/v1/validator/liveness/{epoch}":               {http.MethodPost},
 	}
 
 	prysmBeaconRoutes := map[string][]string{

beacon-chain/rpc/eth/beacon/BUILD.bazel

@@ -32,7 +32,6 @@ go_library(
         "//beacon-chain/execution:go_default_library",
         "//beacon-chain/operations/attestations:go_default_library",
         "//beacon-chain/operations/blstoexec:go_default_library",
-        "//beacon-chain/operations/payloadattestation:go_default_library",
         "//beacon-chain/operations/slashings:go_default_library",
         "//beacon-chain/operations/voluntaryexits:go_default_library",
         "//beacon-chain/p2p:go_default_library",

beacon-chain/rpc/eth/beacon/handlers_pool.go

@@ -893,89 +893,3 @@ func (s *Server) SubmitProposerSlashing(w http.ResponseWriter, r *http.Request)
 		}
 	}
 }
-
-// SubmitPayloadAttestations submits payload attestation messages to the node's pool.
-func (s *Server) SubmitPayloadAttestations(w http.ResponseWriter, r *http.Request) {
-	ctx, span := trace.StartSpan(r.Context(), "beacon.SubmitPayloadAttestations")
-	defer span.End()
-
-	if shared.IsSyncing(ctx, w, s.SyncChecker, s.HeadFetcher, s.TimeFetcher, s.OptimisticModeFetcher) {
-		return
-	}
-
-	versionHeader := r.Header.Get(api.VersionHeader)
-	if versionHeader == "" {
-		httputil.HandleError(w, api.VersionHeader+" header is required", http.StatusBadRequest)
-		return
-	}
-
-	var msgs []*structs.PayloadAttestationMessage
-	if err := json.NewDecoder(r.Body).Decode(&msgs); err != nil {
-		httputil.HandleError(w, "Could not decode request body: "+err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	var failures []*server.IndexedError
-	for i, msg := range msgs {
-		consensusMsg, err := msg.ToConsensus()
-		if err != nil {
-			failures = append(failures, &server.IndexedError{
-				Index:   i,
-				Message: "Could not convert message: " + err.Error(),
-			})
-			continue
-		}
-
-		// TODO: Add full gossip validation (BLS signatures, PTC membership).
-		if err := s.PayloadAttestationPool.InsertPayloadAttestation(consensusMsg); err != nil {
-			failures = append(failures, &server.IndexedError{
-				Index:   i,
-				Message: "Could not insert payload attestation: " + err.Error(),
-			})
-			continue
-		}
-
-		if err := s.Broadcaster.Broadcast(ctx, consensusMsg); err != nil {
-			log.WithError(err).Error("Could not broadcast payload attestation message")
-		}
-	}
-
-	if len(failures) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
-			Code:     http.StatusBadRequest,
-			Message:  server.ErrIndexedValidationFail,
-			Failures: failures,
-		}
-		httputil.WriteError(w, failuresErr)
-		return
-	}
-}
-
-// ListPayloadAttestations retrieves payload attestations from the pool.
-func (s *Server) ListPayloadAttestations(w http.ResponseWriter, r *http.Request) {
-	_, span := trace.StartSpan(r.Context(), "beacon.ListPayloadAttestations")
-	defer span.End()
-
-	rawSlot, slot, ok := shared.UintFromQuery(w, r, "slot", false)
-	if !ok {
-		return
-	}
-
-	var atts []*eth.PayloadAttestation
-	if rawSlot != "" {
-		atts = s.PayloadAttestationPool.PendingPayloadAttestations(primitives.Slot(slot))
-	} else {
-		atts = s.PayloadAttestationPool.PendingPayloadAttestations()
-	}
-
-	data := make([]*structs.PayloadAttestation, len(atts))
-	for i, att := range atts {
-		data[i] = structs.PayloadAttestationFromConsensus(att)
-	}
-
-	w.Header().Set(api.VersionHeader, version.String(version.Gloas))
-	httputil.WriteJson(w, &structs.GetPoolPayloadAttestationsResponse{
-		Version: version.String(version.Gloas),
-		Data:    data,
-	})
-}

beacon-chain/rpc/eth/beacon/server.go

@@ -12,7 +12,6 @@ import (
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/execution"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/attestations"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/blstoexec"
-	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/payloadattestation"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/slashings"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/voluntaryexits"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/p2p"
@@ -49,7 +48,6 @@ type Server struct {
 	ExecutionReconstructor  execution.Reconstructor
 	FinalizationFetcher     blockchain.FinalizationFetcher
 	BLSChangesPool          blstoexec.PoolManager
-	PayloadAttestationPool  payloadattestation.PoolManager
 	ForkchoiceFetcher       blockchain.ForkchoiceFetcher
 	CoreService             *core.Service
 	AttestationStateFetcher blockchain.AttestationStateFetcher

beacon-chain/rpc/eth/validator/BUILD.bazel

@@ -21,7 +21,6 @@ go_library(
         "//beacon-chain/core/helpers:go_default_library",
         "//beacon-chain/db:go_default_library",
         "//beacon-chain/operations/attestations:go_default_library",
-        "//beacon-chain/operations/payloadattestation:go_default_library",
         "//beacon-chain/operations/synccommittee:go_default_library",
         "//beacon-chain/p2p:go_default_library",
         "//beacon-chain/rpc/core:go_default_library",

beacon-chain/rpc/eth/validator/handlers.go

@@ -1427,54 +1427,3 @@ func sortProposerDuties(duties []*structs.ProposerDuty) error {
 	})
 	return err
 }
-
-// GetPayloadAttestationData produces payload attestation data for the requested slot.
-func (s *Server) GetPayloadAttestationData(w http.ResponseWriter, r *http.Request) {
-	ctx, span := trace.StartSpan(r.Context(), "validator.GetPayloadAttestationData")
-	defer span.End()
-
-	if shared.IsSyncing(ctx, w, s.SyncChecker, s.HeadFetcher, s.TimeFetcher, s.OptimisticModeFetcher) {
-		return
-	}
-
-	_, slot, ok := shared.UintFromRoute(w, r, "slot")
-	if !ok {
-		return
-	}
-
-	headRoot, err := s.HeadFetcher.HeadRoot(ctx)
-	if err != nil {
-		httputil.HandleError(w, "Could not get head root: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	// TODO: Determine payload_present and blob_data_available from the SignedExecutionPayloadEnvelope
-	// once that handling is implemented. For now, stub with false.
-	payloadPresent := false
-	blobDataAvailable := false
-
-	data := &ethpbalpha.PayloadAttestationData{
-		BeaconBlockRoot:   headRoot,
-		Slot:              primitives.Slot(slot),
-		PayloadPresent:    payloadPresent,
-		BlobDataAvailable: blobDataAvailable,
-	}
-
-	if httputil.RespondWithSsz(r) {
-		sszData, err := data.MarshalSSZ()
-		if err != nil {
-			httputil.HandleError(w, "Could not marshal payload attestation data: "+err.Error(), http.StatusInternalServerError)
-			return
-		}
-		w.Header().Set(api.VersionHeader, version.String(version.Gloas))
-		httputil.WriteSsz(w, sszData)
-		return
-	}
-
-	response := &structs.GetPayloadAttestationDataResponse{
-		Version: version.String(version.Gloas),
-		Data:    structs.PayloadAttestationDataFromConsensus(data),
-	}
-	w.Header().Set(api.VersionHeader, version.String(version.Gloas))
-	httputil.WriteJson(w, response)
-}

beacon-chain/rpc/eth/validator/server.go

@@ -7,7 +7,6 @@ import (
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/core/feed/operation"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/db"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/attestations"
-	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/payloadattestation"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/synccommittee"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/p2p"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/rpc/core"
@@ -39,5 +38,4 @@ type Server struct {
 	BlockRewardFetcher     rewards.BlockRewardsFetcher
 	TrackedValidatorsCache *cache.TrackedValidatorsCache
 	PayloadIDCache         *cache.PayloadIDCache
-	PayloadAttestationPool payloadattestation.PoolManager
 }

beacon-chain/rpc/service.go

@@ -22,7 +22,6 @@ import (
 	lightClient "github.com/OffchainLabs/prysm/v7/beacon-chain/light-client"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/attestations"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/blstoexec"
-	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/payloadattestation"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/slashings"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/synccommittee"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/operations/voluntaryexits"
@@ -104,7 +103,6 @@ type Config struct {
 	SlashingsPool             slashings.PoolManager
 	SyncCommitteeObjectPool   synccommittee.Pool
 	BLSChangesPool            blstoexec.PoolManager
-	PayloadAttestationPool    payloadattestation.PoolManager
 	SyncService               chainSync.Checker
 	Broadcaster               p2p.Broadcaster
 	PeersFetcher              p2p.PeersProvider

beacon-chain/state/stateutil/BUILD.bazel

@@ -46,6 +46,7 @@ go_library(
         "//proto/prysm/v1alpha1:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
+        "@org_golang_x_sync//errgroup:go_default_library",
     ],
 )
 
@@ -78,6 +79,7 @@ go_test(
         "//testing/assert:go_default_library",
         "//testing/require:go_default_library",
         "//testing/util:go_default_library",
+        "@org_golang_x_sync//errgroup:go_default_library",
     ],
 )
 

beacon-chain/state/stateutil/field_root_validator.go

@@ -2,16 +2,16 @@ package stateutil
 
 import (
 	"bytes"
+	"context"
 	"encoding/binary"
 	"runtime"
-	"sync"
 
 	fieldparams "github.com/OffchainLabs/prysm/v7/config/fieldparams"
 	"github.com/OffchainLabs/prysm/v7/crypto/hash/htr"
 	"github.com/OffchainLabs/prysm/v7/encoding/ssz"
 	ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
+	"golang.org/x/sync/errgroup"
 )
 
 const (
@@ -54,17 +54,23 @@ func validatorRegistryRoot(validators []*ethpb.Validator) ([32]byte, error) {
 	return res, nil
 }
 
-func hashValidatorHelper(validators []*ethpb.Validator, roots [][32]byte, j int, groupSize int, wg *sync.WaitGroup) {
-	defer wg.Done()
-	for i := range groupSize {
-		fRoots, err := ValidatorFieldRoots(validators[j*groupSize+i])
-		if err != nil {
-			logrus.WithError(err).Error("Could not get validator field roots")
-			return
-		}
-		for k, root := range fRoots {
-			roots[(j*groupSize+i)*validatorFieldRoots+k] = root
+func hashValidatorHelper(ctx context.Context, validators []*ethpb.Validator, roots [][32]byte, j int, groupSize int) func() error {
+	return func() error {
+		for i := range groupSize {
+			select {
+			case <-ctx.Done():
+				return ctx.Err()
+			default:
+				fRoots, err := ValidatorFieldRoots(validators[j*groupSize+i])
+				if err != nil {
+					return errors.Wrap(err, "could not get validator field roots")
+				}
+				for k, root := range fRoots {
+					roots[(j*groupSize+i)*validatorFieldRoots+k] = root
+				}
+			}
 		}
+		return nil
 	}
 }
 
@@ -75,14 +81,13 @@ func OptimizedValidatorRoots(validators []*ethpb.Validator) ([][32]byte, error)
 	if len(validators) == 0 {
 		return [][32]byte{}, nil
 	}
-	wg := sync.WaitGroup{}
+	g, ctx := errgroup.WithContext(context.Background())
 	n := runtime.GOMAXPROCS(0)
 	rootsSize := len(validators) * validatorFieldRoots
 	groupSize := len(validators) / n
 	roots := make([][32]byte, rootsSize)
-	wg.Add(n - 1)
 	for j := 0; j < n-1; j++ {
-		go hashValidatorHelper(validators, roots, j, groupSize, &wg)
+		g.Go(hashValidatorHelper(ctx, validators, roots, j, groupSize))
 	}
 	for i := (n - 1) * groupSize; i < len(validators); i++ {
 		fRoots, err := ValidatorFieldRoots(validators[i])
@@ -93,7 +98,9 @@ func OptimizedValidatorRoots(validators []*ethpb.Validator) ([][32]byte, error)
 			roots[i*validatorFieldRoots+k] = root
 		}
 	}
-	wg.Wait()
+	if err := g.Wait(); err != nil {
+		return [][32]byte{}, err
+	}
 
 	// A validator's tree can represented with a depth of 3. As log2(8) = 3
 	// Using this property we can lay out all the individual fields of a

beacon-chain/state/stateutil/field_root_validator_test.go

@@ -3,13 +3,13 @@ package stateutil
 import (
 	"reflect"
 	"strings"
-	"sync"
 	"testing"
 
 	mathutil "github.com/OffchainLabs/prysm/v7/math"
 	ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
 	"github.com/OffchainLabs/prysm/v7/testing/assert"
 	"github.com/OffchainLabs/prysm/v7/testing/require"
+	"golang.org/x/sync/errgroup"
 )
 
 func TestValidatorConstants(t *testing.T) {
@@ -34,15 +34,15 @@ func TestValidatorConstants(t *testing.T) {
 }
 
 func TestHashValidatorHelper(t *testing.T) {
-	wg := sync.WaitGroup{}
-	wg.Add(1)
+	g, ctx := errgroup.WithContext(t.Context())
 	v := &ethpb.Validator{}
 	valList := make([]*ethpb.Validator, 10*validatorFieldRoots)
 	for i := range valList {
 		valList[i] = v
 	}
 	roots := make([][32]byte, len(valList))
-	hashValidatorHelper(valList, roots, 2, 2, &wg)
+	g.Go(hashValidatorHelper(ctx, valList, roots, 2, 2))
+	require.NoError(t, g.Wait())
 	for i := range 4 * validatorFieldRoots {
 		require.Equal(t, [32]byte{}, roots[i])
 	}

changelog/jtraglia-add-specrefs-readme.md

@@ -0,0 +1,3 @@
+### Added
+
+- Added README for maintaining specrefs.

changelog/jtraglia-nightly-reftests-with-run-id.md

@@ -0,0 +1,3 @@
+### Added
+
+- The ability to download the nightly reference tests from a specific day.

changelog/radek_vals-hash-errgroup.md

@@ -0,0 +1,3 @@
+### Changed
+
+- Use `errgroup` in `OptimizedValidatorRoots`.

specrefs/README.md

@@ -0,0 +1,35 @@
+# Specification References
+
+This directory contains specification reference tracking files managed by
+[ethspecify](https://github.com/jtraglia/ethspecify).
+
+## Installation
+
+Install `ethspecify` with the following command:
+
+```bash
+pipx install ethspecify
+```
+
+> [!NOTE]
+> You can run `ethspecify <cmd>` in the `specrefs` directory or
+> `ethspecify <cmd> --path=specrefs` from the project's root directory.
+
+## Maintenance
+
+When adding support for a new specification version, follow these steps:
+
+0. Change directory into the `specrefs` directory.
+1. Update the version in `.ethspecify.yml` configuration.
+2. Run `ethspecify process` to update/populate specrefs.
+3. Run `ethspecify check` to check specrefs.
+4. If there are errors, use the error message as a guide to fix the issue. If
+   there are new specrefs with empty sources, implement/locate each item and
+   update each specref source list. If you choose not to implement an item,
+   add an exception to the appropriate section the the `.ethspecify.yml`
+   configuration.
+5. Repeat steps 3 and 4 until `ethspecify check` passes.
+6. Run `git diff` to view updated specrefs. If an object/function/etc has
+   changed, make the necessary updates to the implementation.
+7. Lastly, in the project's root directory, run `act -j check-specrefs` to
+   ensure everything is correct.

testing/spectest/README.md

@@ -21,10 +21,14 @@ There are tests for mainnet and minimal config, so for each config we will add a
 
 ## Running nightly spectests
 
-Since [PR 15312](https://github.com/OffchainLabs/prysm/pull/15312), Prysm has support to download "nightly" spectests from github via a starlark rule configuration by environment variable. 
-Set `--repo_env=CONSENSUS_SPEC_TESTS_VERSION=nightly` when running spectest to download the "nightly" spectests. 
-Note: A GITHUB_TOKEN environment variable is required to be set. The github token must be a [fine grained token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-fine-grained-personal-access-token).
+Since [PR 15312](https://github.com/OffchainLabs/prysm/pull/15312), Prysm has support to download "nightly" spectests from github via a starlark rule configuration by environment variable.
+Set `--repo_env=CONSENSUS_SPEC_TESTS_VERSION=nightly` or `--repo_env=CONSENSUS_SPEC_TESTS_VERSION=nightly-<run_id>` when running spectest to download the "nightly" spectests.
+Note: A GITHUB_TOKEN environment variable is required to be set. The github token does not need to be associated with your main account; it can be from a "burner account". And the token does not need to be a fine-grained token; it can be a classic token.
 
 ```
 bazel test //... --test_tag_filters=spectest --repo_env=CONSENSUS_SPEC_TESTS_VERSION=nightly
 ```
+
+```
+bazel test //... --test_tag_filters=spectest --repo_env=CONSENSUS_SPEC_TESTS_VERSION=nightly-21422848633
+```

tools/download_spectests.bzl

@@ -1,5 +1,6 @@
 # bazel build @consensus_spec_tests//:test_data
 # bazel build @consensus_spec_tests//:test_data --repo_env=CONSENSUS_SPEC_TESTS_VERSION=nightly
+# bazel build @consensus_spec_tests//:test_data --repo_env=CONSENSUS_SPEC_TESTS_VERSION=nightly-<run_id>
 
 def _get_redirected_url(repository_ctx, url, headers):
     if not repository_ctx.which("curl"):
@@ -24,7 +25,7 @@ def _impl(repository_ctx):
     version = repository_ctx.getenv("CONSENSUS_SPEC_TESTS_VERSION") or repository_ctx.attr.version
     token = repository_ctx.getenv("GITHUB_TOKEN") or ""
 
-    if version == "nightly":
+    if version == "nightly" or version.startswith("nightly-"):
         print("Downloading nightly tests")
         if not token:
             fail("Error GITHUB_TOKEN is not set")
@@ -34,16 +35,22 @@ def _impl(repository_ctx):
             "Accept": "application/vnd.github+json",
         }
 
-        repository_ctx.download(
-            "https://api.github.com/repos/%s/actions/workflows/%s/runs?branch=%s&status=success&per_page=1"
-                % (repository_ctx.attr.repo, repository_ctx.attr.workflow, repository_ctx.attr.branch),
-            headers = headers,
-            output = "runs.json"
-        )
+        if version.startswith("nightly-"):
+            run_id = version.split("nightly-", 1)[1]
+            if not run_id:
+                fail("Error invalid run id")
+        else:
+            repository_ctx.download(
+                "https://api.github.com/repos/%s/actions/workflows/%s/runs?branch=%s&status=success&per_page=1"
+                    % (repository_ctx.attr.repo, repository_ctx.attr.workflow, repository_ctx.attr.branch),
+                headers = headers,
+                output = "runs.json"
+            )
 
-        run_id = json.decode(repository_ctx.read("runs.json"))["workflow_runs"][0]["id"]
-        repository_ctx.delete("runs.json")
+            run_id = json.decode(repository_ctx.read("runs.json"))["workflow_runs"][0]["id"]
+            repository_ctx.delete("runs.json")
 
+        print("Run id:", run_id)
         repository_ctx.download(
             "https://api.github.com/repos/%s/actions/runs/%s/artifacts"
                 % (repository_ctx.attr.repo, run_id),
@@ -108,8 +115,8 @@ consensus_spec_tests = repository_rule(
         "version": attr.string(mandatory = True),
         "flavors": attr.string_dict(mandatory = True),
         "repo": attr.string(default = "ethereum/consensus-specs"),
-        "workflow": attr.string(default = "generate_vectors.yml"),
-        "branch": attr.string(default = "dev"),
+        "workflow": attr.string(default = "nightly-reftests.yml"),
+        "branch": attr.string(default = "master"),
         "release_url_template": attr.string(default = "https://github.com/ethereum/consensus-specs/releases/download/%s"),
     },
 )