remove blinded block dependency in peerdas

Author: domiwei

cl/cltypes/beacon_block.go

@@ -40,6 +40,12 @@ var (
 	_ ssz2.SizedObjectSSZ = (*DenebSignedBeaconBlock)(nil)
 )
 
+// ErrGloasCannotBlind is returned when Blinded() is called on a GLOAS block.
+// In GLOAS (EIP-7732/ePBS), the execution payload is delivered via a separate
+// SignedExecutionPayloadEnvelope, so the blinded block concept doesn't apply.
+// Callers should check the block version before calling Blinded() or handle this error.
+var ErrGloasCannotBlind = errors.New("blinded beacon block not supported for GLOAS blocks")
+
 const (
 	MaxAttesterSlashings         = 2
 	MaxProposerSlashings         = 16
@@ -129,6 +135,25 @@ func (b *SignedBeaconBlock) Static() bool {
 	return false
 }
 
+// GetSlot returns the slot of the inner block.
+// Implements ColumnSyncableSignedBlock interface.
+func (b *SignedBeaconBlock) GetSlot() uint64 {
+	return b.Block.Slot
+}
+
+// BlockHashSSZ returns the hash of the inner block (not the signed block).
+// Implements ColumnSyncableSignedBlock interface.
+func (b *SignedBeaconBlock) BlockHashSSZ() ([32]byte, error) {
+	return b.Block.HashSSZ()
+}
+
+// GetBlobKzgCommitments returns blob KZG commitments from the block body.
+// Implements ColumnSyncableSignedBlock interface.
+// [Modified in Gloas:EIP7732] For GLOAS, commitments are in SignedExecutionPayloadBid.
+func (b *SignedBeaconBlock) GetBlobKzgCommitments() *solid.ListSSZ[*KZGCommitment] {
+	return b.Block.Body.GetBlobKzgCommitments()
+}
+
 // Definition of BeaconBlock
 type BeaconBlock struct {
 	Slot          uint64      `json:"slot,string"`
@@ -398,7 +423,7 @@ func (b *BeaconBody) Blinded() (*BlindedBeaconBody, error) {
 	// [Modified in Gloas:EIP7732] Blinded concept not applicable to GLOAS blocks
 	// In GLOAS, execution payload is delivered via SignedExecutionPayloadEnvelope
 	if b.Version >= clparams.GloasVersion {
-		return nil, errors.New("blinded beacon body not supported for GLOAS blocks")
+		return nil, ErrGloasCannotBlind
 	}
 
 	header, err := b.ExecutionPayload.PayloadHeader()

cl/cltypes/beacon_block_blinded.go

@@ -119,6 +119,26 @@ func (b *SignedBlindedBeaconBlock) Full(txs *solid.TransactionsSSZ, withdrawals
 	}
 }
 
+// GetSlot returns the slot of the inner block.
+// Implements ColumnSyncableSignedBlock interface.
+func (b *SignedBlindedBeaconBlock) GetSlot() uint64 {
+	return b.Block.Slot
+}
+
+// BlockHashSSZ returns the hash of the inner block (not the signed block).
+// Implements ColumnSyncableSignedBlock interface.
+func (b *SignedBlindedBeaconBlock) BlockHashSSZ() ([32]byte, error) {
+	return b.Block.HashSSZ()
+}
+
+// GetBlobKzgCommitments returns blob KZG commitments from the block body.
+// Implements ColumnSyncableSignedBlock interface.
+// Note: BlindedBeaconBlock cannot exist for GLOAS (Blinded() returns error),
+// so this always returns the pre-GLOAS commitments.
+func (b *SignedBlindedBeaconBlock) GetBlobKzgCommitments() *solid.ListSSZ[*KZGCommitment] {
+	return b.Block.Body.GetBlobKzgCommitments()
+}
+
 // Definitions of BlindedBeaconBlock
 type BlindedBeaconBlock struct {
 	Slot          uint64             `json:"slot,string"`

cl/cltypes/beacon_block_interface.go

@@ -6,6 +6,17 @@ import (
 	"github.com/erigontech/erigon/common"
 )
 
+// ColumnSyncableSignedBlock is implemented by both SignedBeaconBlock and SignedBlindedBeaconBlock
+// for PeerDAS column synchronization operations.
+// [New in Gloas:EIP7732] This interface allows PeerDAS to work with both block types
+// without needing to call Blinded() which fails for GLOAS blocks.
+type ColumnSyncableSignedBlock interface {
+	Version() clparams.StateVersion
+	GetSlot() uint64
+	BlockHashSSZ() ([32]byte, error)
+	GetBlobKzgCommitments() *solid.ListSSZ[*KZGCommitment]
+}
+
 type GenericBeaconBlock interface {
 	Version() clparams.StateVersion
 	GetSlot() uint64

cl/das/mock_services/peer_das_mock.go

@@ -47,8 +47,10 @@ type gloasBlockData struct {
 
 //go:generate mockgen -typed=true -destination=mock_services/peer_das_mock.go -package=mock_services . PeerDas
 type PeerDas interface {
-	DownloadColumnsAndRecoverBlobs(ctx context.Context, blocks []*cltypes.SignedBlindedBeaconBlock) error
-	DownloadOnlyCustodyColumns(ctx context.Context, blocks []*cltypes.SignedBlindedBeaconBlock) error
+	// [Modified in Gloas:EIP7732] Changed from []*SignedBlindedBeaconBlock to []ColumnSyncableSignedBlock
+	// to support both pre-GLOAS (blinded) and GLOAS (non-blinded) blocks
+	DownloadColumnsAndRecoverBlobs(ctx context.Context, blocks []cltypes.ColumnSyncableSignedBlock) error
+	DownloadOnlyCustodyColumns(ctx context.Context, blocks []cltypes.ColumnSyncableSignedBlock) error
 	IsDataAvailable(slot uint64, blockRoot common.Hash) (bool, error)
 	Prune(keepSlotDistance uint64) error
 	UpdateValidatorsCustody(cgc uint64)
@@ -80,7 +82,7 @@ type peerdas struct {
 
 	recoveringMutex   sync.Mutex
 	isRecovering      map[common.Hash]bool
-	blocksToCheckSync sync.Map // blockRoot -> blindedBlock
+	blocksToCheckSync sync.Map // blockRoot -> ColumnSyncableSignedBlock (SignedBeaconBlock or SignedBlindedBeaconBlock)
 
 	// [New in Gloas:EIP7732] For fetching blocks to get kzg_commitments
 	forkChoice      BlockGetter
@@ -648,7 +650,7 @@ var (
 )
 
 // DownloadMissingColumns downloads the missing columns for the given blocks but not recover the blobs
-func (d *peerdas) DownloadOnlyCustodyColumns(ctx context.Context, blocks []*cltypes.SignedBlindedBeaconBlock) error {
+func (d *peerdas) DownloadOnlyCustodyColumns(ctx context.Context, blocks []cltypes.ColumnSyncableSignedBlock) error {
 	custodyColumns, err := d.state.GetMyCustodyColumns()
 	if err != nil {
 		return err
@@ -673,23 +675,24 @@ func (d *peerdas) DownloadOnlyCustodyColumns(ctx context.Context, blocks []*clty
 	return nil
 }
 
-func (d *peerdas) DownloadColumnsAndRecoverBlobs(ctx context.Context, blocks []*cltypes.SignedBlindedBeaconBlock) error {
+func (d *peerdas) DownloadColumnsAndRecoverBlobs(ctx context.Context, blocks []cltypes.ColumnSyncableSignedBlock) error {
 	// filter out blocks that don't need to be processed
-	blocksToProcess := []*cltypes.SignedBlindedBeaconBlock{}
+	blocksToProcess := []cltypes.ColumnSyncableSignedBlock{}
 	for _, block := range blocks {
+		kzgCommitments := block.GetBlobKzgCommitments()
 		if block.Version() < clparams.FuluVersion ||
-			block.Block.Body.BlobKzgCommitments == nil ||
-			block.Block.Body.BlobKzgCommitments.Len() == 0 {
+			kzgCommitments == nil ||
+			kzgCommitments.Len() == 0 {
 			continue
 		}
-		root, err := block.Block.HashSSZ()
+		root, err := block.BlockHashSSZ()
 		if err != nil {
 			log.Warn("failed to get block root", "err", err)
 			continue
 		}
 
-		if d.IsColumnOverHalf(block.Block.Slot, root) || d.IsBlobAlreadyRecovered(root) {
-			if err := d.TryScheduleRecover(block.Block.Slot, root); err != nil {
+		if d.IsColumnOverHalf(block.GetSlot(), root) || d.IsBlobAlreadyRecovered(root) {
+			if err := d.TryScheduleRecover(block.GetSlot(), root); err != nil {
 				log.Debug("failed to schedule recover", "err", err)
 			}
 			continue
@@ -705,7 +708,7 @@ func (d *peerdas) DownloadColumnsAndRecoverBlobs(ctx context.Context, blocks []*
 	defer func() {
 		slots := make([]uint64, 0, len(blocks))
 		for _, block := range blocks {
-			slots = append(slots, block.Block.Slot)
+			slots = append(slots, block.GetSlot())
 		}
 		log.Debug("DownloadColumnsAndRecoverBlobs", "elapsed time", time.Since(begin), "slots", slots)
 	}()
@@ -950,30 +953,32 @@ type downloadRequest struct {
 	downloadTable map[downloadTableEntry]map[uint64]bool
 }
 
+// [Modified in Gloas:EIP7732] Changed from []*SignedBlindedBeaconBlock to []ColumnSyncableSignedBlock
 func initializeDownloadRequest(
-	blocks []*cltypes.SignedBlindedBeaconBlock,
+	blocks []cltypes.ColumnSyncableSignedBlock,
 	beaconConfig *clparams.BeaconChainConfig,
 	columnStorage blob_storage.DataColumnStorage,
 	expectedColumns map[cltypes.CustodyIndex]bool,
 ) (*downloadRequest, error) {
 	downloadTable := make(map[downloadTableEntry]map[uint64]bool)
-	blockRootToBeaconBlock := make(map[common.Hash]*cltypes.SignedBlindedBeaconBlock)
+	blockRootToBeaconBlock := make(map[common.Hash]cltypes.ColumnSyncableSignedBlock)
 	for _, block := range blocks {
 		if block.Version() < clparams.FuluVersion {
 			continue
 		}
-		if block.Block.Body.BlobKzgCommitments == nil || block.Block.Body.BlobKzgCommitments.Len() == 0 {
+		kzgCommitments := block.GetBlobKzgCommitments()
+		if kzgCommitments == nil || kzgCommitments.Len() == 0 {
 			continue
 		}
 
-		blockRoot, err := block.Block.HashSSZ()
+		blockRoot, err := block.BlockHashSSZ()
 		if err != nil {
 			return nil, err
 		}
 		blockRootToBeaconBlock[blockRoot] = block
 
 		// get the existing columns from the column storage
-		existingColumns, err := columnStorage.GetSavedColumnIndex(context.Background(), block.Block.Slot, blockRoot)
+		existingColumns, err := columnStorage.GetSavedColumnIndex(context.Background(), block.GetSlot(), blockRoot)
 		if err != nil {
 			return nil, err
 		}
@@ -984,7 +989,7 @@ func initializeDownloadRequest(
 
 		if _, ok := downloadTable[downloadTableEntry{
 			blockRoot: blockRoot,
-			slot:      block.Block.Slot,
+			slot:      block.GetSlot(),
 		}]; !ok {
 			table := make(map[uint64]bool)
 			for column := range expectedColumns {
@@ -995,7 +1000,7 @@ func initializeDownloadRequest(
 			if len(table) > 0 {
 				downloadTable[downloadTableEntry{
 					blockRoot: blockRoot,
-					slot:      block.Block.Slot,
+					slot:      block.GetSlot(),
 				}] = table
 			}
 		}
@@ -1068,18 +1073,19 @@ func (d *peerdas) SyncColumnDataLater(block *cltypes.SignedBeaconBlock) error {
 	if block.Version() < clparams.FuluVersion {
 		return nil
 	}
-	if block.Block.Body.BlobKzgCommitments == nil || block.Block.Body.BlobKzgCommitments.Len() == 0 {
+	// [Modified in Gloas:EIP7732] Use GetBlobKzgCommitments() which is version-aware
+	// For GLOAS, commitments are in SignedExecutionPayloadBid.Message
+	kzgCommitments := block.GetBlobKzgCommitments()
+	if kzgCommitments == nil || kzgCommitments.Len() == 0 {
 		return nil
 	}
-	blockRoot, err := block.Block.HashSSZ()
+	blockRoot, err := block.BlockHashSSZ()
 	if err != nil {
 		return err
 	}
-	blindedBlock, err := block.Blinded()
-	if err != nil {
-		return err
-	}
-	d.blocksToCheckSync.Store(common.Hash(blockRoot), blindedBlock)
+	// [Modified in Gloas:EIP7732] Store SignedBeaconBlock directly via ColumnSyncableSignedBlock interface
+	// instead of calling Blinded() which fails for GLOAS blocks
+	d.blocksToCheckSync.Store(common.Hash(blockRoot), block)
 	return nil
 }
 
@@ -1102,21 +1108,22 @@ func (d *peerdas) syncColumnDataWorker(ctx context.Context) {
 				}
 			}
 
-			blocks := []*cltypes.SignedBlindedBeaconBlock{}
+			// [Modified in Gloas:EIP7732] Use ColumnSyncableSignedBlock interface
+			blocks := []cltypes.ColumnSyncableSignedBlock{}
 			roots := []common.Hash{}
 			d.blocksToCheckSync.Range(func(key, value any) bool {
 				root := key.(common.Hash)
-				block := value.(*cltypes.SignedBlindedBeaconBlock)
+				block := value.(cltypes.ColumnSyncableSignedBlock)
 				curSlot := d.ethClock.GetCurrentSlot()
-				if curSlot-block.Block.Slot < 5 { // wait slow data from peers
+				if curSlot-block.GetSlot() < 5 { // wait slow data from peers
 					// skip blocks that are too close to the current slot
 					return true
 				}
-				available, err := d.IsDataAvailable(block.Block.Slot, root)
+				available, err := d.IsDataAvailable(block.GetSlot(), root)
 				if err != nil {
 					log.Warn("failed to check if data is available", "err", err)
 				} else if available {
-					log.Trace("[syncColumnDataWorker] column data is already available, removing from sync queue", "slot", block.Block.Slot, "blockRoot", root)
+					log.Trace("[syncColumnDataWorker] column data is already available, removing from sync queue", "slot", block.GetSlot(), "blockRoot", root)
 					d.blocksToCheckSync.Delete(root)
 				} else {
 					blocks = append(blocks, block)
@@ -1141,7 +1148,7 @@ func (d *peerdas) syncColumnDataWorker(ctx context.Context) {
 			}
 			for i, root := range roots {
 				d.blocksToCheckSync.Delete(root)
-				log.Debug("[syncColumnDataWorker] column data is synced, removing from sync queue", "slot", blocks[i].Block.Slot, "blockRoot", root)
+				log.Debug("[syncColumnDataWorker] column data is synced, removing from sync queue", "slot", blocks[i].GetSlot(), "blockRoot", root)
 			}
 		}
 	}

cl/das/peer_das.go

@@ -345,8 +345,9 @@ func (b *BlobHistoryDownloader) downloadOnce(shouldLog bool) error {
 		if len(fuluBlocks) > 0 {
 			peerDas := b.peerDasGetter.GetPeerDas()
 			for _, block := range fuluBlocks {
-				if err := peerDas.DownloadColumnsAndRecoverBlobs(b.ctx, []*cltypes.SignedBlindedBeaconBlock{block}); err != nil {
-					b.logger.Warn("[BlobHistoryDownloader] Error recovering blobs from block", "err", err, "slot", block.Block.Slot)
+				// [Modified in Gloas:EIP7732] Use ColumnSyncableSignedBlock interface
+				if err := peerDas.DownloadColumnsAndRecoverBlobs(b.ctx, []cltypes.ColumnSyncableSignedBlock{block}); err != nil {
+					b.logger.Warn("[BlobHistoryDownloader] Error recovering blobs from block", "err", err, "slot", block.GetSlot())
 				}
 			}
 		}

cl/phase1/network/blob_downloader.go

@@ -496,6 +496,7 @@ func createMockGloasBlock(slot uint64, blockRoot common.Hash) *cltypes.SignedBea
 		Block: &cltypes.BeaconBlock{
 			Slot: slot,
 			Body: &cltypes.BeaconBody{
+				Version: clparams.GloasVersion, // Required for GetBlobKzgCommitments() to work correctly
 				SignedExecutionPayloadBid: &cltypes.SignedExecutionPayloadBid{
 					Message: &cltypes.ExecutionPayloadBid{
 						BlobKzgCommitments: *solid.NewStaticListSSZ[*cltypes.KZGCommitment](4, 48),