*: integrating go-eth2-client@v0.21.1

core/validatorapi/eth2types.go

@@ -9,12 +9,7 @@ import (
 	"strconv"
 
 	eth2v1 "github.com/attestantio/go-eth2-client/api/v1"
-	eth2bellatrix "github.com/attestantio/go-eth2-client/api/v1/bellatrix"
-	eth2capella "github.com/attestantio/go-eth2-client/api/v1/capella"
-	eth2deneb "github.com/attestantio/go-eth2-client/api/v1/deneb"
 	"github.com/attestantio/go-eth2-client/spec/altair"
-	"github.com/attestantio/go-eth2-client/spec/bellatrix"
-	"github.com/attestantio/go-eth2-client/spec/capella"
 	eth2p0 "github.com/attestantio/go-eth2-client/spec/phase0"
 
 	"github.com/obolnetwork/charon/app/errors"
@@ -78,52 +73,24 @@ type proposerDutiesResponse struct {
 	ExecutionOptimistic bool                   `json:"execution_optimistic"`
 }
 
-type proposeBlockResponsePhase0 struct {
-	Version string              `json:"version"`
-	Data    *eth2p0.BeaconBlock `json:"data"`
-}
-
-type proposeBlockResponseAltair struct {
-	Version string              `json:"version"`
-	Data    *altair.BeaconBlock `json:"data"`
-}
-
-type proposeBlockResponseBellatrix struct {
-	Version string                 `json:"version"`
-	Data    *bellatrix.BeaconBlock `json:"data"`
-}
-
-type proposeBlindedBlockResponseBellatrix struct {
-	Version string                            `json:"version"`
-	Data    *eth2bellatrix.BlindedBeaconBlock `json:"data"`
-}
-
-type proposeBlindedBlockResponseCapella struct {
-	Version string                          `json:"version"`
-	Data    *eth2capella.BlindedBeaconBlock `json:"data"`
-}
-
-type proposeBlindedBlockResponseDeneb struct {
-	Version string                        `json:"version"`
-	Data    *eth2deneb.BlindedBeaconBlock `json:"data"`
-}
-
-type proposeBlockResponseCapella struct {
-	Version string               `json:"version"`
-	Data    *capella.BeaconBlock `json:"data"`
-}
-
-type proposeBlockResponseDeneb struct {
-	Version string                   `json:"version"`
-	Data    *eth2deneb.BlockContents `json:"data"`
+type proposeBlockV3Response struct {
+	ExecutionPayloadBlinded bool   `json:"execution_payload_blinded"`
+	ExecutionPayloadValue   string `json:"execution_payload_value"`
+	ConsensusBlockValue     string `json:"consensus_block_value"`
+	Version                 string `json:"version"`
+	Data                    any    `json:"data"`
 }
 
 type validatorsResponse struct {
-	Data []v1Validator `json:"data"`
+	ExecutionOptimistic bool          `json:"execution_optimistic"`
+	Finalized           bool          `json:"finalized"`
+	Data                []v1Validator `json:"data"`
 }
 
 type validatorResponse struct {
-	Data v1Validator `json:"data"`
+	ExecutionOptimistic bool        `json:"execution_optimistic"`
+	Finalized           bool        `json:"finalized"`
+	Data                v1Validator `json:"data"`
 }
 
 type aggregateBeaconCommitteeSelectionsJSON struct {
@@ -157,7 +124,8 @@ func (v v1Validator) MarshalJSON() ([]byte, error) {
 // syncCommitteeDutiesResponse defines the response to the getSyncCommitteeDuties endpoint.
 // See: https://ethereum.github.io/beacon-APIs/#/ValidatorRequiredApi/getSyncCommitteeDuties.
 type syncCommitteeDutiesResponse struct {
-	Data []*eth2v1.SyncCommitteeDuty `json:"data"`
+	ExecutionOptimistic bool                        `json:"execution_optimistic"`
+	Data                []*eth2v1.SyncCommitteeDuty `json:"data"`
 }
 
 // syncCommitteeContributionResponse defines the response to the syncCommitteeContribution endpoint.

core/validatorapi/router.go

@@ -639,12 +639,7 @@
 
 		proposal := eth2Resp.Data
 
-		var proposedBlock any
-		if eth2Resp.Data.Blinded {
-			proposedBlock, err = createProposeBlindedBlockResponse(proposal)
-		} else {
-			proposedBlock, err = createProposeBlockResponse(proposal)
-		}
+		proposedBlock, err := createProposeBlockResponse(proposal)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -682,92 +677,88 @@
 	return slot, randao, graffiti, err
 }
 
-// createProposeBlockResponse constructs proposeBlockResponse object for given block.
-func createProposeBlockResponse(block *eth2api.VersionedProposal) (any, error) {
-	switch block.Version {
+// createProposeBlockResponse constructs proposeBlockV3Response object for given block.
+func createProposeBlockResponse(proposal *eth2api.VersionedProposal) (any, error) {
+	var (
+		version   string
+		blockData any
+	)
+
+	switch proposal.Version {
 	case eth2spec.DataVersionPhase0:
-		if block.Phase0 == nil {
+		if proposal.Blinded {
+			return 0, errors.New("invalid blinded block")
+		}
+		if proposal.Phase0 == nil {
 			return 0, errors.New("no phase0 block")
 		}
 
-		return proposeBlockResponsePhase0{
-			Version: eth2spec.DataVersionPhase0.String(),
-			Data:    block.Phase0,
-		}, nil
+		version = eth2spec.DataVersionPhase0.String()
+		blockData = proposal.Phase0
 	case eth2spec.DataVersionAltair:
-		if block.Altair == nil {
+		if proposal.Blinded {
+			return 0, errors.New("invalid blinded block")
+		}
+		if proposal.Altair == nil {
 			return 0, errors.New("no altair block")
 		}
 
-		return proposeBlockResponseAltair{
-			Version: eth2spec.DataVersionAltair.String(),
-			Data:    block.Altair,
-		}, nil
+		version = eth2spec.DataVersionAltair.String()
+		blockData = proposal.Altair
 	case eth2spec.DataVersionBellatrix:
-		if block.Bellatrix == nil {
-			return 0, errors.New("no bellatrix block")
+		version = eth2spec.DataVersionBellatrix.String()
+		if proposal.Blinded {
+			if proposal.BellatrixBlinded == nil {
+				return 0, errors.New("no bellatrix blinded block")
+			}
+			blockData = proposal.BellatrixBlinded
+		} else {
+			if proposal.Bellatrix == nil {
+				return 0, errors.New("no bellatrix block")
+			}
+			blockData = proposal.Bellatrix
 		}
-
-		return proposeBlockResponseBellatrix{
-			Version: eth2spec.DataVersionBellatrix.String(),
-			Data:    block.Bellatrix,
-		}, nil
 	case eth2spec.DataVersionCapella:
-		if block.Capella == nil {
-			return 0, errors.New("no capella block")
+		version = eth2spec.DataVersionCapella.String()
+		if proposal.Blinded {
+			if proposal.CapellaBlinded == nil {
+				return 0, errors.New("no capella blinded block")
+			}
+			blockData = proposal.CapellaBlinded
+		} else {
+			if proposal.Capella == nil {
+				return 0, errors.New("no capella block")
+			}
+			blockData = proposal.Capella
 		}
-
-		return proposeBlockResponseCapella{
-			Version: eth2spec.DataVersionCapella.String(),
-			Data:    block.Capella,
-		}, nil
 	case eth2spec.DataVersionDeneb:
-		if block.Deneb == nil {
-			return 0, errors.New("no deneb block")
+		version = eth2spec.DataVersionDeneb.String()
+		if proposal.Blinded {
+			if proposal.DenebBlinded == nil {
+				return 0, errors.New("no deneb blinded block")
+			}
+			blockData = proposal.DenebBlinded
+		} else {
+			if proposal.Deneb == nil {
+				return 0, errors.New("no deneb block")
+			}
+			blockData = proposal.Deneb
 		}
-
-		return proposeBlockResponseDeneb{
-			Version: eth2spec.DataVersionDeneb.String(),
-			Data:    block.Deneb,
-		}, nil
 	default:
-		return 0, errors.New("invalid block")
-	}
-}
-
-// createProposeBlindedBlockResponse constructs proposeBlindedBlockResponse object for given block.
-func createProposeBlindedBlockResponse(block *eth2api.VersionedProposal) (any, error) {
-	switch block.Version {
-	case eth2spec.DataVersionBellatrix:
-		if block.BellatrixBlinded == nil {
-			return nil, errors.New("no bellatrix blinded block")
+		if proposal.Blinded {
+			return 0, errors.New("invalid blinded block")
 		}
 
-		return proposeBlindedBlockResponseBellatrix{
-			Version: eth2spec.DataVersionBellatrix.String(),
-			Data:    block.BellatrixBlinded,
-		}, nil
-	case eth2spec.DataVersionCapella:
-		if block.CapellaBlinded == nil {
-			return nil, errors.New("no capella blinded block")
-		}
-
-		return proposeBlindedBlockResponseCapella{
-			Version: eth2spec.DataVersionCapella.String(),
-			Data:    block.CapellaBlinded,
-		}, nil
-	case eth2spec.DataVersionDeneb:
-		if block.DenebBlinded == nil {
-			return nil, errors.New("no deneb blinded block")
-		}
-
-		return proposeBlindedBlockResponseDeneb{
-			Version: eth2spec.DataVersionDeneb.String(),
-			Data:    block.DenebBlinded,
-		}, nil
-	default:
-		return nil, errors.New("invalid blinded block")
+		return 0, errors.New("invalid block")
 	}
+
+	return proposeBlockV3Response{
+		Version:                 version,
+		Data:                    blockData,
+		ExecutionPayloadBlinded: proposal.Blinded,
+		ExecutionPayloadValue:   proposal.ExecutionValue.String(),
+		ConsensusBlockValue:     proposal.ConsensusValue.String(),
+	}, nil
 }
 
 func submitProposal(p eth2client.ProposalSubmitter) handlerFunc {