chore: add client version in metrics

anchor/network/src/lib.rs

@@ -15,3 +15,4 @@ pub use config::{Config, DEFAULT_DISC_PORT, DEFAULT_QUIC_PORT, DEFAULT_TCP_PORT}
 pub use network::Network;
 pub use network_utils::listen_addr::{ListenAddr, ListenAddress};
 pub type Enr = discv5::enr::Enr<discv5::enr::CombinedKey>;
+pub use peer_manager::types::{ClientType, PeerInfo};

anchor/network/src/metrics.rs

@@ -5,3 +5,11 @@ use metrics::*;
 pub static PEERS_CONNECTED: LazyLock<Result<IntGauge>> = LazyLock::new(|| {
     try_create_int_gauge("libp2p_peers", "Count of libp2p peers currently connected")
 });
+
+pub static PEERS_BY_CLIENT: LazyLock<Result<IntGaugeVec>> = LazyLock::new(|| {
+    try_create_int_gauge_vec(
+        "libp2p_peers_by_client",
+        "Count of connected peers by client type (anchor, go-ssv, unknown)",
+        &["client_type"],
+    )
+});

anchor/network/src/network.rs

@@ -31,15 +31,16 @@ use types::{ChainSpec, EthSpec};
 use version::version_with_platform;
 
 use crate::{
-    Config, Enr,
+    ClientType, Config, Enr, PeerInfo,
     behaviour::{AnchorBehaviour, AnchorBehaviourEvent, BehaviourError},
     discovery::{DiscoveredPeers, Discovery, DiscoveryError},
-    handshake,
-    handshake::node_info::{NodeInfo, NodeMetadata},
+    handshake::{
+        self,
+        node_info::{NodeInfo, NodeMetadata},
+    },
     keypair_utils::load_private_key,
     network::NetworkError::SwarmConfig,
-    peer_manager,
-    peer_manager::{ConnectActions, PeerManager},
+    peer_manager::{self, ConnectActions, PeerManager},
     scoring::topic_score_config::topic_score_params_for_subnet_with_rate,
     transport::build_transport,
 };
@@ -512,7 +513,40 @@ impl<R: MessageReceiver> Network<R> {
                 their_info,
             }) => {
                 debug!(%peer_id, ?their_info, "Handshake completed");
-                // Update peer store with their_info
+
+                let store_ref = self
+                    .swarm
+                    .behaviour_mut()
+                    .peer_manager
+                    .peer_store
+                    .store_mut();
+
+                if let Some(metadata) = their_info.metadata {
+                    let client_type = ClientType::from(metadata.node_version);
+
+                    let peer_info_opt = store_ref.get_custom_data_mut(&peer_id);
+
+                    if let Some(peer_info) = peer_info_opt {
+                        // Update the client type
+                        peer_info.set_client_type(client_type);
+                    } else {
+                        // If no peer info yet, create new peer info
+                        store_ref.insert_custom_data(
+                            &peer_id,
+                            PeerInfo {
+                                enr: None,
+                                client_type: Some(client_type),
+                            },
+                        )
+                    }
+                    // Trigger metric recalculation
+                    let behaviour = self.swarm.behaviour();
+                    let store_ref = behaviour.peer_manager.peer_store.store();
+                    behaviour
+                        .peer_manager
+                        .connection_manager
+                        .update_metrics_if_changed(true, store_ref);
+                }
             }
             Err(handshake::Failed { peer_id, error }) => {
                 debug!(%peer_id, ?error, "Handshake failed");

anchor/network/src/peer_manager/connection.rs

@@ -15,7 +15,7 @@ use ssz_types::{Bitfield, length::Fixed, typenum::U128};
 use subnet_service::SubnetId;
 use thiserror::Error;
 
-use crate::{Config, Enr, discovery, metrics::PEERS_CONNECTED};
+use crate::{ClientType, Config, PeerInfo, discovery, metrics::PEERS_CONNECTED};
 
 /// A fraction of `target_peers` that we allow to connect to us in excess of
 /// `target_peers`. For clarity, if `target_peers` is 50 and
@@ -106,7 +106,7 @@ impl ConnectionManager {
     pub fn should_dial_peer(
         &self,
         peer_id: &PeerId,
-        peer_store: &MemoryStore<Enr>,
+        peer_store: &MemoryStore<PeerInfo>,
         needed_subnets: &HashSet<SubnetId>,
         blocked_peers: &HashSet<PeerId>,
     ) -> bool {
@@ -125,7 +125,7 @@ impl ConnectionManager {
     pub fn qualifies_for_priority_connection(
         &self,
         peer_id: &PeerId,
-        peer_store: &MemoryStore<Enr>,
+        peer_store: &MemoryStore<PeerInfo>,
         needed_subnets: &HashSet<SubnetId>,
     ) -> bool {
         let Some(subnets) = self.get_peer_subnets_with_enr_fallback(peer_id, peer_store) else {
@@ -194,7 +194,7 @@ impl ConnectionManager {
     pub fn peer_offers_needed_subnets_with_enr_fallback(
         &self,
         peer: &PeerId,
-        peer_store: &MemoryStore<Enr>,
+        peer_store: &MemoryStore<PeerInfo>,
         needed: &HashSet<SubnetId>,
     ) -> bool {
         if needed.is_empty() {
@@ -232,12 +232,15 @@ impl ConnectionManager {
     fn get_peer_subnets_with_enr_fallback(
         &self,
         peer: &PeerId,
-        peer_store: &MemoryStore<Enr>,
+        peer_store: &MemoryStore<PeerInfo>,
     ) -> Option<Bitfield<Fixed<U128>>> {
         self.get_peer_subnets_observed_only(peer).or_else(|| {
             // Fallback to ENR
-            let enr = peer_store.get_custom_data(peer)?;
-            discovery::committee_bitfield(enr).ok()
+            peer_store
+                .get_custom_data(peer)?
+                .enr
+                .as_ref()
+                .and_then(|enr| discovery::committee_bitfield(enr).ok())
         })
     }
 
@@ -257,12 +260,37 @@ impl ConnectionManager {
     }
 
     /// Update metrics if connection state changed
-    pub fn update_metrics_if_changed(&self, changed: bool) {
+    pub fn update_metrics_if_changed(&self, changed: bool, peer_store: &MemoryStore<PeerInfo>) {
         if changed {
             metrics::set_gauge(
                 &PEERS_CONNECTED,
                 self.connected.len().try_into().unwrap_or(0),
             );
+
+            let mut anchor_count = 0;
+            let mut go_ssv_count = 0;
+            let mut unknown_count = 0;
+
+            // Count all connected peers by client type
+            for peer_id in self.connected.iter() {
+                if let Some(data) = peer_store.get_custom_data(peer_id) {
+                    match data.client_type {
+                        Some(ClientType::Anchor) => anchor_count += 1,
+                        Some(ClientType::GoSSV) => go_ssv_count += 1,
+                        None => unknown_count += 1,
+                    }
+                } else {
+                    unknown_count += 1;
+                }
+            }
+
+            metrics::set_gauge_vec(&crate::metrics::PEERS_BY_CLIENT, &["anchor"], anchor_count);
+            metrics::set_gauge_vec(&crate::metrics::PEERS_BY_CLIENT, &["go-ssv"], go_ssv_count);
+            metrics::set_gauge_vec(
+                &crate::metrics::PEERS_BY_CLIENT,
+                &["unknown"],
+                unknown_count,
+            );
         }
     }
 
@@ -285,7 +313,7 @@ impl ConnectionManager {
         &self,
         limit_result: Result<(), ConnectionDenied>,
         peer: PeerId,
-        peer_store: &MemoryStore<Enr>,
+        peer_store: &MemoryStore<PeerInfo>,
         needed_subnets: &HashSet<SubnetId>,
     ) -> Result<(), ConnectionDenied> {
         match limit_result {
@@ -325,7 +353,7 @@ impl ConnectionManager {
         peer: PeerId,
         local_addr: &Multiaddr,
         remote_addr: &Multiaddr,
-        peer_store: &MemoryStore<Enr>,
+        peer_store: &MemoryStore<PeerInfo>,
         needed_subnets: &HashSet<SubnetId>,
     ) -> Result<(), ConnectionDenied> {
         let limit_result = self
@@ -361,7 +389,7 @@ impl ConnectionManager {
         addr: &Multiaddr,
         role_override: Endpoint,
         port_use: PortUse,
-        peer_store: &MemoryStore<Enr>,
+        peer_store: &MemoryStore<PeerInfo>,
         needed_subnets: &HashSet<SubnetId>,
     ) -> Result<(), ConnectionDenied> {
         let limit_result = self

anchor/network/src/peer_manager/discovery.rs

@@ -18,7 +18,7 @@ use subnet_service::SubnetId;
 use tracing::debug;
 
 use super::{connection::ConnectionManager, types::ConnectActions};
-use crate::{Enr, discovery};
+use crate::{Enr, PeerInfo, discovery};
 
 /// Number of times we overdial when we need peers for a subnet
 const PEER_OVERDIAL_FACTOR: usize = 2;
@@ -33,7 +33,7 @@ impl PeerDiscovery {
     /// Process a discovered peer and return dial options if we should connect
     pub fn process_discovered_peer(
         enr: Enr,
-        peer_store: &mut MemoryStore<Enr>,
+        peer_store: &mut MemoryStore<PeerInfo>,
         connection_manager: &ConnectionManager,
         needed_subnets: &HashSet<SubnetId>,
         blocked_peers: &HashSet<PeerId>,
@@ -49,7 +49,18 @@ impl PeerDiscovery {
                 addr: multiaddr,
             }));
         }
-        peer_store.insert_custom_data(&id, enr.clone());
+
+        if let Some(potential) = peer_store.get_custom_data_mut(&id) {
+            potential.set_enr(enr);
+        } else {
+            peer_store.insert_custom_data(
+                &id,
+                PeerInfo {
+                    enr: Some(enr),
+                    client_type: None,
+                },
+            )
+        }
 
         // Check if we should dial this peer
         let should_dial =
@@ -66,7 +77,7 @@ impl PeerDiscovery {
     pub fn track_subnet_peers(
         subnet_id: SubnetId,
         needed_subnets: &mut HashSet<SubnetId>,
-        peer_store: &MemoryStore<Enr>,
+        peer_store: &MemoryStore<PeerInfo>,
         connection_manager: &ConnectionManager,
         blocked_peers: &HashSet<PeerId>,
     ) -> ConnectActions {
@@ -83,7 +94,7 @@ impl PeerDiscovery {
     /// Determine what actions to take for the given subnets
     pub fn determine_actions_for_subnets(
         subnets: &[SubnetId],
-        peer_store: &MemoryStore<Enr>,
+        peer_store: &MemoryStore<PeerInfo>,
         connection_manager: &ConnectionManager,
         blocked_peers: &HashSet<PeerId>,
     ) -> ConnectActions {
@@ -104,11 +115,15 @@ impl PeerDiscovery {
                 continue;
             }
 
-            let Some(enr) = record.get_custom_data() else {
+            let Some(peer_info) = record.get_custom_data() else {
                 continue;
             };
 
-            let subnets = discovery::committee_bitfield(enr).unwrap_or_default();
+            let subnets = peer_info
+                .enr
+                .as_ref()
+                .and_then(|enr| discovery::committee_bitfield(enr).ok())
+                .unwrap_or_default();
 
             let mut relevant = false;
             for subnet in subnets
@@ -140,7 +155,7 @@ impl PeerDiscovery {
     /// Check if any subnets need more peers and return dial/discovery actions
     pub fn check_subnet_peers(
         needed_subnets: &HashSet<SubnetId>,
-        peer_store: &MemoryStore<Enr>,
+        peer_store: &MemoryStore<PeerInfo>,
         connection_manager: &ConnectionManager,
         blocked_peers: &HashSet<PeerId>,
     ) -> Option<ConnectActions> {
@@ -160,9 +175,9 @@ impl PeerDiscovery {
 
     /// Get candidate peers that we could potentially dial
     fn candidate_peers<'a>(
-        peer_store: &'a MemoryStore<Enr>,
+        peer_store: &'a MemoryStore<PeerInfo>,
         connected: &HashSet<PeerId>,
-    ) -> Vec<(&'a PeerId, &'a PeerRecord<Enr>)> {
+    ) -> Vec<(&'a PeerId, &'a PeerRecord<PeerInfo>)> {
         let mut peers = peer_store
             .record_iter()
             .filter(|(peer, record)| {
@@ -174,7 +189,7 @@ impl PeerDiscovery {
     }
 
     /// Convert a peer ID to dial options
-    fn peer_to_dial_opts(peer: &PeerId, peer_store: &MemoryStore<Enr>) -> DialOpts {
+    fn peer_to_dial_opts(peer: &PeerId, peer_store: &MemoryStore<PeerInfo>) -> DialOpts {
         let addresses = peer_store
             .addresses_of_peer(peer)
             .into_iter()

anchor/network/src/peer_manager/mod.rs

@@ -18,7 +18,7 @@ use peer_store::memory_store::{self, MemoryStore};
 use subnet_service::SubnetId;
 use tracing::info;
 
-use crate::{Config, Enr};
+use crate::{Config, Enr, peer_manager::types::PeerInfo};
 
 pub mod blocking;
 pub mod connection;
@@ -34,8 +34,8 @@ pub use types::{ConnectActions, Event};
 
 /// Main peer manager that coordinates all peer management functionality
 pub struct PeerManager {
-    peer_store: peer_store::Behaviour<MemoryStore<Enr>>,
-    connection_manager: ConnectionManager,
+    pub peer_store: peer_store::Behaviour<MemoryStore<PeerInfo>>,
+    pub connection_manager: ConnectionManager,
     heartbeat_manager: HeartbeatManager,
     blocking_manager: BlockingManager,
     needed_subnets: HashSet<SubnetId>,
@@ -304,7 +304,7 @@ impl NetworkBehaviour for PeerManager {
 
         // Update metrics if connection state changed
         self.connection_manager
-            .update_metrics_if_changed(changed_connected);
+            .update_metrics_if_changed(changed_connected, self.peer_store.store());
 
         // Delegate to sub-components
         self.blocking_manager.on_swarm_event(event);

anchor/network/src/peer_manager/types.rs

@@ -1,6 +1,8 @@
 use libp2p::swarm::dial_opts::DialOpts;
 use subnet_service::SubnetId;
 
+use crate::Enr;
+
 /// Actions that the peer manager can request from the network
 #[derive(Debug)]
 pub struct ConnectActions {
@@ -27,3 +29,36 @@ pub enum Event {
     PeerStore(peer_store::memory_store::Event),
     Heartbeat(crate::peer_manager::heartbeat::Event),
 }
+
+/// Different types of clients
+#[derive(Debug, Clone, Copy)]
+pub enum ClientType {
+    Anchor,
+    GoSSV,
+}
+
+// Not sure how to get ClientType properly from Handshake data
+impl From<String> for ClientType {
+    fn from(value: String) -> Self {
+        if value.starts_with("Anchor/") {
+            Self::Anchor
+        } else {
+            Self::GoSSV
+        }
+    }
+}
+#[derive(Clone)]
+pub struct PeerInfo {
+    pub enr: Option<Enr>,
+    pub client_type: Option<ClientType>,
+}
+
+impl PeerInfo {
+    pub fn set_enr(&mut self, enr: Enr) {
+        self.enr = Some(enr)
+    }
+
+    pub fn set_client_type(&mut self, client_type: ClientType) {
+        self.client_type = Some(client_type)
+    }
+}