Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ethpandaops/dora into electra-sup…
Browse files Browse the repository at this point in the history
…port
  • Loading branch information
skylenet committed Aug 12, 2024
2 parents 3c253e6 + e7c86f4 commit b696962
Show file tree
Hide file tree
Showing 13 changed files with 10,265 additions and 244 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
static/js/vendor/** linguist-vendored=true
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/lib/pq v1.10.9
github.com/lucasb-eyer/go-colorful v1.2.0
github.com/mitchellh/mapstructure v1.5.0
github.com/pk910/dynamic-ssz v0.0.4
github.com/pk910/dynamic-ssz v0.0.5
github.com/pressly/goose/v3 v3.21.1
github.com/protolambda/bls12-381-util v0.1.0
github.com/protolambda/zrnt v0.32.3
Expand All @@ -35,9 +35,9 @@ require (
github.com/stdatiks/jdenticon-go v0.1.0
github.com/tdewolff/minify v2.3.6+incompatible
github.com/urfave/negroni v1.0.0
golang.org/x/crypto v0.25.0
golang.org/x/crypto v0.26.0
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
golang.org/x/text v0.16.0
golang.org/x/text v0.17.0
golang.org/x/time v0.6.0
gopkg.in/yaml.v3 v3.0.1
)
Expand Down Expand Up @@ -131,8 +131,8 @@ require (
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect
Expand Down
24 changes: 12 additions & 12 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
github.com/pk910/dynamic-ssz v0.0.4 h1:DT29+1055tCEPCaR4V/ez+MOKW7BzBsmjyFvBRqx0ME=
github.com/pk910/dynamic-ssz v0.0.4/go.mod h1:b6CrLaB2X7pYA+OSEEbkgXDEcRnjLOZIxZTsMuO/Y9c=
github.com/pk910/dynamic-ssz v0.0.5 h1:VP9heGYUwzlpyhk28P2nCAzhvGsePJOOOO5vQMDh2qQ=
github.com/pk910/dynamic-ssz v0.0.5/go.mod h1:b6CrLaB2X7pYA+OSEEbkgXDEcRnjLOZIxZTsMuO/Y9c=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down Expand Up @@ -498,8 +498,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
Expand Down Expand Up @@ -530,8 +530,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down Expand Up @@ -564,17 +564,17 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
Expand All @@ -585,8 +585,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
Expand Down
11 changes: 11 additions & 0 deletions static/css/clients.css
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,14 @@ Client peers table
display: inline-block;
vertical-align: middle;
}

#nodemap-loading {
position: absolute;
top: 50%;
left: 50%;
z-index: 1000;
width: 100px;
height: 100px;
margin-left: -50px;
margin-top: -50px;
}
175 changes: 175 additions & 0 deletions static/js/cytoscape-network-aux.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
$_network = {};

// Select a node and its neighborhood edges
$_network.selectNode = function (cy, nodeId) {
elem = cy.getElementById(nodeId)
cy.elements().unselect();
elem.select();
console.log(elem.neighborhood());
elem.neighborhood().edges().select();
}

// Isolate a node and only show it and its neighborhood
$_network.isolateNode = function (cy, nodeId) {
elem = cy.getElementById(nodeId)
cy.elements().hide().unselect();
elem.show().select();
edges = elem.neighborhood().edges();
edges.show();
edges.select();
elem.neighborhood().nodes().show();
}

// Show all nodes and edges
$_network.showAll = function (cy) {
cy.elements().show().unselect();
}

// Available Layouts
$_network.layouts = {
fcose : function(nodeCount){
return {
name: 'fcose',
idealEdgeLength: 5 * nodeCount,
nestingFactor: 1.2,
animate: false,
stop: function() {
$("#nodemap-loading").hide();
}
}
},
circle : function() {
return {
name: 'circle',
animate: false,
}
},
grid : function() {
return {
name: 'grid',
animate: false,
}
},
}

// Default layout
$_network.defaultLayout = $_network.layouts.fcose;


// Default stylesheet
$_network.defaultStylesheet = cytoscape.stylesheet()
.selector('node')
.css({
'height': 20,
'width': 20,
'background-fit': 'cover',
'border-color': '#0077B6',
'border-width': 1,
'border-opacity': 1,
})
.selector('edge')
.css({
'curve-style': 'bezier',
'width': 0.5,
'target-arrow-shape': 'vee',
'line-color': '#0077B6',
'target-arrow-color': '#0077B6',
'arrow-scale': 0.5,
})
.selector('node[label]')
.css({
'label': 'data(label)',
})
.selector('.bottom-center')
.css({
"text-valign": "bottom",
"text-halign": "center",
"color": "#ffffff",
"font-size": 4,
})
.selector('node:selected, edge:selected')
.css({
'border-color': '#FFA500',
'background-color': '#FFA500',
'line-color': '#FFA500',
'target-arrow-color': '#FFA500',
'source-arrow-color': '#FFA500',
'opacity': 1
});


$_network.fitAnimated = function (cy, layout) {
cy.animate({
fit: { eles: cy.$() },
duration: 500,
complete: function () {
setTimeout(function () {
layout.animate = true;
layout.animationDuration = 2000;
layout.fit = true;
layout.directed = true;
cy.layout(layout).run();
}, 500);
},
});
}


// Create a cytoscape network
$_network.create = function (container, data){
var stylesheet = $_network.defaultStylesheet;
var cytoElements = [];
for (var i = 0; i < data.nodes.length; i++) {
// Create nodes
data.nodes[i].title = data.nodes[i].id;
if (data.nodes[i].id != "") {
cytoElements.push(
{
data: data.nodes[i],
classes: "bottom-center",
}
);
// Add style to nodes
stylesheet.selector('#' + data.nodes[i].id).css({
'background-image': '/identicon?key=' + data.nodes[i].id
});
}
}
for (var i = 0; i < data.edges.length; i++) {
// Create edges
cytoElements.push({
data: {
id: data.edges[i].from + "-" + data.edges[i].to,
source: data.edges[i].from,
target: data.edges[i].to
}
});
}

var cy = window.cy = cytoscape({
container: container,
style: stylesheet,
layout: $_network.defaultLayout(data.nodes.length),
elements: cytoElements,
wheelSensitivity: 0.1,
});

cy.on('tap', 'node', function(evt){
evt.preventDefault();
console.log(evt.target.id());
$_network.isolateNode(cy, evt.target.id());
$(".collapse.peerInfo").collapse("hide");
$("#peerInfo-" + evt.target.id()).collapse("show");
});

cy.on('tap', function(event){
var evtTarget = event.target;
if( evtTarget === cy ){ // tap on background
$_network.showAll(cy);
window.location.hash = "";
$(".collapse.peerInfo").collapse("hide");
}
});

return cy;
}
Loading

0 comments on commit b696962

Please sign in to comment.