Gloas support

api/signedexecutionpayloadenvelopeopts.go

@@ -0,0 +1,22 @@
+// Copyright © 2025 Attestant Limited.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package api
+
+// SignedExecutionPayloadEnvelopeOpts are the options for obtaining signed execution payload envelopes.
+type SignedExecutionPayloadEnvelopeOpts struct {
+	Common CommonOpts
+
+	// Block is the ID of the block which the data is obtained.
+	Block string
+}

api/v1/executionpayloadevent.go

@@ -0,0 +1,104 @@
+// Copyright © 2025 Attestant Limited.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package v1
+
+import (
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/attestantio/go-eth2-client/spec/phase0"
+	"github.com/pkg/errors"
+)
+
+// ExecutionPayloadEvent is the data for the execution payload event.
+type ExecutionPayloadEvent struct {
+	BlockRoot           phase0.Root
+	Slot                phase0.Slot
+	ExecutionBlockHash  phase0.Hash32
+	ExecutionOptimistic bool
+}
+
+// executionPayloadEventJSON is the spec representation of the struct.
+type executionPayloadEventJSON struct {
+	BlockRoot           string `json:"block_root"`
+	Slot                string `json:"slot"`
+	ExecutionBlockHash  string `json:"execution_block_hash"`
+	ExecutionOptimistic bool   `json:"execution_optimistic"`
+}
+
+// MarshalJSON implements json.Marshaler.
+func (e *ExecutionPayloadEvent) MarshalJSON() ([]byte, error) {
+	return json.Marshal(&executionPayloadEventJSON{
+		BlockRoot:           fmt.Sprintf("%#x", e.BlockRoot),
+		Slot:                fmt.Sprintf("%d", e.Slot),
+		ExecutionBlockHash:  fmt.Sprintf("%#x", e.ExecutionBlockHash),
+		ExecutionOptimistic: e.ExecutionOptimistic,
+	})
+}
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (e *ExecutionPayloadEvent) UnmarshalJSON(input []byte) error {
+	var err error
+
+	var executionPayloadEventJSON executionPayloadEventJSON
+	if err = json.Unmarshal(input, &executionPayloadEventJSON); err != nil {
+		return errors.Wrap(err, "invalid JSON")
+	}
+	if executionPayloadEventJSON.BlockRoot == "" {
+		return errors.New("block root missing")
+	}
+	block, err := hex.DecodeString(strings.TrimPrefix(executionPayloadEventJSON.BlockRoot, "0x"))
+	if err != nil {
+		return errors.Wrap(err, "invalid value for block root")
+	}
+	if len(block) != rootLength {
+		return fmt.Errorf("incorrect length %d for block root", len(block))
+	}
+	copy(e.BlockRoot[:], block)
+	if executionPayloadEventJSON.Slot == "" {
+		return errors.New("slot missing")
+	}
+	slot, err := strconv.ParseUint(executionPayloadEventJSON.Slot, 10, 64)
+	if err != nil {
+		return errors.Wrap(err, "invalid value for slot")
+	}
+	e.Slot = phase0.Slot(slot)
+	if executionPayloadEventJSON.ExecutionBlockHash == "" {
+		return errors.New("payload hash missing")
+	}
+	payloadHash, err := hex.DecodeString(strings.TrimPrefix(executionPayloadEventJSON.ExecutionBlockHash, "0x"))
+	if err != nil {
+		return errors.Wrap(err, "invalid value for payload hash")
+	}
+	if len(payloadHash) != rootLength {
+		return fmt.Errorf("incorrect length %d for payload hash", len(payloadHash))
+	}
+	copy(e.ExecutionBlockHash[:], payloadHash)
+	e.ExecutionOptimistic = executionPayloadEventJSON.ExecutionOptimistic
+
+	return nil
+}
+
+// String returns a string version of the structure.
+func (e *ExecutionPayloadEvent) String() string {
+	data, err := json.Marshal(e)
+	if err != nil {
+		return fmt.Sprintf("ERR: %v", err)
+	}
+
+	return string(data)
+}

api/v1/payloadattributesevent.go

@@ -488,7 +488,7 @@ func (e *PayloadAttributesEvent) MarshalJSON() ([]byte, error) {
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to marshal payload attributes v3")
 		}
-	case spec.DataVersionElectra, spec.DataVersionFulu:
+	case spec.DataVersionElectra, spec.DataVersionFulu, spec.DataVersionGloas:
 		if e.Data.V4 == nil {
 			return nil, errors.New("no payload attributes v4 data")
 		}
@@ -619,7 +619,7 @@ func (e *PayloadAttributesEvent) unpack(data *payloadAttributesEventJSON) error
 			return err
 		}
 		e.Data.V3 = &payloadAttributes
-	case spec.DataVersionElectra, spec.DataVersionFulu:
+	case spec.DataVersionElectra, spec.DataVersionFulu, spec.DataVersionGloas:
 		var payloadAttributes PayloadAttributesV4
 		err = json.Unmarshal(data.Data.PayloadAttributes, &payloadAttributes)
 		if err != nil {

api/versionedsignedblindedbeaconblock.go

@@ -31,6 +31,7 @@ type VersionedSignedBlindedBeaconBlock struct {
 	Deneb     *apiv1deneb.SignedBlindedBeaconBlock
 	Electra   *apiv1electra.SignedBlindedBeaconBlock
 	Fulu      *apiv1electra.SignedBlindedBeaconBlock
+	Gloas     *apiv1electra.SignedBlindedBeaconBlock
 }
 
 // Slot returns the slot of the signed beacon block.
@@ -71,6 +72,13 @@ func (v *VersionedSignedBlindedBeaconBlock) Slot() (phase0.Slot, error) {
 		}
 
 		return v.Fulu.Message.Slot, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil ||
+			v.Gloas.Message == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Gloas.Message.Slot, nil
 	default:
 		return 0, ErrUnsupportedVersion
 	}
@@ -158,6 +166,22 @@ func (v *VersionedSignedBlindedBeaconBlock) Attestations() ([]spec.VersionedAtte
 			}
 		}
 
+		return versionedAttestations, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil ||
+			v.Gloas.Message == nil ||
+			v.Gloas.Message.Body == nil {
+			return nil, ErrDataMissing
+		}
+
+		versionedAttestations := make([]spec.VersionedAttestation, len(v.Gloas.Message.Body.Attestations))
+		for i, attestation := range v.Gloas.Message.Body.Attestations {
+			versionedAttestations[i] = spec.VersionedAttestation{
+				Version: spec.DataVersionGloas,
+				Gloas:   attestation,
+			}
+		}
+
 		return versionedAttestations, nil
 	default:
 		return nil, ErrUnsupportedVersion
@@ -200,6 +224,12 @@ func (v *VersionedSignedBlindedBeaconBlock) Root() (phase0.Root, error) {
 		}
 
 		return v.Fulu.Message.HashTreeRoot()
+	case spec.DataVersionGloas:
+		if v.Gloas == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Gloas.Message.HashTreeRoot()
 	default:
 		return phase0.Root{}, ErrUnsupportedVersion
 	}
@@ -244,6 +274,12 @@ func (v *VersionedSignedBlindedBeaconBlock) BodyRoot() (phase0.Root, error) {
 		}
 
 		return v.Fulu.Message.Body.HashTreeRoot()
+	case spec.DataVersionGloas:
+		if v.Gloas == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Gloas.Message.Body.HashTreeRoot()
 	default:
 		return phase0.Root{}, ErrUnsupportedVersion
 	}
@@ -285,6 +321,12 @@ func (v *VersionedSignedBlindedBeaconBlock) ParentRoot() (phase0.Root, error) {
 		}
 
 		return v.Fulu.Message.ParentRoot, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Gloas.Message.ParentRoot, nil
 	default:
 		return phase0.Root{}, ErrUnsupportedVersion
 	}
@@ -326,6 +368,12 @@ func (v *VersionedSignedBlindedBeaconBlock) StateRoot() (phase0.Root, error) {
 		}
 
 		return v.Fulu.Message.StateRoot, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Gloas.Message.StateRoot, nil
 	default:
 		return phase0.Root{}, ErrUnsupportedVersion
 	}
@@ -409,6 +457,20 @@ func (v *VersionedSignedBlindedBeaconBlock) AttesterSlashings() ([]spec.Versione
 			}
 		}
 
+		return versionedAttesterSlashings, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil {
+			return nil, ErrDataMissing
+		}
+
+		versionedAttesterSlashings := make([]spec.VersionedAttesterSlashing, len(v.Gloas.Message.Body.AttesterSlashings))
+		for i, attesterSlashing := range v.Gloas.Message.Body.AttesterSlashings {
+			versionedAttesterSlashings[i] = spec.VersionedAttesterSlashing{
+				Version: spec.DataVersionGloas,
+				Gloas:   attesterSlashing,
+			}
+		}
+
 		return versionedAttesterSlashings, nil
 	default:
 		return nil, ErrUnsupportedVersion
@@ -454,6 +516,12 @@ func (v *VersionedSignedBlindedBeaconBlock) ProposerSlashings() ([]*phase0.Propo
 		}
 
 		return v.Fulu.Message.Body.ProposerSlashings, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Gloas.Message.Body.ProposerSlashings, nil
 	default:
 		return nil, ErrUnsupportedVersion
 	}
@@ -496,6 +564,12 @@ func (v *VersionedSignedBlindedBeaconBlock) ProposerIndex() (phase0.ValidatorInd
 		}
 
 		return v.Fulu.Message.ProposerIndex, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Gloas.Message.ProposerIndex, nil
 	default:
 		return 0, ErrUnsupportedVersion
 	}
@@ -549,6 +623,15 @@ func (v *VersionedSignedBlindedBeaconBlock) ExecutionParentHash() (phase0.Hash32
 		}
 
 		return v.Fulu.Message.Body.ExecutionPayloadHeader.ParentHash, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil ||
+			v.Gloas.Message == nil ||
+			v.Gloas.Message.Body == nil ||
+			v.Gloas.Message.Body.ExecutionPayloadHeader == nil {
+			return phase0.Hash32{}, ErrDataMissing
+		}
+
+		return v.Gloas.Message.Body.ExecutionPayloadHeader.ParentHash, nil
 	default:
 		return phase0.Hash32{}, ErrUnsupportedVersion
 	}
@@ -602,6 +685,15 @@ func (v *VersionedSignedBlindedBeaconBlock) ExecutionBlockHash() (phase0.Hash32,
 		}
 
 		return v.Fulu.Message.Body.ExecutionPayloadHeader.BlockHash, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil ||
+			v.Gloas.Message == nil ||
+			v.Gloas.Message.Body == nil ||
+			v.Gloas.Message.Body.ExecutionPayloadHeader == nil {
+			return phase0.Hash32{}, ErrDataMissing
+		}
+
+		return v.Gloas.Message.Body.ExecutionPayloadHeader.BlockHash, nil
 	default:
 		return phase0.Hash32{}, ErrUnsupportedVersion
 	}
@@ -655,6 +747,15 @@ func (v *VersionedSignedBlindedBeaconBlock) ExecutionBlockNumber() (uint64, erro
 		}
 
 		return v.Fulu.Message.Body.ExecutionPayloadHeader.BlockNumber, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil ||
+			v.Gloas.Message == nil ||
+			v.Gloas.Message.Body == nil ||
+			v.Gloas.Message.Body.ExecutionPayloadHeader == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Gloas.Message.Body.ExecutionPayloadHeader.BlockNumber, nil
 	default:
 		return 0, ErrUnsupportedVersion
 	}
@@ -689,6 +790,12 @@ func (v *VersionedSignedBlindedBeaconBlock) BlobKZGCommitments() ([]deneb.KZGCom
 		}
 
 		return v.Fulu.Message.Body.BlobKZGCommitments, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil || v.Gloas.Message == nil || v.Gloas.Message.Body == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Gloas.Message.Body.BlobKZGCommitments, nil
 	default:
 		return nil, ErrUnsupportedVersion
 	}
@@ -727,6 +834,12 @@ func (v *VersionedSignedBlindedBeaconBlock) Signature() (phase0.BLSSignature, er
 		}
 
 		return v.Fulu.Signature, nil
+	case spec.DataVersionGloas:
+		if v.Gloas == nil || v.Gloas.Message == nil || v.Gloas.Message.Body == nil {
+			return phase0.BLSSignature{}, ErrDataMissing
+		}
+
+		return v.Gloas.Signature, nil
 	default:
 		return phase0.BLSSignature{}, ErrUnsupportedVersion
 	}