new block strcut compatibility and fix OnBlock flow

Author: domiwei

cl/cltypes/beacon_block.go

@@ -238,32 +238,44 @@ type BeaconBody struct {
 }
 
 func NewBeaconBody(beaconCfg *clparams.BeaconChainConfig, version clparams.StateVersion) *BeaconBody {
-	var (
-		executionRequests *ExecutionRequests
-		maxAttSlashing    = MaxAttesterSlashings
-		maxAttestation    = MaxAttestations
-	)
-	if version.AfterOrEqual(clparams.ElectraVersion) {
-		// upgrade to electra
+	maxAttSlashing := MaxAttesterSlashings
+	maxAttestation := MaxAttestations
+	if version >= clparams.ElectraVersion {
 		maxAttSlashing = int(beaconCfg.MaxAttesterSlashingsElectra)
 		maxAttestation = int(beaconCfg.MaxAttestationsElectra)
-		executionRequests = NewExecutionRequests(beaconCfg)
 	}
 
-	return &BeaconBody{
-		beaconCfg:          beaconCfg,
-		Eth1Data:           &Eth1Data{},
-		ProposerSlashings:  solid.NewStaticListSSZ[*ProposerSlashing](MaxProposerSlashings, 416),
-		AttesterSlashings:  solid.NewDynamicListSSZ[*AttesterSlashing](maxAttSlashing),
-		Attestations:       solid.NewDynamicListSSZ[*solid.Attestation](maxAttestation),
-		Deposits:           solid.NewStaticListSSZ[*Deposit](MaxDeposits, 1240),
-		VoluntaryExits:     solid.NewStaticListSSZ[*SignedVoluntaryExit](MaxVoluntaryExits, 112),
-		ExecutionPayload:   NewEth1Block(version, beaconCfg),
-		ExecutionChanges:   solid.NewStaticListSSZ[*SignedBLSToExecutionChange](MaxExecutionChanges, 172),
-		BlobKzgCommitments: solid.NewStaticListSSZ[*KZGCommitment](MaxBlobsCommittmentsPerBlock, 48),
-		ExecutionRequests:  executionRequests,
-		Version:            version,
+	body := &BeaconBody{
+		beaconCfg:         beaconCfg,
+		Eth1Data:          &Eth1Data{},
+		ProposerSlashings: solid.NewStaticListSSZ[*ProposerSlashing](MaxProposerSlashings, 416),
+		AttesterSlashings: solid.NewDynamicListSSZ[*AttesterSlashing](maxAttSlashing),
+		Attestations:      solid.NewDynamicListSSZ[*solid.Attestation](maxAttestation),
+		Deposits:          solid.NewStaticListSSZ[*Deposit](MaxDeposits, 1240),
+		VoluntaryExits:    solid.NewStaticListSSZ[*SignedVoluntaryExit](MaxVoluntaryExits, 112),
+		ExecutionChanges:  solid.NewStaticListSSZ[*SignedBLSToExecutionChange](MaxExecutionChanges, 172),
+		Version:           version,
+	}
+
+	// [Modified in Gloas:EIP7732] Version-specific fields
+	if version < clparams.GloasVersion {
+		// Pre-GLOAS: ExecutionPayload, BlobKzgCommitments in BeaconBody
+		body.ExecutionPayload = NewEth1Block(version, beaconCfg)
+		body.BlobKzgCommitments = solid.NewStaticListSSZ[*KZGCommitment](MaxBlobsCommittmentsPerBlock, 48)
+		if version >= clparams.ElectraVersion {
+			body.ExecutionRequests = NewExecutionRequests(beaconCfg)
+		}
+	} else {
+		// GLOAS: SignedExecutionPayloadBid and PayloadAttestations replace above
+		body.SignedExecutionPayloadBid = &SignedExecutionPayloadBid{
+			Message: &ExecutionPayloadBid{
+				BlobKzgCommitments: *solid.NewStaticListSSZ[*KZGCommitment](MaxBlobsCommittmentsPerBlock, 48),
+			},
+		}
+		body.PayloadAttestations = solid.NewStaticListSSZ[*PayloadAttestation](int(beaconCfg.MaxPayloadAttestations), 0)
 	}
+
+	return body
 }
 
 func (b *BeaconBody) EncodeSSZ(dst []byte) ([]byte, error) {
@@ -302,35 +314,58 @@ func (b *BeaconBody) EncodingSizeSSZ() (size int) {
 	if b.VoluntaryExits == nil {
 		b.VoluntaryExits = solid.NewStaticListSSZ[*SignedVoluntaryExit](MaxVoluntaryExits, 112)
 	}
-	if b.ExecutionPayload == nil {
+	// [Modified in Gloas:EIP7732] ExecutionPayload removed in GLOAS
+	if b.ExecutionPayload == nil && b.Version < clparams.GloasVersion {
 		b.ExecutionPayload = NewEth1Block(b.Version, b.beaconCfg)
 	}
 	if b.ExecutionChanges == nil {
 		b.ExecutionChanges = solid.NewStaticListSSZ[*SignedBLSToExecutionChange](MaxExecutionChanges, 172)
 	}
-	if b.BlobKzgCommitments == nil {
+	// [Modified in Gloas:EIP7732] BlobKzgCommitments removed in GLOAS
+	if b.BlobKzgCommitments == nil && b.Version < clparams.GloasVersion {
 		b.BlobKzgCommitments = solid.NewStaticListSSZ[*KZGCommitment](MaxBlobsCommittmentsPerBlock, 48)
 	}
+	// [New in Gloas:EIP7732] Initialize GLOAS fields if nil
+	if b.Version >= clparams.GloasVersion {
+		if b.SignedExecutionPayloadBid == nil {
+			b.SignedExecutionPayloadBid = &SignedExecutionPayloadBid{
+				Message: &ExecutionPayloadBid{
+					BlobKzgCommitments: *solid.NewStaticListSSZ[*KZGCommitment](MaxBlobsCommittmentsPerBlock, 48),
+				},
+			}
+		}
+		if b.PayloadAttestations == nil {
+			b.PayloadAttestations = solid.NewStaticListSSZ[*PayloadAttestation](int(b.beaconCfg.MaxPayloadAttestations), 0)
+		}
+	}
 
 	size += b.ProposerSlashings.EncodingSizeSSZ()
 	size += b.AttesterSlashings.EncodingSizeSSZ()
 	size += b.Attestations.EncodingSizeSSZ()
 	size += b.Deposits.EncodingSizeSSZ()
 	size += b.VoluntaryExits.EncodingSizeSSZ()
-	if b.Version >= clparams.BellatrixVersion {
+	// [Modified in Gloas:EIP7732] ExecutionPayload removed in GLOAS
+	if b.Version >= clparams.BellatrixVersion && b.Version < clparams.GloasVersion {
 		size += b.ExecutionPayload.EncodingSizeSSZ()
 	}
 	if b.Version >= clparams.CapellaVersion {
 		size += b.ExecutionChanges.EncodingSizeSSZ()
 	}
-	if b.Version >= clparams.DenebVersion {
+	// [Modified in Gloas:EIP7732] BlobKzgCommitments removed in GLOAS
+	if b.Version >= clparams.DenebVersion && b.Version < clparams.GloasVersion {
 		size += b.BlobKzgCommitments.EncodingSizeSSZ()
 	}
-	if b.Version >= clparams.ElectraVersion {
+	// [Modified in Gloas:EIP7732] ExecutionRequests removed in GLOAS
+	if b.Version >= clparams.ElectraVersion && b.Version < clparams.GloasVersion {
 		if b.ExecutionRequests != nil {
 			size += b.ExecutionRequests.EncodingSizeSSZ()
 		}
 	}
+	// [New in Gloas:EIP7732] SignedExecutionPayloadBid and PayloadAttestations
+	if b.Version >= clparams.GloasVersion {
+		size += b.SignedExecutionPayloadBid.EncodingSizeSSZ()
+		size += b.PayloadAttestations.EncodingSizeSSZ()
+	}
 
 	return
 }
@@ -342,12 +377,30 @@ func (b *BeaconBody) DecodeSSZ(buf []byte, version int) error {
 		return fmt.Errorf("[BeaconBody] err: %s", ssz.ErrLowBufferSize)
 	}
 
-	b.ExecutionPayload = NewEth1Block(b.Version, b.beaconCfg)
+	// [Modified in Gloas:EIP7732] ExecutionPayload removed in GLOAS
+	if b.Version < clparams.GloasVersion {
+		b.ExecutionPayload = NewEth1Block(b.Version, b.beaconCfg)
+	}
+	// [New in Gloas:EIP7732] Initialize GLOAS fields for decoding
+	if b.Version >= clparams.GloasVersion {
+		b.SignedExecutionPayloadBid = &SignedExecutionPayloadBid{
+			Message: &ExecutionPayloadBid{
+				BlobKzgCommitments: *solid.NewStaticListSSZ[*KZGCommitment](MaxBlobsCommittmentsPerBlock, 48),
+			},
+		}
+		b.PayloadAttestations = solid.NewStaticListSSZ[*PayloadAttestation](int(b.beaconCfg.MaxPayloadAttestations), 0)
+	}
 	err := ssz2.UnmarshalSSZ(buf, version, b.getSchema(false)...)
 	return err
 }
 
 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")
+	}
+
 	header, err := b.ExecutionPayload.PayloadHeader()
 	if err != nil {
 		return nil, err
@@ -380,30 +433,46 @@ func (b *BeaconBody) getSchema(storage bool) []any {
 	if b.Version >= clparams.AltairVersion {
 		s = append(s, b.SyncAggregate)
 	}
-	if b.Version >= clparams.BellatrixVersion && !storage {
+	// [Modified in Gloas:EIP7732] ExecutionPayload removed in GLOAS
+	if b.Version >= clparams.BellatrixVersion && b.Version < clparams.GloasVersion && !storage {
 		s = append(s, b.ExecutionPayload)
 	}
 	if b.Version >= clparams.CapellaVersion {
 		s = append(s, b.ExecutionChanges)
 	}
-	if b.Version >= clparams.DenebVersion {
+	// [Modified in Gloas:EIP7732] BlobKzgCommitments removed in GLOAS
+	if b.Version >= clparams.DenebVersion && b.Version < clparams.GloasVersion {
 		s = append(s, b.BlobKzgCommitments)
 	}
-	if b.Version >= clparams.ElectraVersion {
+	// [Modified in Gloas:EIP7732] ExecutionRequests removed in GLOAS
+	if b.Version >= clparams.ElectraVersion && b.Version < clparams.GloasVersion {
 		s = append(s, b.ExecutionRequests)
 	}
+	// [New in Gloas:EIP7732] SignedExecutionPayloadBid and PayloadAttestations
+	if b.Version >= clparams.GloasVersion {
+		s = append(s, b.SignedExecutionPayloadBid)
+		s = append(s, b.PayloadAttestations)
+	}
 	return s
 }
 
 func (*BeaconBody) Static() bool {
 	return false
 }
 func (b *BeaconBody) ExecutionPayloadMerkleProof() ([][32]byte, error) {
+	// [Modified in Gloas:EIP7732] ExecutionPayload not present in GLOAS blocks
+	if b.Version >= clparams.GloasVersion {
+		return nil, errors.New("execution payload merkle proof not available for GLOAS blocks")
+	}
 	return merkle_tree.MerkleProof(4, 9, b.getSchema(false)...)
 }
 
 func (b *BeaconBody) KzgCommitmentMerkleProof(index int) ([][32]byte, error) {
-	if index >= b.BlobKzgCommitments.Len() {
+	// [Modified in Gloas:EIP7732] BlobKzgCommitments not in BeaconBody for GLOAS
+	if b.Version >= clparams.GloasVersion {
+		return nil, errors.New("kzg commitment merkle proof not available for GLOAS blocks; use SignedExecutionPayloadBid")
+	}
+	if b.BlobKzgCommitments == nil || index >= b.BlobKzgCommitments.Len() {
 		return nil, errors.New("index out of range")
 	}
 	kzgCommitmentsProof, err := merkle_tree.MerkleProof(4, 11, b.getSchema(false)...)
@@ -415,6 +484,10 @@ func (b *BeaconBody) KzgCommitmentMerkleProof(index int) ([][32]byte, error) {
 }
 
 func (b *BeaconBody) KzgCommitmentsInclusionProof() ([][32]byte, error) {
+	// [Modified in Gloas:EIP7732] BlobKzgCommitments not in BeaconBody for GLOAS
+	if b.Version >= clparams.GloasVersion {
+		return nil, errors.New("kzg commitments inclusion proof not available for GLOAS blocks; use SignedExecutionPayloadBid")
+	}
 	return merkle_tree.MerkleProof(4, 11, b.getSchema(false)...)
 }
 
@@ -442,16 +515,26 @@ func (b *BeaconBody) UnmarshalJSON(buf []byte) error {
 		ExecutionChanges   *solid.ListSSZ[*SignedBLSToExecutionChange] `json:"bls_to_execution_changes,omitempty"`
 		BlobKzgCommitments *solid.ListSSZ[*KZGCommitment]              `json:"blob_kzg_commitments,omitempty"`
 		ExecutionRequests  *ExecutionRequests                          `json:"execution_requests,omitempty"`
+		// [New in Gloas:EIP7732]
+		SignedExecutionPayloadBid *SignedExecutionPayloadBid          `json:"signed_execution_payload_bid,omitempty"`
+		PayloadAttestations       *solid.ListSSZ[*PayloadAttestation] `json:"payload_attestations,omitempty"`
 	}
 	tmp.ProposerSlashings = solid.NewStaticListSSZ[*ProposerSlashing](MaxProposerSlashings, 416)
 	tmp.AttesterSlashings = solid.NewDynamicListSSZ[*AttesterSlashing](maxAttSlashing)
 	tmp.Attestations = solid.NewDynamicListSSZ[*solid.Attestation](maxAttestation)
 	tmp.Deposits = solid.NewStaticListSSZ[*Deposit](MaxDeposits, 1240)
 	tmp.VoluntaryExits = solid.NewStaticListSSZ[*SignedVoluntaryExit](MaxVoluntaryExits, 112)
 	tmp.ExecutionChanges = solid.NewStaticListSSZ[*SignedBLSToExecutionChange](MaxExecutionChanges, 172)
-	tmp.BlobKzgCommitments = solid.NewStaticListSSZ[*KZGCommitment](MaxBlobsCommittmentsPerBlock, 48)
-	tmp.ExecutionRequests = NewExecutionRequests(b.beaconCfg)
-	tmp.ExecutionPayload = NewEth1Block(b.Version, b.beaconCfg)
+	// [Modified in Gloas:EIP7732] Only initialize pre-GLOAS fields when needed
+	if b.Version < clparams.GloasVersion {
+		tmp.BlobKzgCommitments = solid.NewStaticListSSZ[*KZGCommitment](MaxBlobsCommittmentsPerBlock, 48)
+		tmp.ExecutionRequests = NewExecutionRequests(b.beaconCfg)
+		tmp.ExecutionPayload = NewEth1Block(b.Version, b.beaconCfg)
+	}
+	// [New in Gloas:EIP7732] Initialize GLOAS fields
+	if b.Version >= clparams.GloasVersion {
+		tmp.PayloadAttestations = solid.NewStaticListSSZ[*PayloadAttestation](int(b.beaconCfg.MaxPayloadAttestations), 0)
+	}
 
 	if err := json.Unmarshal(buf, &tmp); err != nil {
 		return err
@@ -471,16 +554,29 @@ func (b *BeaconBody) UnmarshalJSON(buf []byte) error {
 	b.Deposits = tmp.Deposits
 	b.VoluntaryExits = tmp.VoluntaryExits
 	b.SyncAggregate = tmp.SyncAggregate
-	b.ExecutionPayload = tmp.ExecutionPayload
 	b.ExecutionChanges = tmp.ExecutionChanges
-	b.BlobKzgCommitments = tmp.BlobKzgCommitments
-	if b.Version >= clparams.ElectraVersion {
-		b.ExecutionRequests = tmp.ExecutionRequests
+
+	// [Modified in Gloas:EIP7732] Version-specific field assignment
+	if b.Version < clparams.GloasVersion {
+		b.ExecutionPayload = tmp.ExecutionPayload
+		b.BlobKzgCommitments = tmp.BlobKzgCommitments
+		if b.Version >= clparams.ElectraVersion {
+			b.ExecutionRequests = tmp.ExecutionRequests
+		}
+	}
+	// [New in Gloas:EIP7732]
+	if b.Version >= clparams.GloasVersion {
+		b.SignedExecutionPayloadBid = tmp.SignedExecutionPayloadBid
+		b.PayloadAttestations = tmp.PayloadAttestations
 	}
 	return nil
 }
 
 func (b *BeaconBody) GetPayloadHeader() (*Eth1Header, error) {
+	// [Modified in Gloas:EIP7732] ExecutionPayload not present in GLOAS blocks
+	if b.Version >= clparams.GloasVersion || b.ExecutionPayload == nil {
+		return nil, errors.New("execution payload not available for GLOAS blocks")
+	}
 	return b.ExecutionPayload.PayloadHeader()
 }
 
@@ -517,6 +613,13 @@ func (b *BeaconBody) GetVoluntaryExits() *solid.ListSSZ[*SignedVoluntaryExit] {
 }
 
 func (b *BeaconBody) GetBlobKzgCommitments() *solid.ListSSZ[*KZGCommitment] {
+	// [Modified in Gloas:EIP7732] In GLOAS, blob_kzg_commitments moved to signed_execution_payload_bid.message
+	if b.Version >= clparams.GloasVersion {
+		if b.SignedExecutionPayloadBid != nil && b.SignedExecutionPayloadBid.Message != nil {
+			return &b.SignedExecutionPayloadBid.Message.BlobKzgCommitments
+		}
+		return nil
+	}
 	return b.BlobKzgCommitments
 }
 

cl/cltypes/beacon_block_blinded.go

@@ -483,6 +483,12 @@ func (b *BlindedBeaconBody) GetVoluntaryExits() *solid.ListSSZ[*SignedVoluntaryE
 }
 
 func (b *BlindedBeaconBody) GetBlobKzgCommitments() *solid.ListSSZ[*KZGCommitment] {
+	// [Modified in Gloas:EIP7732] BlindedBeaconBody does not support GLOAS
+	// In GLOAS, blob_kzg_commitments are in signed_execution_payload_bid.message,
+	// which is not available in blinded blocks
+	if b.Version >= clparams.GloasVersion {
+		return nil
+	}
 	return b.BlobKzgCommitments
 }