update forkchoice for spec changes

Author: domiwei

cl/clparams/constants.go

@@ -11,6 +11,7 @@ const (
 	BuilderPaymentThresholdDenominator = uint64(10)
 	PtcSize                            = uint64(512)
 	PayloadTimelyThreshold             = PtcSize / 2 // 256
+	DataAvailabilityTimelyThreshold    = PtcSize / 2 // 256
 
 	AttestationTimelinessIndex  = 0
 	PtcTimelinessIndex          = 1

cl/phase1/forkchoice/forkchoice.go

@@ -148,7 +148,8 @@ type ForkChoiceStore struct {
 	probabilisticHeadGetter bool
 
 	// [New in Gloas:EIP7732]
-	ptcVote sync.Map // map[common.Hash][clparams.PtcSize]bool
+	payloadTimelinessVote       sync.Map // map[common.Hash][clparams.PtcSize]bool
+	payloadDataAvailabilityVote sync.Map // map[common.Hash][clparams.PtcSize]bool
 	// [New in Gloas:EIP7732] Indexed weight store for optimized weight calculation
 	indexedWeightStore *indexedWeightStore
 }
@@ -297,7 +298,16 @@ func NewForkChoiceStore(
 	f.highestSeen.Store(anchorState.Slot())
 	f.time.Store(anchorState.GenesisTime() + anchorState.BeaconConfig().SecondsPerSlot*anchorState.Slot())
 
-	f.ptcVote.Store(common.Hash(anchorRoot), [clparams.PtcSize]bool{})
+	// [New in Gloas:EIP7732] Initialize payload timeliness and data availability votes
+	// Anchor block votes are initialized to all true (prior payloads/blobs were available)
+	var anchorTimelinessVotes [clparams.PtcSize]bool
+	var anchorDataAvailabilityVotes [clparams.PtcSize]bool
+	for i := range anchorTimelinessVotes {
+		anchorTimelinessVotes[i] = true
+		anchorDataAvailabilityVotes[i] = true
+	}
+	f.payloadTimelinessVote.Store(common.Hash(anchorRoot), anchorTimelinessVotes)
+	f.payloadDataAvailabilityVote.Store(common.Hash(anchorRoot), anchorDataAvailabilityVotes)
 
 	// [New in Gloas:EIP7732] Initialize indexed weight store
 	f.indexedWeightStore = NewIndexedWeightStore(f)

cl/phase1/forkchoice/on_block.go

@@ -264,8 +264,9 @@ func (f *ForkChoiceStore) OnBlock(ctx context.Context, block *cltypes.SignedBeac
 
 	// [New in Gloas:EIP7732] GLOAS-specific on_block logic (post state transition)
 	if isGloas {
-		// Initialize PTC vote for this block
-		f.ptcVote.Store(common.Hash(blockRoot), [clparams.PtcSize]bool{})
+		// Initialize payload timeliness and data availability votes for this block
+		f.payloadTimelinessVote.Store(common.Hash(blockRoot), [clparams.PtcSize]bool{})
+		f.payloadDataAvailabilityVote.Store(common.Hash(blockRoot), [clparams.PtcSize]bool{})
 
 		// Notify PTC messages from payload attestations in the block
 		if block.Block.Body.PayloadAttestations != nil {

cl/phase1/forkchoice/on_payload_attestation_message.go

@@ -88,15 +88,25 @@ func (f *ForkChoiceStore) onPayloadAttestationMessage(
 		}
 	}
 
-	// Get or initialize the PTC vote array for this block root
-	var ptcVotes [clparams.PtcSize]bool
-	if existing, ok := f.ptcVote.Load(blockRoot); ok {
-		ptcVotes = existing.([clparams.PtcSize]bool)
+	// Get or initialize the payload timeliness vote array for this block root
+	var timelinessVotes [clparams.PtcSize]bool
+	if existing, ok := f.payloadTimelinessVote.Load(blockRoot); ok {
+		timelinessVotes = existing.([clparams.PtcSize]bool)
 	}
 
-	// Update the ptc vote for the block
-	ptcVotes[ptcIndex] = data.PayloadPresent
-	f.ptcVote.Store(blockRoot, ptcVotes)
+	// Update the payload timeliness vote for the block
+	timelinessVotes[ptcIndex] = data.PayloadPresent
+	f.payloadTimelinessVote.Store(blockRoot, timelinessVotes)
+
+	// Get or initialize the data availability vote array for this block root
+	var dataAvailabilityVotes [clparams.PtcSize]bool
+	if existing, ok := f.payloadDataAvailabilityVote.Load(blockRoot); ok {
+		dataAvailabilityVotes = existing.([clparams.PtcSize]bool)
+	}
+
+	// Update the data availability vote for the block
+	dataAvailabilityVotes[ptcIndex] = data.BlobDataAvailable
+	f.payloadDataAvailabilityVote.Store(blockRoot, dataAvailabilityVotes)
 
 	return nil
 }

cl/phase1/forkchoice/payload_vote.go

@@ -54,8 +54,8 @@ func (f *ForkChoiceStore) notifyPtcMessages(
 // was voted as present by the PTC, and was locally determined to be available.
 // [New in Gloas:EIP7732]
 func (f *ForkChoiceStore) isPayloadTimely(root common.Hash) bool {
-	// The beacon block root must be known in ptc_vote
-	ptcVoteRaw, ok := f.ptcVote.Load(root)
+	// The beacon block root must be known in payload_timeliness_vote
+	voteRaw, ok := f.payloadTimelinessVote.Load(root)
 	if !ok {
 		return false
 	}
@@ -67,17 +67,45 @@ func (f *ForkChoiceStore) isPayloadTimely(root common.Hash) bool {
 	}
 
 	// Count PTC votes for payload present
-	ptcVotes := ptcVoteRaw.([clparams.PtcSize]bool)
+	votes := voteRaw.([clparams.PtcSize]bool)
 	presentCount := uint64(0)
-	for i := range ptcVotes {
-		if ptcVotes[i] {
+	for i := range votes {
+		if votes[i] {
 			presentCount++
 		}
 	}
 
 	return presentCount > clparams.PayloadTimelyThreshold
 }
 
+// isPayloadDataAvailable returns whether the blob data for the beacon block with root
+// was voted as present by the PTC, and was locally determined to be available.
+// [New in Gloas:EIP7732]
+func (f *ForkChoiceStore) isPayloadDataAvailable(root common.Hash) bool {
+	// The beacon block root must be known in payload_data_availability_vote
+	voteRaw, ok := f.payloadDataAvailabilityVote.Load(root)
+	if !ok {
+		return false
+	}
+
+	// If the payload is not locally available, the blob data
+	// is not considered available regardless of the PTC vote
+	if !f.forkGraph.HasEnvelope(root) {
+		return false
+	}
+
+	// Count PTC votes for data available
+	votes := voteRaw.([clparams.PtcSize]bool)
+	availableCount := uint64(0)
+	for i := range votes {
+		if votes[i] {
+			availableCount++
+		}
+	}
+
+	return availableCount > clparams.DataAvailabilityTimelyThreshold
+}
+
 // getParentPayloadStatus returns the payload status of the parent block.
 // Compares current block's parent_block_hash with parent block's block_hash from their bids.
 // [New in Gloas:EIP7732]
@@ -148,14 +176,14 @@ func (f *ForkChoiceStore) isSupportingVote(node ForkChoiceNode, message LatestMe
 
 // shouldExtendPayload returns whether the payload for the given root should be extended.
 // Returns true if:
-// - The payload is timely (received enough PTC votes), OR
+// - The payload is timely AND blob data is available (received enough PTC votes for both), OR
 // - There's no proposer boost root, OR
 // - The proposer boost root's parent is not this root, OR
 // - The proposer boost root's parent node has FULL payload status
 // [New in Gloas:EIP7732]
 func (f *ForkChoiceStore) shouldExtendPayload(root common.Hash) bool {
-	// Check if payload is timely
-	if f.isPayloadTimely(root) {
+	// Check if payload is timely AND blob data is available
+	if f.isPayloadTimely(root) && f.isPayloadDataAvailable(root) {
 		return true
 	}
 

cl/phase1/forkchoice/utils.go

@@ -78,15 +78,23 @@ func (f *ForkChoiceStore) onNewFinalized(newFinalized solid.Checkpoint) {
 		return true
 	})
 
-	// [New in Gloas:EIP7732] Clean up ptcVote for finalized blocks
+	// [New in Gloas:EIP7732] Clean up payload votes for finalized blocks
 	// Note: envelope files are cleaned up in forkGraph.Prune()
 	if newFinalized.Epoch >= f.beaconCfg.GloasForkEpoch {
 		finalizedSlot := newFinalized.Epoch * f.beaconCfg.SlotsPerEpoch
-		f.ptcVote.Range(func(k, v any) bool {
+		f.payloadTimelinessVote.Range(func(k, v any) bool {
 			// Key is stored as common.Hash
 			root := k.(common.Hash)
 			if header, has := f.forkGraph.GetHeader(root); !has || header.Slot <= finalizedSlot {
-				f.ptcVote.Delete(k)
+				f.payloadTimelinessVote.Delete(k)
+			}
+			return true
+		})
+		f.payloadDataAvailabilityVote.Range(func(k, v any) bool {
+			// Key is stored as common.Hash
+			root := k.(common.Hash)
+			if header, has := f.forkGraph.GetHeader(root); !has || header.Slot <= finalizedSlot {
+				f.payloadDataAvailabilityVote.Delete(k)
 			}
 			return true
 		})