Potuz's feedback

Author: terencechain

consensus-types/blocks/factory.go

@@ -641,8 +641,6 @@ func BuildSignedBeaconBlockFromExecutionPayload(blk interfaces.ReadOnlySignedBea
 			},
 			Signature: sig[:],
 		}
-	case version.Gloas:
-		return nil, errors.Wrap(errUnsupportedBeaconBlock, "gloas blocks are not supported in this function")
 	default:
 		return nil, errors.New("Block not of known type")
 	}

consensus-types/blocks/factory_test.go

@@ -571,12 +571,21 @@ func TestBuildSignedBeaconBlockFromExecutionPayload(t *testing.T) {
 		require.DeepEqual(t, uint64(123), payload.ExcessBlobGas)
 		require.DeepEqual(t, uint64(321), payload.BlobGasUsed)
 	})
-	t.Run("gloas unsupported", func(t *testing.T) {
-		blk := &SignedBeaconBlock{
+	t.Run("gloas execution unsupported", func(t *testing.T) {
+		base := &SignedBeaconBlock{
 			version: version.Gloas,
 			block:   &BeaconBlock{version: version.Gloas, body: &BeaconBlockBody{version: version.Gloas}},
 		}
-		_, err := BuildSignedBeaconBlockFromExecutionPayload(blk, nil)
-		require.ErrorIs(t, err, errNonBlindedSignedBeaconBlock)
+		blinded := &testBlindedSignedBeaconBlock{SignedBeaconBlock: base}
+		_, err := BuildSignedBeaconBlockFromExecutionPayload(blinded, nil)
+		require.ErrorContains(t, "Execution is not supported for gloas", err)
 	})
 }
+
+type testBlindedSignedBeaconBlock struct {
+	*SignedBeaconBlock
+}
+
+func (b *testBlindedSignedBeaconBlock) IsBlinded() bool {
+	return true
+}

consensus-types/blocks/getters.go

@@ -679,10 +679,10 @@ func (b *SignedBeaconBlock) UnmarshalSSZ(buf []byte) error {
 		}
 	case version.Gloas:
 		pb := &eth.SignedBeaconBlockGloas{}
-		if err := pb.UnmarshalSSZ(buf); err != nil {
+		err := pb.UnmarshalSSZ(buf); 
+		if err != nil {
 			return err
 		}
-		var err error
 		newBlock, err = initSignedBlockFromProtoGloas(pb)
 		if err != nil {
 			return err
@@ -1243,7 +1243,7 @@ func (b *BeaconBlockBody) SyncAggregate() (*eth.SyncAggregate, error) {
 // Execution returns the execution payload of the block body.
 func (b *BeaconBlockBody) Execution() (interfaces.ExecutionData, error) {
 	switch b.version {
-	case version.Phase0, version.Altair:
+	case version.Phase0, version.Altair, version.Gloas:
 		return nil, consensus_types.ErrNotSupported("Execution", b.version)
 	default:
 		if b.IsBlinded() {
@@ -1275,7 +1275,7 @@ func (b *BeaconBlockBody) BlobKzgCommitments() ([][]byte, error) {
 
 // ExecutionRequests returns the execution requests
 func (b *BeaconBlockBody) ExecutionRequests() (*enginev1.ExecutionRequests, error) {
-	if b.version < version.Electra {
+	if b.version < version.Electra || b.version >= version.Gloas {
 		return nil, consensus_types.ErrNotSupported("ExecutionRequests", b.version)
 	}
 	return b.executionRequests, nil

consensus-types/blocks/getters_test.go

@@ -503,6 +503,32 @@ func Test_BeaconBlockBody_Execution(t *testing.T) {
 	gas, err = eDenebHeader.ExcessBlobGas()
 	require.NoError(t, err)
 	require.DeepEqual(t, gas, uint64(223))
+
+	bb = &SignedBeaconBlock{version: version.Gloas, block: &BeaconBlock{version: version.Gloas, body: &BeaconBlockBody{version: version.Gloas}}}
+	_, err = bb.Block().Body().Execution()
+	require.ErrorIs(t, err, consensus_types.ErrUnsupportedField)
+}
+
+func Test_BeaconBlockBody_ExecutionRequests(t *testing.T) {
+	t.Run("unsupported before Electra", func(t *testing.T) {
+		bb := &BeaconBlockBody{version: version.Deneb}
+		_, err := bb.ExecutionRequests()
+		require.ErrorIs(t, err, consensus_types.ErrUnsupportedField)
+	})
+
+	t.Run("electra returns requests", func(t *testing.T) {
+		reqs := &pb.ExecutionRequests{}
+		bb := &BeaconBlockBody{version: version.Electra, executionRequests: reqs}
+		result, err := bb.ExecutionRequests()
+		require.NoError(t, err)
+		require.Equal(t, reqs, result)
+	})
+
+	t.Run("unsupported for Gloas", func(t *testing.T) {
+		bb := &BeaconBlockBody{version: version.Gloas}
+		_, err := bb.ExecutionRequests()
+		require.ErrorIs(t, err, consensus_types.ErrUnsupportedField)
+	})
 }
 
 func Test_BeaconBlockBody_HashTreeRoot(t *testing.T) {

consensus-types/blocks/proto.go

@@ -1579,8 +1579,8 @@ func initBlockBodyFromProtoGloas(pb *eth.BeaconBlockBodyGloas) (*BeaconBlockBody
 		deposits:                  pb.Deposits,
 		voluntaryExits:            pb.VoluntaryExits,
 		syncAggregate:             pb.SyncAggregate,
-		signedExecutionPayloadBid: pb.SignedExecutionPayloadBid,
 		blsToExecutionChanges:     pb.BlsToExecutionChanges,
+		signedExecutionPayloadBid: pb.SignedExecutionPayloadBid,
 		payloadAttestations:       pb.PayloadAttestations,
 	}
 	return b, nil

consensus-types/blocks/setters.go

@@ -144,7 +144,7 @@ func (b *SignedBeaconBlock) SetSyncAggregate(s *eth.SyncAggregate) error {
 // SetExecution sets the execution payload of the block body.
 // This function is not thread safe, it is only used during block creation.
 func (b *SignedBeaconBlock) SetExecution(e interfaces.ExecutionData) error {
-	if b.version == version.Phase0 || b.version == version.Altair {
+	if b.version == version.Phase0 || b.version == version.Altair || b.version >= version.Gloas {
 		return consensus_types.ErrNotSupported("Execution", b.version)
 	}
 	if e.IsBlinded() {
@@ -176,7 +176,7 @@ func (b *SignedBeaconBlock) SetBlobKzgCommitments(c [][]byte) error {
 
 // SetExecutionRequests sets the execution requests in the block.
 func (b *SignedBeaconBlock) SetExecutionRequests(req *enginev1.ExecutionRequests) error {
-	if b.version < version.Electra {
+	if b.version < version.Electra || b.version >= version.Gloas {
 		return consensus_types.ErrNotSupported("SetExecutionRequests", b.version)
 	}
 	b.block.body.executionRequests = req

consensus-types/blocks/setters_test.go

@@ -5,6 +5,7 @@ import (
 
 	bitfield "github.com/OffchainLabs/go-bitfield"
 	consensus_types "github.com/OffchainLabs/prysm/v7/consensus-types"
+	enginev1 "github.com/OffchainLabs/prysm/v7/proto/engine/v1"
 	eth "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
 	"github.com/OffchainLabs/prysm/v7/runtime/version"
 	"github.com/OffchainLabs/prysm/v7/testing/require"
@@ -71,6 +72,28 @@ func TestSignedBeaconBlock_SetSignedExecutionPayloadBid(t *testing.T) {
 	})
 }
 
+func TestSignedBeaconBlock_SetExecution(t *testing.T) {
+	t.Run("rejects Gloas version", func(t *testing.T) {
+		sb := newTestSignedBeaconBlock(version.Gloas)
+		payload := &enginev1.ExecutionPayload{}
+		wrapped, err := WrappedExecutionPayload(payload)
+		require.NoError(t, err)
+
+		err = sb.SetExecution(wrapped)
+		require.ErrorIs(t, err, consensus_types.ErrUnsupportedField)
+	})
+}
+
+func TestSignedBeaconBlock_SetExecutionRequests(t *testing.T) {
+	t.Run("rejects Gloas version", func(t *testing.T) {
+		sb := newTestSignedBeaconBlock(version.Gloas)
+		requests := &enginev1.ExecutionRequests{}
+
+		err := sb.SetExecutionRequests(requests)
+		require.ErrorIs(t, err, consensus_types.ErrUnsupportedField)
+	})
+}
+
 func newTestSignedBeaconBlock(ver int) *SignedBeaconBlock {
 	return &SignedBeaconBlock{
 		version: ver,

consensus-types/blocks/types.go

@@ -57,8 +57,8 @@ type BeaconBlockBody struct {
 	blsToExecutionChanges     []*eth.SignedBLSToExecutionChange
 	blobKzgCommitments        [][]byte
 	executionRequests         *enginev1.ExecutionRequests
-	payloadAttestations       []*eth.PayloadAttestation
 	signedExecutionPayloadBid *eth.SignedExecutionPayloadBid
+	payloadAttestations       []*eth.PayloadAttestation
 }
 
 var _ interfaces.ReadOnlyBeaconBlockBody = &BeaconBlockBody{}