fix peer peerids

ethpandaops · Nov 22, 2024 · 3d9483b · 3d9483b
1 parent 89bfe97
commit 3d9483b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/handlers/clients_cl.go b/handlers/clients_cl.go
@@ -259,6 +259,17 @@ func buildCLClientsPageData() (*models.ClientsCLPageData, time.Duration) {
 				Type:   "internal",
 			}
 			if id != nil {
+				if node.ENR == "" {
+					node.ENR = id.Enr
+				} else if node.ENR != "" {
+					// Need to compare `seq` field from ENRs and only store highest
+					nodeENR := parseEnrRecord(node.ENR)
+					idENR := parseEnrRecord(id.Enr)
+					if nodeENR != nil && idENR != nil && idENR.Seq() > nodeENR.Seq() {
+						node.ENR = id.Enr // idENR has higher sequence number, so override.
+					}
+				}
+
 				node.ENR = id.Enr
 			}
 			pageData.Nodes[peerId] = node
@@ -272,7 +283,7 @@ func buildCLClientsPageData() (*models.ClientsCLPageData, time.Duration) {
 			addPeerNode(peer)
 
 			peerNode := &models.ClientCLPageDataNodePeers{
-				PeerID:             peerId,
+				PeerID:             peer.PeerID,
 				State:              peer.State,
 				Direction:          peer.Direction,
 				LastSeenP2PAddress: peer.LastSeenP2PAddress,

diff --git a/templates/clients/clients_cl.html b/templates/clients/clients_cl.html
@@ -400,7 +400,7 @@ <h5 class="modal-title" id="peerDasWarningsModal">👀 PeerDAS: Some problems we
                           <p>Some other node reported a higher sequence number than this one.
                             <code data-bind="text: 'seq=' + $root.getEnrValue(enr_kv, 'seq')"></code> vs <code data-bind="text: 'seq=' + $root.getEnrValue($node.enr_kv, 'seq')"></code>
                           </p>
-                          <p>ENR: <code data-bind="text: enr"></code></p>
+                          <p>ENR: <code data-bind="text: $node.enr"></code></p>
                         {{ html "<!-- /ko -->" }}
                       </div>
                     {{ html "<!-- /ko -->" }}