Refactor/make peer info match geth

src/Nethermind/Nethermind.JsonRpc/Modules/Admin/AdminRpcModule.cs

@@ -46,7 +46,6 @@ public AdminRpcModule(
         _staticNodesManager = staticNodesManager ?? throw new ArgumentNullException(nameof(staticNodesManager));
         _pruningTrigger = pruningTrigger;
         _parameters = parameters ?? throw new ArgumentNullException(nameof(parameters));
-
         BuildNodeInfo();
     }
 
@@ -121,6 +120,7 @@ public ResultWrapper<PeerInfo[]> admin_peers(bool includeDetails = false)
 
     public ResultWrapper<NodeInfo> admin_nodeInfo()
     {
+        // why the repetition? already called at contructor!
         UpdateEthProtocolInfo();
         return ResultWrapper<NodeInfo>.Success(_nodeInfo);
     }

src/Nethermind/Nethermind.JsonRpc/Modules/Admin/PeerInfo.cs

@@ -2,25 +2,35 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Net;
+using System.Text.Json.Serialization;
 using Nethermind.Network;
 using Nethermind.Stats.Model;
 
 namespace Nethermind.JsonRpc.Modules.Admin
 {
     public class PeerInfo
     {
-        public string Name { get; set; }
-        public string Id { get; }
-        public string Host { get; set; }
-        public int Port { get; set; }
-        public string Address { get; set; }
-        public bool IsBootnode { get; set; }
-        public bool IsTrusted { get; set; }
-        public bool IsStatic { get; set; }
+        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+        public string? Enr { get; set; }
         public string Enode { get; set; }
+        public string Id { get; }
+        public string Name { get; set; }
 
+        // a list of all protocols supported in their canonical names
+        // // e.g snap as snap/1, protocol_name/version_no
+        public string[] Caps { get; set; }
+
+        public NetworkInfo Network { get; set; }
+        public Dictionary<string, string[]> Protocols { get; set; } = new();// set of protocols supported by the peer
+        // it's a map of protocol_name to partial info on protocol some info like version ONLY.
+        // ProtocolInfo [or Protocol] with sub-classes Eth, Snap etc...or just
+
+
+        // keep extra info not availibale in get?
+        public bool IsBootnode { get; set; }
         public string ClientType { get; set; }
         public string EthDetails { get; set; }
         public string LastSignal { get; set; }
@@ -39,19 +49,35 @@ public PeerInfo(Peer peer, bool includeDetails)
 
             Name = peer.Node.ClientId;
             Id = peer.Node.Id.Hash.ToString(false);
-            Host = peer.Node.Host is null ? null : IPAddress.Parse(peer.Node.Host).MapToIPv4().ToString();
-            Port = peer.Node.Port;
-            Address = peer.Node.Address.ToString();
-            IsBootnode = peer.Node.IsBootnode;
-            IsStatic = peer.Node.IsStatic;
+            // Caps = peer.Protocols.Select(p => p.name).ToArray() // how it should be
+
+
             Enode = peer.Node.ToString(Node.Format.ENode);
+            Network = new()
+            {
+                Inbound = peer.InSession is not null,
+                RemoteAddress = peer.Node.Address.ToString(),
+                Static = peer.Node.IsStatic
+
+            };
+            IsBootnode = peer.Node.IsBootnode;
 
             if (includeDetails)
             {
                 ClientType = peer.Node.ClientType.ToString();
                 EthDetails = peer.Node.EthDetails;
-                LastSignal = (peer.InSession ?? peer.OutSession)?.LastPingUtc.ToString(CultureInfo.InvariantCulture);
+                LastSignal = (peer.InSession ?? peer.OutSession!).LastPingUtc.ToString(CultureInfo.InvariantCulture);
+
             }
         }
     }
+
+    public class NetworkInfo
+    {
+        public string LocalAddress { get; set; }
+        public string RemoteAddress { get; set; }
+        public bool Inbound { get; set; }
+        public bool Trusted { get; set; }
+        public bool Static { get; set; }
+    }
 }