Minimal Spec Support

beaconclient/mock_beacon_instance.go

@@ -122,6 +122,10 @@ func (c *MockBeaconInstance) GetSpec() (spec *GetSpecResponse, err error) {
 	return nil, nil
 }
 
+func (c *MockBeaconInstance) GetSpecRaw() (spec map[string]interface{}, err error) {
+	return nil, nil
+}
+
 func (c *MockBeaconInstance) GetForkSchedule() (spec *GetForkScheduleResponse, err error) {
 	return nil, nil
 }

beaconclient/mock_multi_beacon_client.go

@@ -42,6 +42,10 @@ func (*MockMultiBeaconClient) GetSpec() (spec *GetSpecResponse, err error) {
 	return nil, nil
 }
 
+func (*MockMultiBeaconClient) GetSpecRaw() (spec map[string]interface{}, err error) {
+	return nil, nil
+}
+
 func (*MockMultiBeaconClient) GetForkSchedule() (spec *GetForkScheduleResponse, err error) {
 	resp := &GetForkScheduleResponse{
 		Data: []struct {

beaconclient/multi_beacon_client.go

@@ -41,6 +41,7 @@ type IMultiBeaconClient interface {
 	PublishBlock(block *common.VersionedSignedProposal) (code int, err error)
 	GetGenesis() (*GetGenesisResponse, error)
 	GetSpec() (spec *GetSpecResponse, err error)
+	GetSpecRaw() (spec map[string]interface{}, err error)
 	GetForkSchedule() (spec *GetForkScheduleResponse, err error)
 	GetRandao(slot uint64) (spec *GetRandaoResponse, err error)
 	GetWithdrawals(slot uint64) (spec *GetWithdrawalsResponse, err error)
@@ -59,6 +60,7 @@ type IBeaconInstance interface {
 	PublishBlock(block *common.VersionedSignedProposal, broadcastMode BroadcastMode) (code int, err error)
 	GetGenesis() (*GetGenesisResponse, error)
 	GetSpec() (spec *GetSpecResponse, err error)
+	GetSpecRaw() (spec map[string]interface{}, err error)
 	GetForkSchedule() (spec *GetForkScheduleResponse, err error)
 	GetRandao(slot uint64) (spec *GetRandaoResponse, err error)
 	GetWithdrawals(slot uint64) (spec *GetWithdrawalsResponse, err error)
@@ -349,6 +351,23 @@ func (c *MultiBeaconClient) GetSpec() (spec *GetSpecResponse, err error) {
 	return nil, err
 }
 
+// GetSpecRaw returns the complete beacon spec response as map[string]interface{}
+func (c *MultiBeaconClient) GetSpecRaw() (spec map[string]interface{}, err error) {
+	clients := c.beaconInstancesByLastResponse()
+	for _, client := range clients {
+		log := c.log.WithField("uri", client.GetURI())
+		if spec, err = client.GetSpecRaw(); err != nil {
+			log.WithError(err).Warn("failed to get spec raw")
+			continue
+		}
+
+		return spec, nil
+	}
+
+	c.log.WithError(err).Error("failed to get spec raw on any CL node")
+	return nil, err
+}
+
 // GetForkSchedule - https://ethereum.github.io/beacon-APIs/#/Config/getForkSchedule
 func (c *MultiBeaconClient) GetForkSchedule() (spec *GetForkScheduleResponse, err error) {
 	clients := c.beaconInstancesByLastResponse()

beaconclient/prod_beacon_instance.go

@@ -334,6 +334,15 @@ func (c *ProdBeaconInstance) GetSpec() (spec *GetSpecResponse, err error) {
 	return resp, err
 }
 
+// GetSpecRaw - returns the complete beacon spec configuration as map[string]interface{}
+// This captures all fields returned by the beacon API, not just the limited ones in GetSpecResponse
+func (c *ProdBeaconInstance) GetSpecRaw() (spec map[string]interface{}, err error) {
+	uri := c.beaconURI + "/eth/v1/config/spec"
+	var rawResponse map[string]interface{}
+	_, err = fetchBeacon(http.MethodGet, uri, nil, &rawResponse, nil, http.Header{}, false)
+	return rawResponse, err
+}
+
 type GetForkScheduleResponse struct {
 	Data []struct {
 		PreviousVersion string `json:"previous_version"`

common/test_utils.go

@@ -207,7 +207,7 @@ func CreateTestBlockSubmission(t *testing.T, builderPubkey string, value *uint25
 		}
 	}
 
-	getHeaderResponse, err = BuildGetHeaderResponse(payload, &relaySk, &relayPk, domain)
+	getHeaderResponse, err = BuildGetHeaderResponse(payload, &relaySk, &relayPk, domain, nil)
 	require.NoError(t, err)
 
 	getPayloadResponse, err = BuildGetPayloadResponse(payload)