fix(zetaclient): distinguish between known and connected peers

cmd/zetaclientd/start.go

@@ -22,9 +22,11 @@ import (
 	maddr "github.com/multiformats/go-multiaddr"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 	"gitlab.com/thorchain/tss/go-tss/conversion"
 
+	libp2p_network "github.com/libp2p/go-libp2p/core/network"
 	"github.com/zeta-chain/node/pkg/authz"
 	"github.com/zeta-chain/node/pkg/chains"
 	"github.com/zeta-chain/node/pkg/constant"
@@ -225,9 +227,18 @@ func Start(_ *cobra.Command, _ []string) error {
 	go func() {
 		for {
 			time.Sleep(30 * time.Second)
+			p2pHost := tssServer.GetP2PHost()
+			connectedPeers := lo.Map(p2pHost.Network().Conns(), func(conn libp2p_network.Conn, _ int) peer.AddrInfo {
+				return peer.AddrInfo{
+					ID:    conn.RemotePeer(),
+					Addrs: []maddr.Multiaddr{conn.RemoteMultiaddr()},
+				}
+			})
+			telemetryServer.SetConnectedPeers(connectedPeers)
+			metrics.NumConnectedPeers.Set(float64(len(connectedPeers)))
+
 			ps := tssServer.GetKnownPeers()
-			metrics.NumConnectedPeers.Set(float64(len(ps)))
-			telemetryServer.SetConnectedPeers(ps)
+			telemetryServer.SetKnownPeers(ps)
 		}
 	}()
 	go func() {

zetaclient/metrics/telemetry.go

@@ -31,6 +31,7 @@ type TelemetryServer struct {
 	status                 types.Status
 	ipAddress              string
 	HotKeyBurnRate         *BurnRate
+	knownPeers             []peer.AddrInfo
 	connectedPeers         []peer.AddrInfo
 	rtt                    map[peer.ID]int64
 }
@@ -42,6 +43,7 @@ func NewTelemetryServer() *TelemetryServer {
 		lastScannedBlockNumber: make(map[int64]uint64),
 		lastStartTimestamp:     time.Now(),
 		HotKeyBurnRate:         NewBurnRate(100),
+		knownPeers:             make([]peer.AddrInfo, 0),
 		connectedPeers:         make([]peer.AddrInfo, 0),
 		rtt:                    make(map[peer.ID]int64),
 	}
@@ -67,6 +69,18 @@ func (t *TelemetryServer) GetPingRTT() map[peer.ID]int64 {
 	return t.rtt
 }
 
+func (t *TelemetryServer) SetKnownPeers(peers []peer.AddrInfo) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.knownPeers = peers
+}
+
+func (t *TelemetryServer) GetKnownPeers() []peer.AddrInfo {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	return t.knownPeers
+}
+
 func (t *TelemetryServer) SetConnectedPeers(peers []peer.AddrInfo) {
 	t.mu.Lock()
 	defer t.mu.Unlock()
@@ -175,6 +189,7 @@ func (t *TelemetryServer) Handlers() http.Handler {
 	router.Handle("/ip", http.HandlerFunc(t.ipHandler)).Methods(http.MethodGet)
 	router.Handle("/hotkeyburnrate", http.HandlerFunc(t.hotKeyFeeBurnRate)).Methods(http.MethodGet)
 	router.Handle("/connectedpeers", http.HandlerFunc(t.connectedPeersHandler)).Methods(http.MethodGet)
+	router.Handle("/knownpeers", http.HandlerFunc(t.knownPeersHandler)).Methods(http.MethodGet)
 	router.Handle("/pingrtt", http.HandlerFunc(t.pingRTTHandler)).Methods(http.MethodGet)
 	router.Use(logMiddleware())
 
@@ -283,7 +298,19 @@ func (t *TelemetryServer) connectedPeersHandler(w http.ResponseWriter, _ *http.R
 	peers := t.GetConnectedPeers()
 	data, err := json.Marshal(peers)
 	if err != nil {
-		t.logger.Error().Err(err).Msg("Failed to marshal connected peers")
+		t.logger.Error().Err(err).Msg("Failed to marshal known peers")
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	fmt.Fprintf(w, "%s", string(data))
+}
+
+func (t *TelemetryServer) knownPeersHandler(w http.ResponseWriter, _ *http.Request) {
+	w.WriteHeader(http.StatusOK)
+	peers := t.GetKnownPeers()
+	data, err := json.Marshal(peers)
+	if err != nil {
+		t.logger.Error().Err(err).Msg("Failed to marshal known peers")
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}