address comments

api/versionedsignedblindedproposal.go

@@ -0,0 +1,380 @@
+// Copyright © 2023 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
+
+import (
+	apiv1bellatrix "github.com/attestantio/go-eth2-client/api/v1/bellatrix"
+	apiv1capella "github.com/attestantio/go-eth2-client/api/v1/capella"
+	apiv1deneb "github.com/attestantio/go-eth2-client/api/v1/deneb"
+	"github.com/attestantio/go-eth2-client/spec"
+	"github.com/attestantio/go-eth2-client/spec/phase0"
+)
+
+// VersionedSignedBlindedProposal contains a versioned signed blinded proposal.
+type VersionedSignedBlindedProposal struct {
+	Version   spec.DataVersion
+	Bellatrix *apiv1bellatrix.SignedBlindedBeaconBlock
+	Capella   *apiv1capella.SignedBlindedBeaconBlock
+	Deneb     *apiv1deneb.SignedBlindedBeaconBlock
+}
+
+// Slot returns the slot of the signed blinded proposal.
+func (v *VersionedSignedBlindedProposal) Slot() (phase0.Slot, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil ||
+			v.Bellatrix.Message == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.Slot, nil
+	case spec.DataVersionCapella:
+		if v.Capella == nil ||
+			v.Capella.Message == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Capella.Message.Slot, nil
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil ||
+			v.Deneb.Message == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Deneb.Message.Slot, nil
+	default:
+		return 0, ErrUnsupportedVersion
+	}
+}
+
+// Attestations returns the attestations of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) Attestations() ([]*phase0.Attestation, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil ||
+			v.Bellatrix.Message == nil ||
+			v.Bellatrix.Message.Body == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.Body.Attestations, nil
+	case spec.DataVersionCapella:
+		if v.Capella == nil ||
+			v.Capella.Message == nil ||
+			v.Capella.Message.Body == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Capella.Message.Body.Attestations, nil
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil ||
+			v.Deneb.Message == nil ||
+			v.Deneb.Message.Body == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Deneb.Message.Body.Attestations, nil
+	default:
+		return nil, ErrUnsupportedVersion
+	}
+}
+
+// Root returns the root of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) Root() (phase0.Root, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.HashTreeRoot()
+	case spec.DataVersionCapella:
+		if v.Capella == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Capella.Message.HashTreeRoot()
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Deneb.Message.HashTreeRoot()
+	default:
+		return phase0.Root{}, ErrUnsupportedVersion
+	}
+}
+
+// BodyRoot returns the body root of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) BodyRoot() (phase0.Root, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.Body.HashTreeRoot()
+	case spec.DataVersionCapella:
+		if v.Capella == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Capella.Message.Body.HashTreeRoot()
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil ||
+			v.Deneb.Message == nil ||
+			v.Deneb.Message.Body == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Deneb.Message.Body.HashTreeRoot()
+	default:
+		return phase0.Root{}, ErrUnsupportedVersion
+	}
+}
+
+// ParentRoot returns the parent root of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) ParentRoot() (phase0.Root, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.ParentRoot, nil
+	case spec.DataVersionCapella:
+		if v.Capella == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Capella.Message.ParentRoot, nil
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil ||
+			v.Deneb.Message == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Deneb.Message.ParentRoot, nil
+	default:
+		return phase0.Root{}, ErrUnsupportedVersion
+	}
+}
+
+// StateRoot returns the state root of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) StateRoot() (phase0.Root, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.StateRoot, nil
+	case spec.DataVersionCapella:
+		if v.Capella == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Capella.Message.StateRoot, nil
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil ||
+			v.Deneb.Message == nil {
+			return phase0.Root{}, ErrDataMissing
+		}
+
+		return v.Deneb.Message.StateRoot, nil
+	default:
+		return phase0.Root{}, ErrUnsupportedVersion
+	}
+}
+
+// AttesterSlashings returns the attester slashings of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) AttesterSlashings() ([]*phase0.AttesterSlashing, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.Body.AttesterSlashings, nil
+	case spec.DataVersionCapella:
+		if v.Capella == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Capella.Message.Body.AttesterSlashings, nil
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil ||
+			v.Deneb.Message == nil ||
+			v.Deneb.Message.Body == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Deneb.Message.Body.AttesterSlashings, nil
+	default:
+		return nil, ErrUnsupportedVersion
+	}
+}
+
+// ProposerSlashings returns the proposer slashings of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) ProposerSlashings() ([]*phase0.ProposerSlashing, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.Body.ProposerSlashings, nil
+	case spec.DataVersionCapella:
+		if v.Capella == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Capella.Message.Body.ProposerSlashings, nil
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil ||
+			v.Deneb.Message == nil ||
+			v.Deneb.Message.Body == nil {
+			return nil, ErrDataMissing
+		}
+
+		return v.Deneb.Message.Body.ProposerSlashings, nil
+	default:
+		return nil, ErrUnsupportedVersion
+	}
+}
+
+// ProposerIndex returns the proposer index of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) ProposerIndex() (phase0.ValidatorIndex, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil ||
+			v.Bellatrix.Message == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.ProposerIndex, nil
+	case spec.DataVersionCapella:
+		if v.Capella == nil ||
+			v.Capella.Message == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Capella.Message.ProposerIndex, nil
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil ||
+			v.Deneb.Message == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Deneb.Message.ProposerIndex, nil
+	default:
+		return 0, ErrUnsupportedVersion
+	}
+}
+
+// ExecutionBlockHash returns the hash of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) ExecutionBlockHash() (phase0.Hash32, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil ||
+			v.Bellatrix.Message == nil ||
+			v.Bellatrix.Message.Body == nil ||
+			v.Bellatrix.Message.Body.ExecutionPayloadHeader == nil {
+			return phase0.Hash32{}, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.Body.ExecutionPayloadHeader.BlockHash, nil
+	case spec.DataVersionCapella:
+		if v.Capella == nil ||
+			v.Capella.Message == nil ||
+			v.Capella.Message.Body == nil ||
+			v.Capella.Message.Body.ExecutionPayloadHeader == nil {
+			return phase0.Hash32{}, ErrDataMissing
+		}
+
+		return v.Capella.Message.Body.ExecutionPayloadHeader.BlockHash, nil
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil ||
+			v.Deneb.Message == nil ||
+			v.Deneb.Message.Body == nil ||
+			v.Deneb.Message.Body.ExecutionPayloadHeader == nil {
+			return phase0.Hash32{}, ErrDataMissing
+		}
+
+		return v.Deneb.Message.Body.ExecutionPayloadHeader.BlockHash, nil
+	default:
+		return phase0.Hash32{}, ErrUnsupportedVersion
+	}
+}
+
+// ExecutionBlockNumber returns the block number of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) ExecutionBlockNumber() (uint64, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil ||
+			v.Bellatrix.Message == nil ||
+			v.Bellatrix.Message.Body == nil ||
+			v.Bellatrix.Message.Body.ExecutionPayloadHeader == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Bellatrix.Message.Body.ExecutionPayloadHeader.BlockNumber, nil
+	case spec.DataVersionCapella:
+		if v.Capella == nil ||
+			v.Capella.Message == nil ||
+			v.Capella.Message.Body == nil ||
+			v.Capella.Message.Body.ExecutionPayloadHeader == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Capella.Message.Body.ExecutionPayloadHeader.BlockNumber, nil
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil ||
+			v.Deneb.Message == nil ||
+			v.Deneb.Message.Body == nil ||
+			v.Deneb.Message.Body.ExecutionPayloadHeader == nil {
+			return 0, ErrDataMissing
+		}
+
+		return v.Deneb.Message.Body.ExecutionPayloadHeader.BlockNumber, nil
+	default:
+		return 0, ErrUnsupportedVersion
+	}
+}
+
+// Signature returns the signature of the blinded proposal.
+func (v *VersionedSignedBlindedProposal) Signature() (phase0.BLSSignature, error) {
+	switch v.Version {
+	case spec.DataVersionBellatrix:
+		if v.Bellatrix == nil {
+			return phase0.BLSSignature{}, ErrDataMissing
+		}
+
+		return v.Bellatrix.Signature, nil
+	case spec.DataVersionCapella:
+		if v.Capella == nil {
+			return phase0.BLSSignature{}, ErrDataMissing
+		}
+
+		return v.Capella.Signature, nil
+	case spec.DataVersionDeneb:
+		if v.Deneb == nil {
+			return phase0.BLSSignature{}, ErrDataMissing
+		}
+
+		return v.Deneb.Signature, nil
+	default:
+		return phase0.BLSSignature{}, ErrUnsupportedVersion
+	}
+}

http/submitblindedproposal.go

@@ -25,7 +25,7 @@ import (
 )
 
 // SubmitBlindedProposal submits a blinded proposal.
-func (s *Service) SubmitBlindedProposal(ctx context.Context, proposal *api.VersionedSignedBlindedBeaconBlock) error {
+func (s *Service) SubmitBlindedProposal(ctx context.Context, proposal *api.VersionedBlindedProposal) error {
 	var specJSON []byte
 	var err error
 

service.go

@@ -290,7 +290,7 @@ type BlindedBeaconBlockSubmitter interface {
 // BlindedProposalSubmitter is the interface for submitting blinded proposals.
 type BlindedProposalSubmitter interface {
 	// SubmitBlindedProposal submits a beacon block.
-	SubmitBlindedProposal(ctx context.Context, block *api.VersionedSignedBlindedBeaconBlock) error
+	SubmitBlindedProposal(ctx context.Context, block *api.VersionedBlindedProposal) error
 }
 
 // ValidatorRegistrationsSubmitter is the interface for submitting validator registrations.