print peer node version for -peer-info

node/main.go

@@ -693,11 +693,11 @@ func printPeerInfo(logger *zap.Logger, cfg *config.Config) {
 		}
 
 		if len(p.Version) >= 3 {
-			fmt.Println("  Version:", config.FormatVersion(p.Version))
-		}
-
-		if patch := formatPatchVersion(p.PatchVersion); patch != "" {
-			fmt.Println("  Patch Version:", patch)
+			if patch := formatPatchVersion(p.PatchVersion); patch != "" {
+				fmt.Println("  Version:", config.FormatVersion(p.Version)+"."+patch)
+			} else {
+				fmt.Println("  Version:", config.FormatVersion(p.Version))
+			}
 		}
 
 		if p.Timestamp != 0 {

node/p2p/peer_info_manager.go

@@ -65,6 +65,8 @@ func (m *InMemoryPeerInfoManager) Start(
 				Reachability: reachability,
 				Cores:        uint32(len(reachability)),
 				LastSeen:     seen,
+				Version:      info.Version,
+				PatchNumber:  info.PatchVersion,
 			}
 			m.searchAndInsertPeer(&p2p.PeerInfo{
 				PeerId:       info.PeerId,
@@ -73,6 +75,8 @@ func (m *InMemoryPeerInfoManager) Start(
 				Reachability: reachability,
 				Cores:        uint32(len(reachability)),
 				LastSeen:     seen,
+				Version:      info.Version,
+				PatchNumber:  info.PatchVersion,
 			})
 			m.peerInfoMx.Unlock()
 		case <-ctx.Done():

node/rpc/node_rpc_server.go

@@ -164,6 +164,8 @@ func (r *RPCServer) GetPeerInfo(
 			Reachability: re,
 			Timestamp:    pi.LastSeen,
 			Capabilities: cs,
+			Version:      pi.Version,
+			PatchVersion: pi.PatchNumber,
 		})
 	}
 

types/p2p/peer_info_manager.go

@@ -31,4 +31,6 @@ type PeerInfo struct {
 	Reachability []Reachability
 	Bandwidth    uint64
 	LastSeen     int64
+	Version      []byte
+	PatchNumber  []byte
 }