use node identity from go-eth2-client

Author: DiogoSantoss

app/eth2wrap/eth2wrap_gen.go

@@ -5,9 +5,6 @@ package eth2wrap
 import (
 	"context"
 	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
 	"net/http"
 	"sync"
 	"testing"
@@ -24,11 +21,6 @@ import (
 	"github.com/obolnetwork/charon/eth2util"
 )
 
-// NodeIdentity represents the identity of a beacon node.
-type NodeIdentity struct {
-	PeerID string `json:"peer_id"`
-}
-
 // NewHTTPAdapterForT returns a http adapter for testing non-eth2service methods as it is nil.
 func NewHTTPAdapterForT(_ *testing.T, address string, headers map[string]string, timeout time.Duration) Client {
 	return newHTTPAdapter(nil, address, headers, timeout)
@@ -206,51 +198,3 @@ func (h *httpAdapter) ClientForAddress(_ string) Client {
 func (h *httpAdapter) Headers() map[string]string {
 	return h.headers
 }
-
-// NodeIdentity fetches the node identity from the beacon node.
-func (h *httpAdapter) NodeIdentity(ctx context.Context) (*NodeIdentity, error) {
-	url := fmt.Sprintf("%s/eth/v1/node/identity", h.address)
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if err != nil {
-		return nil, errors.Wrap(err, "create request")
-	}
-
-	// Add custom headers
-	for k, v := range h.headers {
-		req.Header.Set(k, v)
-	}
-
-	client := &http.Client{
-		Timeout: h.timeout,
-	}
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, errors.Wrap(err, "fetch node identity")
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(resp.Body)
-		return nil, errors.New("node identity request failed",
-			z.Int("status_code", resp.StatusCode),
-			z.Str("body", string(body)),
-		)
-	}
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, errors.Wrap(err, "read response")
-	}
-
-	var result struct {
-		Data NodeIdentity `json:"data"`
-	}
-
-	if err := json.Unmarshal(body, &result); err != nil {
-		return nil, errors.Wrap(err, "unmarshal node identity")
-	}
-
-	return &result.Data, nil
-}

app/eth2wrap/httpwrap.go

@@ -7,8 +7,13 @@ import (
 	"sync"
 	"time"
 
+<<<<<<< HEAD
 	eth2v1 "github.com/attestantio/go-eth2-client/api/v1"
 	eth2p0 "github.com/attestantio/go-eth2-client/spec/phase0"
+=======
+	eth2api "github.com/attestantio/go-eth2-client/api"
+	eth2v1 "github.com/attestantio/go-eth2-client/api/v1"
+>>>>>>> 3130cbf8 (use node identity from go-eth2-client)
 )
 
 //go:generate mockery --name=Client --output=mocks --outpkg=mocks --case=underscore
@@ -243,11 +248,11 @@ func (l *lazy) UpdateCacheIndices(ctx context.Context, idxs []eth2p0.ValidatorIn
 	cl.UpdateCacheIndices(ctx, idxs)
 }
 
-func (l *lazy) NodeIdentity(ctx context.Context) (*NodeIdentity, error) {
+func (l *lazy) NodeIdentity(ctx context.Context, opts *eth2api.NodeIdentityOpts) (*eth2api.Response[*eth2v1.NodeIdentity], error) {
 	cl, err := l.getOrCreateClient(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	return cl.NodeIdentity(ctx)
-}
+	return cl.NodeIdentity(ctx, opts)
+}

app/eth2wrap/lazy.go

@@ -10,6 +10,7 @@ import (
 
 	eth2v1 "github.com/attestantio/go-eth2-client/api/v1"
 	eth2p0 "github.com/attestantio/go-eth2-client/spec/phase0"
+	eth2api "github.com/attestantio/go-eth2-client/api"
 
 	"github.com/obolnetwork/charon/app/errors"
 )
@@ -296,13 +297,13 @@ func (m multi) Proxy(ctx context.Context, req *http.Request) (*http.Response, er
 }
 
 // NodeIdentity returns the identity of the beacon node.
-func (m multi) NodeIdentity(ctx context.Context) (*NodeIdentity, error) {
+func (m multi) NodeIdentity(ctx context.Context, opts *eth2api.NodeIdentityOpts) (*eth2api.Response[*eth2v1.NodeIdentity], error) {
 	const label = "node_identity"
 	defer incRequest(label)
 
 	res0, err := provide(ctx, m.clients, m.fallbacks,
-		func(ctx context.Context, args provideArgs) (*NodeIdentity, error) {
-			return args.client.NodeIdentity(ctx)
+		func(ctx context.Context, args provideArgs) (*eth2api.Response[*eth2v1.NodeIdentity], error) {
+			return args.client.NodeIdentity(ctx, opts)
 		},
 		nil, m.selector,
 	)

app/eth2wrap/mocks/client.go

@@ -287,13 +287,13 @@ func beaconNodeVersionMetric(ctx context.Context, eth2Cl eth2wrap.Client, clock
 	}
 
 	setNodePeerID := func() {
-		identity, err := eth2Cl.NodeIdentity(ctx)
+		response, err := eth2Cl.NodeIdentity(ctx, &eth2api.NodeIdentityOpts{})
 		if err != nil {
 			log.Error(ctx, "Failed to fetch beacon node identity. Check beacon node connectivity and API availability", err)
 			return
 		}
 
-		peerID := identity.PeerID
+		peerID := response.Data.PeerID
 
 		beaconNodePeerIDGauge.Reset()
 		beaconNodePeerIDGauge.WithLabelValues(peerID).Set(1)

app/eth2wrap/multi.go

@@ -287,7 +287,7 @@ require (
 replace github.com/coinbase/kryptology => github.com/ObolNetwork/kryptology v0.1.0
 
 // We're replacing go-eth2-client with a branch off our fork. The branch is kept up to date with the latest attestantio versions.
-replace github.com/attestantio/go-eth2-client => github.com/ObolNetwork/go-eth2-client v0.28.0-obol //nolint
+replace github.com/attestantio/go-eth2-client => github.com/ObolNetwork/go-eth2-client v0.28.0-obol.1 //nolint
 
 tool (
 	github.com/bufbuild/buf/cmd/buf

app/monitoringapi.go

@@ -34,8 +34,8 @@ github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE=
 github.com/DataDog/zstd v1.5.7/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/ObolNetwork/go-eth2-client v0.28.0-obol h1:3lFBuNmaxBI9fLDf+oza1p7VOmsECKaT6sx0EoFeAOk=
-github.com/ObolNetwork/go-eth2-client v0.28.0-obol/go.mod h1:PO9sHFCq+1RiG+Eh3eOR2GYvYV64Qzg7idM3kLgCs5k=
+github.com/ObolNetwork/go-eth2-client v0.28.0-obol.1 h1:72NAvJRe09mKHiKfB30r9nO7JZnV/5bPx5J1qxZ5Yow=
+github.com/ObolNetwork/go-eth2-client v0.28.0-obol.1/go.mod h1:PO9sHFCq+1RiG+Eh3eOR2GYvYV64Qzg7idM3kLgCs5k=
 github.com/ObolNetwork/kryptology v0.1.0 h1:AhoG4My70+xMhEJSpVaJay/t+T/vIUNHQYLjsDJHulI=
 github.com/ObolNetwork/kryptology v0.1.0/go.mod h1:/Wl7Js2f676GyXZDTaojf/O+l0fxFPWudbyjdFhkpSA=
 github.com/OffchainLabs/go-bitfield v0.0.0-20251031151322-f427d04d8506 h1:d/SJkN8/9Ca+1YmuDiUJxAiV4w/a9S8NcsG7GMQSrVI=

go.mod

@@ -509,9 +509,12 @@ func (m Mock) ClientForAddress(_ string) eth2wrap.Client {
 }
 
 // NodeIdentity returns a mock node identity.
-func (m Mock) NodeIdentity(_ context.Context) (*eth2wrap.NodeIdentity, error) {
-	return &eth2wrap.NodeIdentity{
-		PeerID: "16Uiu2HAm1234567890abcdefghijklmnopqrstuvwxyz",
+func (m Mock) NodeIdentity(_ context.Context, _ *eth2api.NodeIdentityOpts) (*eth2api.Response[*eth2v1.NodeIdentity], error) {
+	return &eth2api.Response[*eth2v1.NodeIdentity]{
+		Data: &eth2v1.NodeIdentity{
+			PeerID: "16Uiu2HAm1234567890abcdefghijklmnopqrstuvwxyz",
+		},
+		Metadata: make(map[string]any),
 	}, nil
 }