Activate peerDAS at electra.

beacon-chain/core/time/slot_epoch.go

@@ -55,7 +55,7 @@ func HigherEqualThanAltairVersionAndEpoch(s state.BeaconState, e primitives.Epoc
 
 // PeerDASIsActive checks whether peerDAS is active at the provided slot.
 func PeerDASIsActive(slot primitives.Slot) bool {
-	return params.PeerDASEnabled() && slots.ToEpoch(slot) >= params.BeaconConfig().Eip7594ForkEpoch
+	return params.PeerDASEnabled() && slots.ToEpoch(slot) >= params.BeaconConfig().ElectraForkEpoch
 }
 
 // CanUpgradeToAltair returns true if the input `slot` can upgrade to Altair.

beacon-chain/das/availability_columns.go

@@ -113,7 +113,7 @@ func (s *LazilyPersistentStoreColumn) IsDataAvailable(
 	// ignore their response and decrease their peer score.
 	roDataColumns, err := entry.filterColumns(blockRoot, blockCommitments)
 	if err != nil {
-		return errors.Wrap(err, "incomplete BlobSidecar batch")
+		return errors.Wrap(err, "incomplete DataColumnSidecar batch")
 	}
 
 	// Create verified RO data columns from RO data columns.

beacon-chain/das/cache.go

@@ -143,8 +143,8 @@ func (e *cacheEntry) filterColumns(root [32]byte, commitmentsArray *safeCommitme
 	commitmentsCount := commitmentsArray.count()
 	sidecars := make([]blocks.RODataColumn, 0, commitmentsCount)
 
-	for i := uint64(0); i < fieldparams.NumberOfColumns; i++ {
-		// Skip if we arleady store this data column.
+	for i := range uint64(fieldparams.NumberOfColumns) {
+		// Skip if we already store this data column.
 		if e.diskSummary.HasIndex(i) {
 			continue
 		}

beacon-chain/p2p/discovery.go

@@ -228,10 +228,10 @@ func (s *Service) RefreshPersistentSubnets() {
 
 	isBitSUpToDate := bytes.Equal(bitS, inRecordBitS) && bytes.Equal(bitS, currentBitSInMetadata)
 
-	// Compare current epoch with EIP-7594 fork epoch.
-	eip7594ForkEpoch := params.BeaconConfig().Eip7594ForkEpoch
+	// Compare current epoch with the Electra fork epoch.
+	electraForkEpoch := params.BeaconConfig().ElectraForkEpoch
 
-	if currentEpoch < eip7594ForkEpoch {
+	if currentEpoch < electraForkEpoch {
 		// Altair behaviour.
 		if metadataVersion == version.Altair && isBitVUpToDate && isBitSUpToDate {
 			// Nothing to do, return early.

beacon-chain/p2p/discovery_test.go

@@ -135,7 +135,7 @@ func TestStartDiscV5_DiscoverAllPeers(t *testing.T) {
 func TestCreateLocalNode(t *testing.T) {
 	params.SetupTestConfigCleanup(t)
 	cfg := params.BeaconConfig()
-	cfg.Eip7594ForkEpoch = 1
+	cfg.ElectraForkEpoch = 1
 	params.OverrideBeaconConfig(cfg)
 	testCases := []struct {
 		name          string
@@ -626,7 +626,7 @@ func TestRefreshPersistentSubnets(t *testing.T) {
 
 	const (
 		altairForkEpoch  = 5
-		eip7594ForkEpoch = 10
+		electraForkEpoch = 10
 	)
 
 	custodySubnetCount := params.BeaconConfig().CustodyRequirement
@@ -635,7 +635,7 @@ func TestRefreshPersistentSubnets(t *testing.T) {
 	defaultCfg := params.BeaconConfig()
 	cfg := defaultCfg.Copy()
 	cfg.AltairForkEpoch = altairForkEpoch
-	cfg.Eip7594ForkEpoch = eip7594ForkEpoch
+	cfg.ElectraForkEpoch = electraForkEpoch
 	params.OverrideBeaconConfig(cfg)
 
 	// Compute the number of seconds per epoch.
@@ -706,7 +706,7 @@ func TestRefreshPersistentSubnets(t *testing.T) {
 		},
 		{
 			name:              "PeerDAS",
-			epochSinceGenesis: eip7594ForkEpoch,
+			epochSinceGenesis: electraForkEpoch,
 			checks: []check{
 				{
 					pingCount:              0,

beacon-chain/p2p/rpc_topic_mappings.go

@@ -306,7 +306,7 @@ func TopicFromMessage(msg string, epoch primitives.Epoch) (string, error) {
 	}
 
 	// Check if the message is to be updated in peerDAS.
-	isPeerDAS := epoch >= params.BeaconConfig().Eip7594ForkEpoch
+	isPeerDAS := epoch >= params.BeaconConfig().ElectraForkEpoch
 	if isPeerDAS && peerDASMapping[msg] {
 		version = SchemaVersionV3
 	}

beacon-chain/rpc/eth/config/handlers_test.go

@@ -79,7 +79,6 @@ func TestGetSpec(t *testing.T) {
 	config.DenebForkEpoch = 105
 	config.ElectraForkVersion = []byte("ElectraForkVersion")
 	config.ElectraForkEpoch = 107
-	config.Eip7594ForkEpoch = 109
 	config.BLSWithdrawalPrefixByte = byte('b')
 	config.ETH1AddressWithdrawalPrefixByte = byte('c')
 	config.GenesisDelay = 24
@@ -190,7 +189,7 @@ func TestGetSpec(t *testing.T) {
 	data, ok := resp.Data.(map[string]interface{})
 	require.Equal(t, true, ok)
 
-	assert.Equal(t, 156, len(data))
+	assert.Equal(t, 155, len(data))
 	for k, v := range data {
 		t.Run(k, func(t *testing.T) {
 			switch k {
@@ -268,8 +267,6 @@ func TestGetSpec(t *testing.T) {
 				assert.Equal(t, "0x"+hex.EncodeToString([]byte("ElectraForkVersion")), v)
 			case "ELECTRA_FORK_EPOCH":
 				assert.Equal(t, "107", v)
-			case "EIP7594_FORK_EPOCH":
-				assert.Equal(t, "109", v)
 			case "MIN_ANCHOR_POW_BLOCK_DIFFICULTY":
 				assert.Equal(t, "1000", v)
 			case "BLS_WITHDRAWAL_PREFIX":

beacon-chain/rpc/lookup/blocker.go

@@ -471,12 +471,12 @@ func (p *BeaconDbBlocker) Blobs(ctx context.Context, id string, indices map[uint
 	blockSlot := b.Block().Slot()
 
 	// Get the first peerDAS epoch.
-	eip7594ForkEpoch := params.BeaconConfig().Eip7594ForkEpoch
+	electraForkEpoch := params.BeaconConfig().ElectraForkEpoch
 
 	// Compute the first peerDAS slot.
 	peerDASStartSlot := primitives.Slot(math.MaxUint64)
-	if eip7594ForkEpoch != primitives.Epoch(math.MaxUint64) {
-		peerDASStartSlot, err = slots.EpochStart(eip7594ForkEpoch)
+	if electraForkEpoch != primitives.Epoch(math.MaxUint64) {
+		peerDASStartSlot, err = slots.EpochStart(electraForkEpoch)
 		if err != nil {
 			return nil, &core.RpcError{Err: errors.Wrap(err, "could not calculate peerDAS start slot"), Reason: core.Internal}
 		}

beacon-chain/sync/data_columns_sampling_test.go

@@ -199,7 +199,7 @@ func setupDataColumnSamplerTest(t *testing.T, blobCount uint64) (*dataSamplerTes
 		ctx:                context.Background(),
 		p2pSvc:             p2pSvc,
 		peers:              []*p2ptest.TestP2P{},
-		ctxMap:             map[[4]byte]int{{245, 165, 253, 66}: version.Deneb},
+		ctxMap:             map[[4]byte]int{{245, 165, 253, 66}: version.Electra},
 		chainSvc:           chainSvc,
 		blockProcessedData: blockProcessedData,
 		blobs:              blobs,

beacon-chain/sync/initial-sync/blocks_fetcher.go

@@ -3,6 +3,7 @@ package initialsync
 import (
 	"context"
 	"fmt"
+	"math"
 	"slices"
 	"sort"
 	"strings"
@@ -12,7 +13,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/peerdas"
-	coreTime "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/time"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/db"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/db/filesystem"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p"
@@ -337,19 +337,33 @@ func (f *blocksFetcher) handleRequest(ctx context.Context, start primitives.Slot
 		return response
 	}
 
-	if coreTime.PeerDASIsActive(start) {
-		response.err = f.fetchDataColumnsFromPeers(ctx, response.bwb, nil, delay, batchSize)
-		return response
+	// Compute the first electra slot.
+	firstElectraSlot, err := slots.EpochStart(params.BeaconConfig().ElectraForkEpoch)
+	if err != nil {
+		firstElectraSlot = math.MaxUint64
 	}
 
-	if err := f.fetchBlobsFromPeer(ctx, response.bwb, response.pid, peers); err != nil {
+	// Find the first block with a slot greater than or equal to the first electra slot.
+	// (Blocks are sorted by slot)
+	firstElectraIndex := sort.Search(len(response.bwb), func(i int) bool {
+		return response.bwb[i].Block.Block().Slot() >= firstElectraSlot
+	})
+
+	preElectraBwbs := response.bwb[:firstElectraIndex]
+	postElectraBwbs := response.bwb[firstElectraIndex:]
+
+	// Fetch blobs.
+	if err := f.fetchBlobsFromPeer(ctx, preElectraBwbs, response.pid, peers); err != nil {
 		response.err = err
+		return response
 	}
 
+	// Fetch data columns.
+	response.err = f.fetchDataColumnsFromPeers(ctx, postElectraBwbs, nil, delay, batchSize)
 	return response
 }
 
-// fetchBlocksFromPeer fetches blocks from a single randomly selected peer.
+// fetchBlocksFromPeer fetches blocks from a single randomly selected peer, sorted by slot.
 func (f *blocksFetcher) fetchBlocksFromPeer(
 	ctx context.Context,
 	start primitives.Slot, count uint64,
@@ -369,20 +383,19 @@ func (f *blocksFetcher) fetchBlocksFromPeer(
 	// peers are dialed first.
 	peers = append(bestPeers, peers...)
 	peers = dedupPeers(peers)
-	for i := 0; i < len(peers); i++ {
-		p := peers[i]
-		blocks, err := f.requestBlocks(ctx, req, p)
+	for _, peer := range peers {
+		blocks, err := f.requestBlocks(ctx, req, peer)
 		if err != nil {
-			log.WithField("peer", p).WithError(err).Debug("Could not request blocks by range from peer")
+			log.WithField("peer", peer).WithError(err).Debug("Could not request blocks by range from peer")
 			continue
 		}
-		f.p2p.Peers().Scorers().BlockProviderScorer().Touch(p)
+		f.p2p.Peers().Scorers().BlockProviderScorer().Touch(peer)
 		robs, err := sortedBlockWithVerifiedBlobSlice(blocks)
 		if err != nil {
-			log.WithField("peer", p).WithError(err).Debug("invalid BeaconBlocksByRange response")
+			log.WithField("peer", peer).WithError(err).Debug("invalid BeaconBlocksByRange response")
 			continue
 		}
-		return robs, p, err
+		return robs, peer, err
 	}
 	return nil, "", errNoPeersAvailable
 }
@@ -565,6 +578,10 @@ func missingCommitError(root [32]byte, slot primitives.Slot, missing [][]byte) e
 // fetchBlobsFromPeer fetches blocks from a single randomly selected peer.
 // This function mutates the input `bwb` argument.
 func (f *blocksFetcher) fetchBlobsFromPeer(ctx context.Context, bwb []blocks.BlockWithROBlobs, pid peer.ID, peers []peer.ID) error {
+	if len(bwb) == 0 {
+		return nil
+	}
+
 	ctx, span := trace.StartSpan(ctx, "initialsync.fetchBlobsFromPeer")
 	defer span.End()
 	if slots.ToEpoch(f.clock.CurrentSlot()) < params.BeaconConfig().DenebForkEpoch {
@@ -936,7 +953,7 @@ type bwbsMissingColumns struct {
 // fetchDataColumnsFromPeers looks at the blocks in `bwb` and retrieves all
 // data columns for with the block has blob commitments, and for which our store is missing data columns
 // we should custody.
-// This function mutates `bwb` by adding the retrieved data columns.
+// This function mutates `bwbs` by adding the retrieved data columns.
 // Prerequisite: bwb is sorted by slot.
 func (f *blocksFetcher) fetchDataColumnsFromPeers(
 	ctx context.Context,
@@ -951,6 +968,10 @@ func (f *blocksFetcher) fetchDataColumnsFromPeers(
 		maxAllowedStall = 5     // Number of trials before giving up.
 	)
 
+	if len(bwbs) == 0 {
+		return nil
+	}
+
 	// Generate random identifier.
 	identifier := f.rand.Intn(maxIdentifier)
 

beacon-chain/sync/initial-sync/blocks_fetcher_test.go

@@ -1713,7 +1713,7 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 
 		// Fork epochs.
 		denebForkEpoch   primitives.Epoch
-		eip7954ForkEpoch primitives.Epoch
+		electraForkEpoch primitives.Epoch
 
 		// Current slot.
 		currentSlot uint64
@@ -1753,29 +1753,29 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 			isError:            false,
 		},
 		{
-			name:             "All blocks are before EIP-7954 fork epoch",
+			name:             "All blocks are before Electra fork epoch",
 			denebForkEpoch:   0,
-			eip7954ForkEpoch: 1,
+			electraForkEpoch: 1,
 			currentSlot:      40,
 			blocksParams: []blockParams{
-				{slot: 25, hasBlobs: false}, // Before EIP-7954 fork epoch
-				{slot: 26, hasBlobs: false}, // Before EIP-7954 fork epoch
-				{slot: 27, hasBlobs: false}, // Before EIP-7954 fork epoch
-				{slot: 28, hasBlobs: false}, // Before EIP-7954 fork epoch
+				{slot: 25, hasBlobs: false}, // Before Electra fork epoch
+				{slot: 26, hasBlobs: false}, // Before Electra fork epoch
+				{slot: 27, hasBlobs: false}, // Before Electra fork epoch
+				{slot: 28, hasBlobs: false}, // Before Electra fork epoch
 			},
 			batchSize:          32,
 			addedRODataColumns: [][]int{nil, nil, nil, nil},
 			isError:            false,
 		},
 		{
-			name:             "All blocks with commitments before are EIP-7954 fork epoch",
+			name:             "All blocks with commitments before are Electra fork epoch",
 			denebForkEpoch:   0,
-			eip7954ForkEpoch: 1,
+			electraForkEpoch: 1,
 			currentSlot:      40,
 			blocksParams: []blockParams{
-				{slot: 25, hasBlobs: false}, // Before EIP-7954 fork epoch
-				{slot: 26, hasBlobs: true},  // Before EIP-7954 fork epoch
-				{slot: 27, hasBlobs: true},  // Before EIP-7954 fork epoch
+				{slot: 25, hasBlobs: false}, // Before Electra fork epoch
+				{slot: 26, hasBlobs: true},  // Before Electra fork epoch
+				{slot: 27, hasBlobs: true},  // Before Electra fork epoch
 				{slot: 32, hasBlobs: false},
 				{slot: 33, hasBlobs: false},
 			},
@@ -1785,12 +1785,12 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 		{
 			name:             "Some blocks with blobs but without any missing data columns",
 			denebForkEpoch:   0,
-			eip7954ForkEpoch: 1,
+			electraForkEpoch: 1,
 			currentSlot:      40,
 			blocksParams: []blockParams{
-				{slot: 25, hasBlobs: false}, // Before EIP-7954 fork epoch
-				{slot: 26, hasBlobs: true},  // Before EIP-7954 fork epoch
-				{slot: 27, hasBlobs: true},  // Before EIP-7954 fork epoch
+				{slot: 25, hasBlobs: false}, // Before Electra fork epoch
+				{slot: 26, hasBlobs: true},  // Before Electra fork epoch
+				{slot: 27, hasBlobs: true},  // Before Electra fork epoch
 				{slot: 32, hasBlobs: false},
 				{slot: 33, hasBlobs: true},
 			},
@@ -1808,11 +1808,11 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 		{
 			name:             "Some blocks with blobs with missing data columns - one round needed",
 			denebForkEpoch:   0,
-			eip7954ForkEpoch: 1,
+			electraForkEpoch: 1,
 			currentSlot:      40,
 			blocksParams: []blockParams{
-				{slot: 25, hasBlobs: false}, // Before EIP-7954 fork epoch
-				{slot: 27, hasBlobs: true},  // Before EIP-7954 fork epoch
+				{slot: 25, hasBlobs: false}, // Before Electra fork epoch
+				{slot: 27, hasBlobs: true},  // Before Electra fork epoch
 				{slot: 32, hasBlobs: false},
 				{slot: 33, hasBlobs: true},
 				{slot: 34, hasBlobs: true},
@@ -1916,7 +1916,7 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 		{
 			name:             "Some blocks with blobs with missing data columns - partial responses",
 			denebForkEpoch:   0,
-			eip7954ForkEpoch: 1,
+			electraForkEpoch: 1,
 			currentSlot:      40,
 			blocksParams: []blockParams{
 				{slot: 33, hasBlobs: true},
@@ -1970,7 +1970,7 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 		{
 			name:             "Some blocks with blobs with missing data columns - first response is invalid",
 			denebForkEpoch:   0,
-			eip7954ForkEpoch: 1,
+			electraForkEpoch: 1,
 			currentSlot:      40,
 			blocksParams: []blockParams{
 				{slot: 38, hasBlobs: true},
@@ -2004,7 +2004,7 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 		{
 			name:              "Some blocks with blobs with missing data columns - first response is empty",
 			denebForkEpoch:    0,
-			eip7954ForkEpoch:  1,
+			electraForkEpoch:  1,
 			currentSlot:       40,
 			blocksParams:      []blockParams{{slot: 38, hasBlobs: true}},
 			storedDataColumns: []map[int]bool{{38: true, 102: true}},
@@ -2033,7 +2033,7 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 		{
 			name:              "Some blocks with blobs with missing data columns - no response at all",
 			denebForkEpoch:    0,
-			eip7954ForkEpoch:  1,
+			electraForkEpoch:  1,
 			currentSlot:       40,
 			blocksParams:      []blockParams{{slot: 38, hasBlobs: true}},
 			storedDataColumns: []map[int]bool{{38: true, 102: true}},
@@ -2056,7 +2056,7 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 		{
 			name:             "Some blocks with blobs with missing data columns - request has to be split",
 			denebForkEpoch:   0,
-			eip7954ForkEpoch: 1,
+			electraForkEpoch: 1,
 			currentSlot:      40,
 			blocksParams: []blockParams{
 				{slot: 32, hasBlobs: true}, {slot: 33, hasBlobs: true}, {slot: 34, hasBlobs: true}, {slot: 35, hasBlobs: true}, // 4
@@ -2176,8 +2176,8 @@ func TestFetchDataColumnsFromPeers(t *testing.T) {
 			// Set the Deneb fork epoch.
 			params.BeaconConfig().DenebForkEpoch = tc.denebForkEpoch
 
-			// Set the EIP-7594 fork epoch.
-			params.BeaconConfig().Eip7594ForkEpoch = tc.eip7954ForkEpoch
+			// Set the Electra fork epoch.
+			params.BeaconConfig().ElectraForkEpoch = tc.electraForkEpoch
 
 			// Save the blocks in the store.
 			storage := make(map[[fieldparams.RootLength]byte][]int)