wip

api/server/structs/block.go

@@ -540,6 +540,12 @@ 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,3 +3263,34 @@ 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,6 +188,11 @@ 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,6 +31,11 @@ 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,6 +37,7 @@ 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,6 +40,7 @@ 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"
@@ -101,6 +102,7 @@ type BeaconNode struct {
 	slashingsPool            slashings.PoolManager
 	syncCommitteePool        synccommittee.Pool
 	blsToExecPool            blstoexec.PoolManager
+	payloadAttestationPool   payloadattestation.PoolManager
 	depositCache             cache.DepositCache
 	trackedValidatorsCache   *cache.TrackedValidatorsCache
 	payloadIDCache           *cache.PayloadIDCache
@@ -155,6 +157,7 @@ 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),
@@ -972,6 +975,7 @@ 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

@@ -7,12 +7,9 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//consensus-types/primitives:go_default_library",
-        "//crypto/bls:go_default_library",
         "//crypto/hash:go_default_library",
-        "//encoding/bytesutil:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
-        "@com_github_prysmaticlabs_go_bitfield//:go_default_library",
         "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
@@ -23,8 +20,6 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//consensus-types/primitives:go_default_library",
-        "//crypto/bls:go_default_library",
-        "//encoding/bytesutil: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

@@ -3,37 +3,22 @@ package payloadattestation
 import (
 	"sync"
 
-	"github.com/OffchainLabs/go-bitfield"
 	"github.com/OffchainLabs/prysm/v7/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v7/crypto/bls"
 	"github.com/OffchainLabs/prysm/v7/crypto/hash"
-	"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
 	ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/proto"
 )
 
-var errNilPayloadAttestationMessage = errors.New("nil payload attestation message")
-
 // PoolManager maintains pending payload attestations.
 // This pool is used by proposers to insert payload attestations into new blocks.
 type PoolManager interface {
-	// PendingPayloadAttestations returns all pending aggregated payload attestations.
-	// If a slot is provided, only attestations for that slot are returned.
 	PendingPayloadAttestations(slot ...primitives.Slot) []*ethpb.PayloadAttestation
-	// InsertPayloadAttestation inserts or aggregates a payload attestation
-	// message into the pool. The idx parameter is the PTC committee index
-	// of the validator (position in the bitvector).
-	InsertPayloadAttestation(msg *ethpb.PayloadAttestationMessage, idx uint64) error
-	// Seen returns true if the PTC committee index has already been seen
-	// for the given PayloadAttestationData.
-	Seen(data *ethpb.PayloadAttestationData, idx uint64) bool
-	// MarkIncluded removes the attestation matching the given data from the pool.
+	InsertPayloadAttestation(msg *ethpb.PayloadAttestationMessage) error
 	MarkIncluded(att *ethpb.PayloadAttestation)
 }
 
 // Pool is a concrete implementation of PoolManager.
-// Keyed by hash of PayloadAttestationData; stores aggregated PayloadAttestation.
 type Pool struct {
 	lock    sync.RWMutex
 	pending map[[32]byte]*ethpb.PayloadAttestation
@@ -46,8 +31,8 @@ func NewPool() *Pool {
 	}
 }
 
-// PendingPayloadAttestations returns all pending payload attestations.
-// If a slot filter is provided, only attestations for that slot are returned.
+// 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()
@@ -62,12 +47,12 @@ func (p *Pool) PendingPayloadAttestations(slot ...primitives.Slot) []*ethpb.Payl
 	return result
 }
 
-// InsertPayloadAttestation inserts a payload attestation message into the pool,
-// aggregating it with any existing attestation that shares the same PayloadAttestationData.
-// The idx parameter is the PTC committee index used to set the aggregation bit.
-func (p *Pool) InsertPayloadAttestation(msg *ethpb.PayloadAttestationMessage, idx uint64) error {
+// 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 errNilPayloadAttestationMessage
+		return errors.New("nil payload attestation message")
 	}
 
 	key, err := dataKey(msg.Data)
@@ -80,45 +65,21 @@ func (p *Pool) InsertPayloadAttestation(msg *ethpb.PayloadAttestationMessage, id
 
 	existing, ok := p.pending[key]
 	if !ok {
-		p.pending[key] = messageToPayloadAttestation(msg, idx)
+		// 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
 	}
 
-	if existing.AggregationBits.BitAt(idx) {
-		return nil
-	}
-
-	sig, err := aggregateSigFromMessage(existing, msg)
-	if err != nil {
-		return errors.Wrap(err, "could not aggregate signatures")
-	}
-	existing.Signature = sig
-	existing.AggregationBits.SetBitAt(idx, true)
+	// 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
 }
 
-// Seen returns true if the PTC committee index has already been seen
-// for the given PayloadAttestationData.
-func (p *Pool) Seen(data *ethpb.PayloadAttestationData, idx uint64) bool {
-	if data == nil {
-		return false
-	}
-
-	key, err := dataKey(data)
-	if err != nil {
-		return false
-	}
-
-	p.lock.RLock()
-	defer p.lock.RUnlock()
-
-	existing, ok := p.pending[key]
-	if !ok {
-		return false
-	}
-	return existing.AggregationBits.BitAt(idx)
-}
-
 // MarkIncluded removes the attestation with matching data from the pool.
 func (p *Pool) MarkIncluded(att *ethpb.PayloadAttestation) {
 	if att == nil || att.Data == nil {
@@ -136,38 +97,6 @@ func (p *Pool) MarkIncluded(att *ethpb.PayloadAttestation) {
 	delete(p.pending, key)
 }
 
-// messageToPayloadAttestation creates a PayloadAttestation with a single
-// aggregated bit from the passed PayloadAttestationMessage.
-func messageToPayloadAttestation(msg *ethpb.PayloadAttestationMessage, idx uint64) *ethpb.PayloadAttestation {
-	bits := bitfield.NewBitvector512()
-	bits.SetBitAt(idx, true)
-	data := &ethpb.PayloadAttestationData{
-		BeaconBlockRoot:   bytesutil.SafeCopyBytes(msg.Data.BeaconBlockRoot),
-		Slot:              msg.Data.Slot,
-		PayloadPresent:    msg.Data.PayloadPresent,
-		BlobDataAvailable: msg.Data.BlobDataAvailable,
-	}
-	return &ethpb.PayloadAttestation{
-		AggregationBits: bits,
-		Data:            data,
-		Signature:       bytesutil.SafeCopyBytes(msg.Signature),
-	}
-}
-
-// aggregateSigFromMessage returns the aggregated signature by combining the
-// existing aggregated signature with the message's signature.
-func aggregateSigFromMessage(aggregated *ethpb.PayloadAttestation, message *ethpb.PayloadAttestationMessage) ([]byte, error) {
-	aggSig, err := bls.SignatureFromBytesNoValidation(aggregated.Signature)
-	if err != nil {
-		return nil, err
-	}
-	sig, err := bls.SignatureFromBytesNoValidation(message.Signature)
-	if err != nil {
-		return nil, err
-	}
-	return bls.AggregateSignatures([]bls.Signature{aggSig, sig}).Marshal(), nil
-}
-
 // dataKey computes a deterministic key for PayloadAttestationData
 // by hashing its serialized form.
 func dataKey(data *ethpb.PayloadAttestationData) ([32]byte, error) {

beacon-chain/operations/payloadattestation/pool_test.go

@@ -4,8 +4,6 @@ import (
 	"testing"
 
 	"github.com/OffchainLabs/prysm/v7/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v7/crypto/bls"
-	"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
 	ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
 	"github.com/OffchainLabs/prysm/v7/testing/assert"
 	"github.com/OffchainLabs/prysm/v7/testing/require"
@@ -20,7 +18,6 @@ func TestPool_PendingPayloadAttestations(t *testing.T) {
 
 	t.Run("non-empty pool", func(t *testing.T) {
 		pool := NewPool()
-		sig := bls.NewAggregateSignature().Marshal()
 		msg1 := &ethpb.PayloadAttestationMessage{
 			ValidatorIndex: 0,
 			Data: &ethpb.PayloadAttestationData{
@@ -29,7 +26,7 @@ func TestPool_PendingPayloadAttestations(t *testing.T) {
 				PayloadPresent:    true,
 				BlobDataAvailable: false,
 			},
-			Signature: sig,
+			Signature: make([]byte, 96),
 		}
 		msg2 := &ethpb.PayloadAttestationMessage{
 			ValidatorIndex: 1,
@@ -39,17 +36,16 @@ func TestPool_PendingPayloadAttestations(t *testing.T) {
 				PayloadPresent:    false,
 				BlobDataAvailable: true,
 			},
-			Signature: sig,
+			Signature: make([]byte, 96),
 		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg1, 0))
-		require.NoError(t, pool.InsertPayloadAttestation(msg2, 1))
+		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()
-		sig := bls.NewAggregateSignature().Marshal()
 		msg1 := &ethpb.PayloadAttestationMessage{
 			ValidatorIndex: 0,
 			Data: &ethpb.PayloadAttestationData{
@@ -58,7 +54,7 @@ func TestPool_PendingPayloadAttestations(t *testing.T) {
 				PayloadPresent:    true,
 				BlobDataAvailable: false,
 			},
-			Signature: sig,
+			Signature: make([]byte, 96),
 		}
 		msg2 := &ethpb.PayloadAttestationMessage{
 			ValidatorIndex: 1,
@@ -68,10 +64,10 @@ func TestPool_PendingPayloadAttestations(t *testing.T) {
 				PayloadPresent:    false,
 				BlobDataAvailable: true,
 			},
-			Signature: sig,
+			Signature: make([]byte, 96),
 		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg1, 0))
-		require.NoError(t, pool.InsertPayloadAttestation(msg2, 1))
+		require.NoError(t, pool.InsertPayloadAttestation(msg1))
+		require.NoError(t, pool.InsertPayloadAttestation(msg2))
 
 		atts := pool.PendingPayloadAttestations(primitives.Slot(1))
 		assert.Equal(t, 1, len(atts))
@@ -89,20 +85,18 @@ func TestPool_PendingPayloadAttestations(t *testing.T) {
 func TestPool_InsertPayloadAttestation(t *testing.T) {
 	t.Run("nil message", func(t *testing.T) {
 		pool := NewPool()
-		err := pool.InsertPayloadAttestation(nil, 0)
+		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{}, 0)
+		err := pool.InsertPayloadAttestation(&ethpb.PayloadAttestationMessage{})
 		require.ErrorContains(t, "nil payload attestation message", err)
 	})
 
-	t.Run("insert creates new entry with correct aggregation bit", func(t *testing.T) {
+	t.Run("insert creates new entry", func(t *testing.T) {
 		pool := NewPool()
-		sig := bls.NewAggregateSignature().Marshal()
-		idx := uint64(5)
 		msg := &ethpb.PayloadAttestationMessage{
 			ValidatorIndex: 0,
 			Data: &ethpb.PayloadAttestationData{
@@ -111,73 +105,15 @@ func TestPool_InsertPayloadAttestation(t *testing.T) {
 				PayloadPresent:    true,
 				BlobDataAvailable: false,
 			},
-			Signature: sig,
+			Signature: make([]byte, 96),
 		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg, idx))
+		require.NoError(t, pool.InsertPayloadAttestation(msg))
 		atts := pool.PendingPayloadAttestations()
-		require.Equal(t, 1, len(atts))
-		assert.Equal(t, true, atts[0].AggregationBits.BitAt(idx))
-		assert.Equal(t, false, atts[0].AggregationBits.BitAt(idx+1))
+		assert.Equal(t, 1, len(atts))
 	})
 
-	t.Run("duplicate index is no-op", func(t *testing.T) {
+	t.Run("duplicate data does not create second entry", func(t *testing.T) {
 		pool := NewPool()
-		sig := bls.NewAggregateSignature().Marshal()
-		idx := uint64(3)
-		msg := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 0,
-			Data: &ethpb.PayloadAttestationData{
-				BeaconBlockRoot:   make([]byte, 32),
-				Slot:              1,
-				PayloadPresent:    true,
-				BlobDataAvailable: false,
-			},
-			Signature: sig,
-		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg, idx))
-		firstSig := bytesutil.SafeCopyBytes(pool.PendingPayloadAttestations()[0].Signature)
-
-		require.NoError(t, pool.InsertPayloadAttestation(msg, idx))
-		atts := pool.PendingPayloadAttestations()
-		require.Equal(t, 1, len(atts))
-		assert.DeepEqual(t, firstSig, atts[0].Signature)
-	})
-
-	t.Run("aggregates different indices", func(t *testing.T) {
-		pool := NewPool()
-		sig := bls.NewAggregateSignature().Marshal()
-		root := make([]byte, 32)
-		root[0] = 'r'
-		data := &ethpb.PayloadAttestationData{
-			BeaconBlockRoot:   root,
-			Slot:              1,
-			PayloadPresent:    true,
-			BlobDataAvailable: false,
-		}
-		msg1 := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 0,
-			Data:           data,
-			Signature:      sig,
-		}
-		msg2 := &ethpb.PayloadAttestationMessage{
-			ValidatorIndex: 1,
-			Data:           data,
-			Signature:      sig,
-		}
-
-		require.NoError(t, pool.InsertPayloadAttestation(msg1, 5))
-		require.NoError(t, pool.InsertPayloadAttestation(msg2, 7))
-
-		atts := pool.PendingPayloadAttestations()
-		require.Equal(t, 1, len(atts))
-		assert.Equal(t, true, atts[0].AggregationBits.BitAt(5))
-		assert.Equal(t, true, atts[0].AggregationBits.BitAt(7))
-		assert.Equal(t, false, atts[0].AggregationBits.BitAt(6))
-	})
-
-	t.Run("different data creates separate entries", func(t *testing.T) {
-		pool := NewPool()
-		sig := bls.NewAggregateSignature().Marshal()
 		msg1 := &ethpb.PayloadAttestationMessage{
 			ValidatorIndex: 0,
 			Data: &ethpb.PayloadAttestationData{
@@ -186,53 +122,28 @@ func TestPool_InsertPayloadAttestation(t *testing.T) {
 				PayloadPresent:    true,
 				BlobDataAvailable: false,
 			},
-			Signature: sig,
+			Signature: make([]byte, 96),
 		}
 		msg2 := &ethpb.PayloadAttestationMessage{
 			ValidatorIndex: 1,
 			Data: &ethpb.PayloadAttestationData{
 				BeaconBlockRoot:   make([]byte, 32),
 				Slot:              1,
-				PayloadPresent:    false, // different
+				PayloadPresent:    true,
 				BlobDataAvailable: false,
 			},
-			Signature: sig,
+			Signature: make([]byte, 96),
 		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg1, 0))
-		require.NoError(t, pool.InsertPayloadAttestation(msg2, 1))
+		require.NoError(t, pool.InsertPayloadAttestation(msg1))
+		require.NoError(t, pool.InsertPayloadAttestation(msg2))
 		atts := pool.PendingPayloadAttestations()
-		assert.Equal(t, 2, len(atts))
+		assert.Equal(t, 1, len(atts))
 	})
 }
 
-func TestPool_Seen(t *testing.T) {
-	pool := NewPool()
-	sig := bls.NewAggregateSignature().Marshal()
-	data := &ethpb.PayloadAttestationData{
-		BeaconBlockRoot:   make([]byte, 32),
-		Slot:              1,
-		PayloadPresent:    true,
-		BlobDataAvailable: false,
-	}
-
-	assert.Equal(t, false, pool.Seen(data, 5))
-
-	msg := &ethpb.PayloadAttestationMessage{
-		ValidatorIndex: 0,
-		Data:           data,
-		Signature:      sig,
-	}
-	require.NoError(t, pool.InsertPayloadAttestation(msg, 5))
-
-	assert.Equal(t, true, pool.Seen(data, 5))
-	assert.Equal(t, false, pool.Seen(data, 6))
-	assert.Equal(t, false, pool.Seen(nil, 5))
-}
-
 func TestPool_MarkIncluded(t *testing.T) {
 	t.Run("mark included removes from pool", func(t *testing.T) {
 		pool := NewPool()
-		sig := bls.NewAggregateSignature().Marshal()
 		msg := &ethpb.PayloadAttestationMessage{
 			ValidatorIndex: 0,
 			Data: &ethpb.PayloadAttestationData{
@@ -241,9 +152,9 @@ func TestPool_MarkIncluded(t *testing.T) {
 				PayloadPresent:    true,
 				BlobDataAvailable: false,
 			},
-			Signature: sig,
+			Signature: make([]byte, 96),
 		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg, 0))
+		require.NoError(t, pool.InsertPayloadAttestation(msg))
 		assert.Equal(t, 1, len(pool.PendingPayloadAttestations()))
 
 		pool.MarkIncluded(&ethpb.PayloadAttestation{
@@ -259,7 +170,6 @@ func TestPool_MarkIncluded(t *testing.T) {
 
 	t.Run("mark included with non-matching data does nothing", func(t *testing.T) {
 		pool := NewPool()
-		sig := bls.NewAggregateSignature().Marshal()
 		msg := &ethpb.PayloadAttestationMessage{
 			ValidatorIndex: 0,
 			Data: &ethpb.PayloadAttestationData{
@@ -268,9 +178,9 @@ func TestPool_MarkIncluded(t *testing.T) {
 				PayloadPresent:    true,
 				BlobDataAvailable: false,
 			},
-			Signature: sig,
+			Signature: make([]byte, 96),
 		}
-		require.NoError(t, pool.InsertPayloadAttestation(msg, 0))
+		require.NoError(t, pool.InsertPayloadAttestation(msg))
 
 		pool.MarkIncluded(&ethpb.PayloadAttestation{
 			Data: &ethpb.PayloadAttestationData{

beacon-chain/rpc/BUILD.bazel

@@ -26,6 +26,7 @@ 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,6 +217,7 @@ func (s *Service) validatorEndpoints(
 		OperationNotifier:      s.cfg.OperationNotifier,
 		TrackedValidatorsCache: s.cfg.TrackedValidatorsCache,
 		PayloadIDCache:         s.cfg.PayloadIDCache,
+		PayloadAttestationPool: s.cfg.PayloadAttestationPool,
 		CoreService:            coreService,
 		BlockRewardFetcher:     rewardFetcher,
 	}
@@ -390,6 +391,16 @@ 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},
+		},
 	}
 }
 
@@ -512,6 +523,7 @@ 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,
@@ -869,6 +881,27 @@ 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,6 +48,7 @@ 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},
 	}
 
@@ -91,22 +92,23 @@ 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/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},
 	}
 
 	prysmBeaconRoutes := map[string][]string{

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

@@ -32,6 +32,7 @@ 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,3 +893,89 @@ 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,6 +12,7 @@ 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"
@@ -48,6 +49,7 @@ 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,6 +21,7 @@ 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,3 +1427,54 @@ 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,6 +7,7 @@ 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"
@@ -38,4 +39,5 @@ type Server struct {
 	BlockRewardFetcher     rewards.BlockRewardsFetcher
 	TrackedValidatorsCache *cache.TrackedValidatorsCache
 	PayloadIDCache         *cache.PayloadIDCache
+	PayloadAttestationPool payloadattestation.PoolManager
 }

beacon-chain/rpc/service.go

@@ -22,6 +22,7 @@ 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"
@@ -103,6 +104,7 @@ type Config struct {
 	SlashingsPool             slashings.PoolManager
 	SyncCommitteeObjectPool   synccommittee.Pool
 	BLSChangesPool            blstoexec.PoolManager
+	PayloadAttestationPool    payloadattestation.PoolManager
 	SyncService               chainSync.Checker
 	Broadcaster               p2p.Broadcaster
 	PeersFetcher              p2p.PeersProvider