CipherLabs
/
ethstats-server
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #234 from cubedro/develop

Browse Source 
added more nodes to config
pull/5/head
Marian OANCΞA 9 years ago
parent 6c83900a32 15d64ad1f2
commit f899b6e59f
2 changed files with 62 additions and 58 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      lib/utils/config.js
  2. 116
      src/js/controllers.js

4
lib/utils/config.js
Unescape View File

@ -10,6 +10,10 @@ var trusted = [
'52.7.205.152',
'52.7.224.174',
'92.51.165.126',
'84.117.82.122',
'73.40.58.88',
'178.19.221.38',
'185.37.145.18',
'::ffff:127.0.0.1',
];

116
src/js/controllers.js
Unescape View File

@ -474,7 +474,7 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc
$scope.nodesTotal = $scope.nodes.length;
$scope.nodesActive = _.filter($scope.nodes, function (node) {
forkFilter(node);
// forkFilter(node);
return node.stats.active == true;
}).length;
@ -510,37 +510,37 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc
var chains = {};
var maxScore = 0;
_($scope.nodes)
.map(function (item)
{
maxScore += (item.trusted ? 50 : 1);
if( _.isUndefined(chains[item.stats.block.number]) )
chains[item.stats.block.number] = [];
if( _.isUndefined(chains[item.stats.block.number][item.stats.block.fork]) )
chains[item.stats.block.number][item.stats.block.fork] = {
fork: item.stats.block.fork,
count: 0,
trusted: 0,
score: 0
};
if(item.stats.block.trusted)
chains[item.stats.block.number][item.stats.block.fork].trusted++;
else
chains[item.stats.block.number][item.stats.block.fork].count++;
chains[item.stats.block.number][item.stats.block.fork].score = chains[item.stats.block.number][item.stats.block.fork].trusted * 50 + chains[item.stats.block.number][item.stats.block.fork].count;
})
.value();
$scope.maxScore = maxScore;
$scope.chains = _.reduce(chains, function (result, item, key)
{
result[key] = _.max(item, 'score');
return result;
}, {});
// _($scope.nodes)
// .map(function (item)
// {
// maxScore += (item.trusted ? 50 : 1);
// if( _.isUndefined(chains[item.stats.block.number]) )
// chains[item.stats.block.number] = [];
// if( _.isUndefined(chains[item.stats.block.number][item.stats.block.fork]) )
// chains[item.stats.block.number][item.stats.block.fork] = {
// fork: item.stats.block.fork,
// count: 0,
// trusted: 0,
// score: 0
// };
// if(item.stats.block.trusted)
// chains[item.stats.block.number][item.stats.block.fork].trusted++;
// else
// chains[item.stats.block.number][item.stats.block.fork].count++;
// chains[item.stats.block.number][item.stats.block.fork].score = chains[item.stats.block.number][item.stats.block.fork].trusted * 50 + chains[item.stats.block.number][item.stats.block.fork].count;
// })
// .value();
// $scope.maxScore = maxScore;
// $scope.chains = _.reduce(chains, function (result, item, key)
// {
// result[key] = _.max(item, 'score');
// return result;
// }, {});
var bestBlock = _.max($scope.nodes, function (node)
{
@ -565,40 +565,40 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc
}
}
function forkFilter(node)
{
if( _.isUndefined(node.readable) )
node.readable = {};
// function forkFilter(node)
// {
// if( _.isUndefined(node.readable) )
// node.readable = {};
node.readable.forkClass = 'hidden';
node.readable.forkMessage = '';
// node.readable.forkClass = 'hidden';
// node.readable.forkMessage = '';
return true;
// return true;
if( $scope.chains[node.stats.block.number].fork === node.stats.block.fork && $scope.chains[node.stats.block.number].score / $scope.maxScore >= 0.5 )
{
node.readable.forkClass = 'hidden';
node.readable.forkMessage = '';
// if( $scope.chains[node.stats.block.number].fork === node.stats.block.fork && $scope.chains[node.stats.block.number].score / $scope.maxScore >= 0.5 )
// {
// node.readable.forkClass = 'hidden';
// node.readable.forkMessage = '';
return true;
}
// return true;
// }
if( $scope.chains[node.stats.block.number].fork !== node.stats.block.fork )
{
node.readable.forkClass = 'text-danger';
node.readable.forkMessage = 'Wrong chain.<br/>This chain is a fork.';
// if( $scope.chains[node.stats.block.number].fork !== node.stats.block.fork )
// {
// node.readable.forkClass = 'text-danger';
// node.readable.forkMessage = 'Wrong chain.<br/>This chain is a fork.';
return false;
}
// return false;
// }
if( $scope.chains[node.stats.block.number].score / $scope.maxScore < 0.5)
{
node.readable.forkClass = 'text-warning';
node.readable.forkMessage = 'May not be main chain.<br/>Waiting for more confirmations.';
// if( $scope.chains[node.stats.block.number].score / $scope.maxScore < 0.5)
// {
// node.readable.forkClass = 'text-warning';
// node.readable.forkMessage = 'May not be main chain.<br/>Waiting for more confirmations.';
return false;
}
}
// return false;
// }
// }
function latencyFilter(node)
{

Write Preview
Loading…
Cancel
Save