Skip to content

Commit

Permalink
warn about ENR diff on peers and add peer details modal content
Browse files Browse the repository at this point in the history
  • Loading branch information
@skylenet
skylenet committed Sep 27, 2024
1 parent 65aa510 commit 0fbe709
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 23 deletions.
26 changes: 11 additions & 15 deletions handlers/clients_cl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,24 @@ func buildCLClientsPageData() (*models.ClientsCLPageData, time.Duration) {
peerType = "internal"
}

peerENRKeyValues := map[string]interface{}{}
if peer.Enr != "" {
rec, err := utils.DecodeENR(peer.Enr)
if err != nil {
logrus.WithFields(logrus.Fields{"node": client.GetName(), "peer": peer.PeerID, "enr": peer.Enr}).Error("failed to decode peer enr. ", err)
rec = &enr.Record{}
}
peerENRKeyValues = utils.GetKeyValuesFromENR(rec)
}

resPeers = append(resPeers, &models.ClientCLPageDataClientPeers{
ID: peer.PeerID,
State: peer.State,
Direction: peer.Direction,
Alias: peerAlias,
Type: peerType,
ENR: peer.Enr,
ENRKeyValues: peerENRKeyValues,
LastSeenP2PAddress: peer.LastSeenP2PAddress,
})

Expand All @@ -223,10 +234,6 @@ func buildCLClientsPageData() (*models.ClientsCLPageData, time.Duration) {
}

node := pageData.Nodes[peer.PeerID]
if node.PeerID == "16Uiu2HAkuZ7rsexPNUWaCd2W7koKedKytgKgUUihP6WbszDXqKMs" || peer.PeerID == "16Uiu2HAkuZ7rsexPNUWaCd2W7koKedKytgKgUUihP6WbszDXqKMs" {
fmt.Println("n:" + node.ENR)
fmt.Println("p:" + peer.Enr)
}
if node.ENR == "" && peer.Enr != "" {
node.ENR = peer.Enr
} else if node.ENR != "" && peer.Enr != "" {
Expand Down Expand Up @@ -346,17 +353,6 @@ func buildCLClientsPageData() (*models.ClientsCLPageData, time.Duration) {

custodySubnetCount := pageData.PeerDASInfos.CustodyRequirement

// TODO: This is a temporary hack to simulate different custody subnet counts
//if rand.IntN(30-1)+1 == 1 {
// custodySubnetCount = 128
//} else if rand.IntN(5-1)+1 == 4 {
// custodySubnetCount = 64
//} else if rand.IntN(5-1)+1 == 3 {
// custodySubnetCount = 32
//} else if rand.IntN(5-1)+1 == 2 {
// custodySubnetCount = 8
//}

if cscHex, ok := v.ENRKeyValues["csc"]; ok {
val, err := strconv.ParseUint(cscHex.(string), 0, 64)
if err != nil {
Expand Down
91 changes: 83 additions & 8 deletions templates/clients/clients_cl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
{{ $root := . }}

<!-- Peer details modal -->
<div class="modal" id="peerDetailsModal" tabindex="-1" role="dialog" aria-labelledby="peerDetailsModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal modal-xl" id="peerDetailsModal" tabindex="-1" role="dialog" aria-labelledby="peerDetailsModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="peerDetailsModalTitle" style="overflow-wrap: anywhere;">Peer {peer}</h5>
<h5 class="modal-title" style="overflow-wrap: anywhere;">
<svg id="peerDetailsModalTitleImage" class="peer-table-icon" style="width:50px;height:50px;" data-jdenticon-value="user127"></svg>
<span id="peerDetailsModalTitle"></span>
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="$('#peerDetailsModal').modal('hide')">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<pre><code id="peerDetailsModalBody"></code></pre>
<div id="peerDetailsModalBody"></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="$('#peerDetailsModal').modal('hide')">Close</button>
Expand Down Expand Up @@ -414,6 +417,19 @@ <h5 class="modal-title" id="peerDasWarningsModal">👀 PeerDAS: Some problems we
</div>
{{ if $root.ShowSensitivePeerInfos }}
<div class="client-node-peer-details">
{{ $peerENR := (index $root.Nodes $peer.ID).ENR}}
{{ $reportedPeerENR := $peer.ENR}}
{{ if ne $peerENR $reportedPeerENR }}
<div style="padding:10px; margin: 0; margin-left:10px; margin-right: 25px; word-break: break-all; text-wrap: pretty;" class="alert alert-warning" role="alert">
<p><i class="fa-solid fa-circle-exclamation" style="margin-right: 10px;"></i>The ENR information was obtained from another node.</p>
The node <code>{{ $client.Name }}</code> did not have the most up-to-date ENR for this peer.
{{ if ne $reportedPeerENR "" }}
The reported ENR was: <code>{{ $reportedPeerENR }}</code>. Decoded ENR fields <code>{{ toJson $peer.ENRKeyValues }}</code>.
{{ else }}
The reported ENR was empty (nil).
{{ end }}
</div>
{{ end }}
<table class="table table-borderless table-sm client-table-info" style="padding-left:0; margin-top:10px;margin-bottom: 10px; margin-left: 10px;">
<tbody>
<tr>
Expand All @@ -431,7 +447,6 @@ <h5 class="modal-title" id="peerDasWarningsModal">👀 PeerDAS: Some problems we
</td>
</tr>
<tr>
{{ $peerENR := (index $root.Nodes $peer.ID).ENR}}
<td>ENR</td>
<td>
<div style="word-break: break-all; text-wrap: pretty;">
Expand Down Expand Up @@ -523,6 +538,68 @@ <h5 class="modal-title" id="peerDasWarningsModal">👀 PeerDAS: Some problems we

var nodes = {{ .Nodes }};

var showPeerDetailsModal = function(peerID){
jdenticon.update("#peerDetailsModalTitleImage", peerID);
$('#peerDetailsModalTitle').html(`${nodes[peerID].alias}`);

let peerDetailsTemplate = `
<table class="table table-borderless table-sm">
<tr>
<td style="min-width:90px;">Peer ID</td>
<td><code>${peerID}</code></td>
</tr>
<tr>
<td>Node ID</td>
<td><code>${nodes[peerID].node_id}</code></td>
</tr>
<tr>
<td>ENR</td>
<td><code style="word-break: break-all; text-wrap: pretty;">${nodes[peerID].enr?nodes[peerID].enr:"Unknown"}</code></td>
</tr>
`;

if (nodes[peerID].enr_kv) {
peerDetailsTemplate += `
<tr>
<td colspan="2" style="font-weight: 700;padding-top: 5px;padding-bottom: 5px; text-align: center;border-top:1px dashed; border-bottom:1px dashed">ENR Fields</td>
</tr>
${Object.entries(nodes[peerID].enr_kv).map(([key, value]) => `
<tr>
<td style="padding-right:15px; vertical-align:top">${key}</td>
<td><code style="word-break: break-all; text-wrap: pretty;">${value}</code></td>
</tr>
`).join('')}
`;
}

peerDetailsTemplate += `
<tr>
<td colspan="2" style="font-weight: 700;padding-top: 5px;padding-bottom: 5px; text-align: center;border-top:1px dashed; border-bottom:1px dashed">Peer DAS</td>
</tr>
<tr>
<td>Supernode</td>
<td><code>${nodes[peerID].peer_das.is_super_node}</code></td>
</tr>
<tr>
<td>CSC</td>
<td><code>${nodes[peerID].peer_das.custody_subnet_count}</code></td>
</tr>
<tr>
<td>Columns</td>
<td><code style="word-break: break-all; text-wrap: pretty;">${nodes[peerID].peer_das.custody_columns}</code></td>
</tr>
<tr>
<td>Subnets</td>
<td><code style="word-break: break-all; text-wrap: pretty;">${nodes[peerID].peer_das.custody_column_subnets}</code></td>
</tr>
</table>
`;

//peerDetailsTemplate += `<pre><code>${JSON.stringify(nodes[peerID], null, 2)}</code></pre>`;
$('#peerDetailsModalBody').html(peerDetailsTemplate)
$('#peerDetailsModal').modal('show');
}

var lastClickedNode = null;
// PeerDASTable toggle external peers button
$('#showExternalPeersDAS').change(function() {
Expand Down Expand Up @@ -589,9 +666,7 @@ <h5 class="modal-title" id="peerDasWarningsModal">👀 PeerDAS: Some problems we
const peerID = $target.data('peerid').toString();


$('#peerDetailsModalTitle').html("Peer: " + nodes[peerID].alias);
$('#peerDetailsModalBody').html(JSON.stringify(nodes[peerID], null, 2));
$('#peerDetailsModal').modal('show');
showPeerDetailsModal(peerID);

// Remove highlight/blur from the last clicked node
if (lastClickedNode != null) {
Expand Down

0 comments on commit 0fbe709

Please sign in to comment.