feat: Add light_client routes

pkg/beacon/api/api.go

@@ -4,12 +4,15 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
+	"strings"
 
 	"github.com/ethpandaops/beacon/pkg/beacon/api/types"
+	"github.com/ethpandaops/beacon/pkg/beacon/api/types/lightclient"
 	"github.com/sirupsen/logrus"
 )
 
@@ -22,6 +25,10 @@ type ConsensusClient interface {
 	RawDebugBeaconState(ctx context.Context, stateID string, contentType string) ([]byte, error)
 	DepositSnapshot(ctx context.Context) (*types.DepositSnapshot, error)
 	NodeIdentity(ctx context.Context) (*types.Identity, error)
+	LightClientBootstrap(ctx context.Context, blockRoot string) (*LightClientBootstrapResponse, error)
+	LightClientUpdates(ctx context.Context, startPeriod, count int) (*LightClientUpdatesResponse, error)
+	LightClientFinalityUpdate(ctx context.Context) (*LightClientFinalityUpdateResponse, error)
+	LightClientOptimisticUpdate(ctx context.Context) (*LightClientOptimisticUpdateResponse, error)
 }
 
 type consensusClient struct {
@@ -41,12 +48,15 @@ func NewConsensusClient(ctx context.Context, log logrus.FieldLogger, url string,
 	}
 }
 
-type apiResponse struct {
-	Data json.RawMessage `json:"data"`
+type BeaconAPIResponse struct {
+	Data    json.RawMessage `json:"data"`
+	Version string          `json:"version"`
 }
 
+type BeaconAPIResponses[T any] []BeaconAPIResponse
+
 //nolint:unused // this is used in the future
-func (c *consensusClient) post(ctx context.Context, path string, body map[string]interface{}) (json.RawMessage, error) {
+func (c *consensusClient) post(ctx context.Context, path string, body map[string]interface{}) (*BeaconAPIResponse, error) {
 	jsonData, err := json.Marshal(body)
 	if err != nil {
 		return nil, err
@@ -78,54 +88,68 @@ func (c *consensusClient) post(ctx context.Context, path string, body map[string
 		return nil, err
 	}
 
-	resp := new(apiResponse)
+	resp := new(BeaconAPIResponse)
 	if err := json.Unmarshal(data, resp); err != nil {
 		return nil, err
 	}
 
-	return resp.Data, nil
+	return resp, nil
 }
 
 //nolint:unparam // ctx will probably be used in the future
-func (c *consensusClient) get(ctx context.Context, path string) (json.RawMessage, error) {
+func (c *consensusClient) get(ctx context.Context, path string, contentType string, rspType any) error {
+	if contentType == "" {
+		contentType = "application/json"
+	}
+
 	req, err := http.NewRequestWithContext(ctx, "GET", c.url+path, nil)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
+	req.Header.Set("Accept", contentType)
+
 	// Set headers from c.headers
 	for k, v := range c.headers {
 		req.Header.Set(k, v)
 	}
 
 	rsp, err := c.client.Do(req)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	defer rsp.Body.Close()
 
 	if rsp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("status code: %d", rsp.StatusCode)
+		return fmt.Errorf("status code: %d", rsp.StatusCode)
+	}
+
+	// Parse the content type header to handle parameters like charset
+	contentTypeHeader := rsp.Header.Get("Content-Type")
+	if contentTypeHeader != "" {
+		if !strings.Contains(contentTypeHeader, contentType) {
+			return fmt.Errorf("unexpected content type: wanted (%s): got (%s)", contentType, contentTypeHeader)
+		}
 	}
 
 	data, err := io.ReadAll(rsp.Body)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	resp := new(apiResponse)
-	if err := json.Unmarshal(data, resp); err != nil {
-		return nil, err
+	if err := json.Unmarshal(data, rspType); err != nil {
+		return err
 	}
 
-	return resp.Data, nil
+	return nil
 }
 
 func (c *consensusClient) getRaw(ctx context.Context, path string, contentType string) ([]byte, error) {
 	if contentType == "" {
 		contentType = "application/json"
 	}
+
 	u, err := url.Parse(c.url + path)
 	if err != nil {
 		return nil, err
@@ -159,13 +183,13 @@ func (c *consensusClient) getRaw(ctx context.Context, path string, contentType s
 
 // NodePeers returns the list of peers connected to the node.
 func (c *consensusClient) NodePeers(ctx context.Context) (types.Peers, error) {
-	data, err := c.get(ctx, "/eth/v1/node/peers")
-	if err != nil {
+	data := new(BeaconAPIResponse)
+	if err := c.get(ctx, "/eth/v1/node/peers", ContentTypeJSON, data); err != nil {
 		return nil, err
 	}
 
 	rsp := types.Peers{}
-	if err := json.Unmarshal(data, &rsp); err != nil {
+	if err := json.Unmarshal(data.Data, &rsp); err != nil {
 		return nil, err
 	}
 
@@ -174,13 +198,13 @@ func (c *consensusClient) NodePeers(ctx context.Context) (types.Peers, error) {
 
 // NodePeer returns the peer with the given peer ID.
 func (c *consensusClient) NodePeer(ctx context.Context, peerID string) (types.Peer, error) {
-	data, err := c.get(ctx, fmt.Sprintf("/eth/v1/node/peers/%s", peerID))
-	if err != nil {
+	data := new(BeaconAPIResponse)
+	if err := c.get(ctx, fmt.Sprintf("/eth/v1/node/peers/%s", peerID), ContentTypeJSON, data); err != nil {
 		return types.Peer{}, err
 	}
 
 	rsp := types.Peer{}
-	if err := json.Unmarshal(data, &rsp); err != nil {
+	if err := json.Unmarshal(data.Data, &rsp); err != nil {
 		return types.Peer{}, err
 	}
 
@@ -189,13 +213,13 @@ func (c *consensusClient) NodePeer(ctx context.Context, peerID string) (types.Pe
 
 // NodePeerCount returns the number of peers connected to the node.
 func (c *consensusClient) NodePeerCount(ctx context.Context) (types.PeerCount, error) {
-	data, err := c.get(ctx, "/eth/v1/node/peer_count")
-	if err != nil {
+	data := new(BeaconAPIResponse)
+	if err := c.get(ctx, "/eth/v1/node/peer_count", ContentTypeJSON, data); err != nil {
 		return types.PeerCount{}, err
 	}
 
 	rsp := types.PeerCount{}
-	if err := json.Unmarshal(data, &rsp); err != nil {
+	if err := json.Unmarshal(data.Data, &rsp); err != nil {
 		return types.PeerCount{}, err
 	}
 
@@ -224,27 +248,126 @@ func (c *consensusClient) RawBlock(ctx context.Context, stateID string, contentT
 
 // DepositSnapshot returns the deposit snapshot in the requested format.
 func (c *consensusClient) DepositSnapshot(ctx context.Context) (*types.DepositSnapshot, error) {
-	data, err := c.get(ctx, "/eth/v1/beacon/deposit_snapshot")
-	if err != nil {
+	data := new(BeaconAPIResponse)
+	if err := c.get(ctx, "/eth/v1/beacon/deposit_snapshot", ContentTypeJSON, data); err != nil {
 		return nil, err
 	}
 
 	rsp := types.DepositSnapshot{}
-	if err := json.Unmarshal(data, &rsp); err != nil {
+	if err := json.Unmarshal(data.Data, &rsp); err != nil {
 		return nil, err
 	}
 
 	return &rsp, nil
 }
 
 func (c *consensusClient) NodeIdentity(ctx context.Context) (*types.Identity, error) {
-	data, err := c.get(ctx, "/eth/v1/node/identity")
-	if err != nil {
+	data := new(BeaconAPIResponse)
+	if err := c.get(ctx, "/eth/v1/node/identity", ContentTypeJSON, data); err != nil {
 		return nil, err
 	}
 
 	rsp := types.Identity{}
-	if err := json.Unmarshal(data, &rsp); err != nil {
+	if err := json.Unmarshal(data.Data, &rsp); err != nil {
+		return nil, err
+	}
+
+	return &rsp, nil
+}
+
+func (c *consensusClient) LightClientBootstrap(ctx context.Context, blockRoot string) (*LightClientBootstrapResponse, error) {
+	data := new(BeaconAPIResponse)
+	if err := c.get(ctx, fmt.Sprintf("/eth/v1/beacon/light_client/bootstrap/%s", blockRoot), ContentTypeJSON, data); err != nil {
+		return nil, err
+	}
+
+	rsp := LightClientBootstrapResponse{
+		Response: Response[*lightclient.Bootstrap]{
+			Data: &lightclient.Bootstrap{},
+			Metadata: map[string]any{
+				"version": data.Version,
+			},
+		},
+	}
+	if err := json.Unmarshal(data.Data, &rsp.Response.Data); err != nil {
+		return nil, err
+	}
+
+	return &rsp, nil
+}
+
+func (c *consensusClient) LightClientUpdates(ctx context.Context, startPeriod, count int) (*LightClientUpdatesResponse, error) {
+	if count == 0 {
+		return nil, errors.New("count must be greater than 0")
+	}
+
+	params := url.Values{}
+	params.Add("start_period", fmt.Sprintf("%d", startPeriod))
+	params.Add("count", fmt.Sprintf("%d", count))
+
+	data := new(BeaconAPIResponses[*lightclient.Updates])
+	if err := c.get(ctx, "/eth/v1/beacon/light_client/updates?"+params.Encode(), ContentTypeJSON, data); err != nil {
+		return nil, err
+	}
+
+	rsp := LightClientUpdatesResponse{
+		Response: Response[*lightclient.Updates]{
+			Data:     &lightclient.Updates{},
+			Metadata: map[string]any{},
+		},
+	}
+
+	updates := make(lightclient.Updates, 0)
+	for _, resp := range *data {
+		update := lightclient.Update{}
+		if err := json.Unmarshal(resp.Data, &update); err != nil {
+			return nil, err
+		}
+
+		updates = append(updates, &update)
+	}
+
+	rsp.Response.Data = &updates
+
+	return &rsp, nil
+}
+
+func (c *consensusClient) LightClientFinalityUpdate(ctx context.Context) (*LightClientFinalityUpdateResponse, error) {
+	data := new(BeaconAPIResponse)
+	if err := c.get(ctx, "/eth/v1/beacon/light_client/finality_update", ContentTypeJSON, data); err != nil {
+		return nil, err
+	}
+
+	rsp := LightClientFinalityUpdateResponse{
+		Response: Response[*lightclient.FinalityUpdate]{
+			Data: &lightclient.FinalityUpdate{},
+			Metadata: map[string]any{
+				"version": data.Version,
+			},
+		},
+	}
+	if err := json.Unmarshal(data.Data, &rsp.Data); err != nil {
+		return nil, err
+	}
+
+	return &rsp, nil
+}
+
+func (c *consensusClient) LightClientOptimisticUpdate(ctx context.Context) (*LightClientOptimisticUpdateResponse, error) {
+	data := new(BeaconAPIResponse)
+	if err := c.get(ctx, "/eth/v1/beacon/light_client/optimistic_update", ContentTypeJSON, data); err != nil {
+		return nil, err
+	}
+
+	rsp := LightClientOptimisticUpdateResponse{
+		Response: Response[*lightclient.OptimisticUpdate]{
+			Data: &lightclient.OptimisticUpdate{},
+			Metadata: map[string]any{
+				"version": data.Version,
+			},
+		},
+	}
+	if err := json.Unmarshal(data.Data, &rsp.Data); err != nil {
 		return nil, err
 	}
 

pkg/beacon/api/content_type.go

@@ -0,0 +1,6 @@
+package api
+
+const (
+	ContentTypeJSON = "application/json"
+	ContentTypeSSZ  = "application/octet-stream"
+)

pkg/beacon/api/responses.go

@@ -0,0 +1,24 @@
+package api
+
+import "github.com/ethpandaops/beacon/pkg/beacon/api/types/lightclient"
+
+type Response[T any] struct {
+	Data     T              `json:"data"`
+	Metadata map[string]any `json:"metadata"`
+}
+
+type LightClientUpdatesResponse struct {
+	Response[*lightclient.Updates]
+}
+
+type LightClientBootstrapResponse struct {
+	Response[*lightclient.Bootstrap]
+}
+
+type LightClientFinalityUpdateResponse struct {
+	Response[*lightclient.FinalityUpdate]
+}
+
+type LightClientOptimisticUpdateResponse struct {
+	Response[*lightclient.OptimisticUpdate]
+}

pkg/beacon/api/types/agents.go

@@ -20,6 +20,8 @@ const (
 	AgentPrysm Agent = "prysm"
 	// AgentLodestar is a Lodestar agent.
 	AgentLodestar Agent = "lodestar"
+	// AgentGrandine is a Grandine agent.
+	AgentGrandine Agent = "grandine"
 )
 
 // AllAgents is a list of all agents.
@@ -30,6 +32,7 @@ var AllAgents = []Agent{
 	AgentTeku,
 	AgentPrysm,
 	AgentLodestar,
+	AgentGrandine,
 }
 
 // AgentCount represents the number of peers with each agent.
@@ -40,6 +43,7 @@ type AgentCount struct {
 	Teku       int `json:"teku"`
 	Prysm      int `json:"prysm"`
 	Lodestar   int `json:"lodestar"`
+	Grandine   int `json:"grandine"`
 }
 
 // AgentFromString returns the agent from the given string.
@@ -66,5 +70,9 @@ func AgentFromString(agent string) Agent {
 		return AgentLodestar
 	}
 
+	if strings.Contains(asLower, "grandine") {
+		return AgentGrandine
+	}
+
 	return AgentUnknown
 }