Merge pull request #445 from ethpandaops/bbusa/api-enr

feat: add decoded enr info to consensus api

Author: barnabasbusa

docs/swagger.json

@@ -443,6 +443,10 @@
                 "enr": {
                     "type": "string"
                 },
+                "enr_decoded": {
+                    "type": "object",
+                    "additionalProperties": true
+                },
                 "head_root": {
                     "type": "string"
                 },

docs/swagger.yaml

@@ -12,6 +12,9 @@ definitions:
         type: array
       enr:
         type: string
+      enr_decoded:
+        additionalProperties: true
+        type: object
       head_root:
         type: string
       head_slot:

handlers/api/api_clients_cl.go

@@ -19,6 +19,7 @@ type APIConsensusClientNodeInfo struct {
 	PeerID             string                      `json:"peer_id"`
 	NodeID             string                      `json:"node_id"`
 	ENR                string                      `json:"enr"`
+	ENRDecoded         map[string]interface{}      `json:"enr_decoded,omitempty"`
 	HeadSlot           uint64                      `json:"head_slot"`
 	HeadRoot           string                      `json:"head_root"`
 	Status             string                      `json:"status"`
@@ -138,10 +139,19 @@ func getConsensusClientNodeInfo() ([]APIConsensusClientNodeInfo, error) {
 			if utils.Config.Frontend.ShowSensitivePeerInfos {
 				clientInfo.PeerID = nodeIdentity.PeerID
 				clientInfo.ENR = nodeIdentity.Enr
-				// Note: NodeID not available in the interface, using PeerID as fallback
 				clientInfo.NodeID = nodeIdentity.PeerID
 			}
 
+			if nodeIdentity.Enr != "" {
+				if enrRecord, err := utils.DecodeENR(nodeIdentity.Enr); err == nil {
+					if utils.Config.Frontend.ShowSensitivePeerInfos {
+						clientInfo.ENRDecoded = utils.GetKeyValuesFromENR(enrRecord)
+					} else {
+						clientInfo.ENRDecoded = utils.GetKeyValuesFromENRFiltered(enrRecord)
+					}
+				}
+			}
+
 			// Add metadata information (available regardless of sensitive info setting)
 			if nodeIdentity.Metadata.Attnets != "" || nodeIdentity.Metadata.Syncnets != "" || nodeIdentity.Metadata.SeqNumber != nil || nodeIdentity.Metadata.CustodyGroupCount != nil {
 				seqNumber := ""

utils/enr.go

@@ -32,18 +32,33 @@ func DecodeENR(raw string) (*enr.Record, error) {
 }
 
 func GetKeyValuesFromENR(r *enr.Record) map[string]interface{} {
+	return getKeyValuesFromENR(r, false)
+}
+
+func GetKeyValuesFromENRFiltered(r *enr.Record) map[string]interface{} {
+	return getKeyValuesFromENR(r, true)
+}
+
+func getKeyValuesFromENR(r *enr.Record, filterSensitive bool) map[string]interface{} {
 	fields := make(map[string]interface{})
-	// Get sequence number
-	fields["seq"] = r.Seq()
 
-	// Get signature
+	sensitiveFields := map[string]bool{
+		"ip":  true,
+		"ip6": true,
+	}
+
+	fields["seq"] = r.Seq()
 	fields["signature"] = "0x" + hex.EncodeToString(r.Signature())
 
-	// Get all key value pairs
 	kv := r.AppendElements(nil)[1:]
 	for i := 0; i < len(kv); i += 2 {
 		key := kv[i].(string)
 		val := kv[i+1].(rlp.RawValue)
+
+		if filterSensitive && sensitiveFields[key] {
+			continue
+		}
+
 		formatter := attrFormatters[key]
 		if formatter == nil {
 			formatter = formatAttrRaw