diff --git a/public/js/controllers.js b/public/js/controllers.js index 41ebc18..45b1e42 100644 --- a/public/js/controllers.js +++ b/public/js/controllers.js @@ -23,10 +23,12 @@ function StatsCtrl($scope, $filter, socket, _, toastr) { $scope.gasSpending = []; $scope.miners = []; + $scope.nodes = []; $scope.map = []; $scope.blockPropagationChart = []; $scope.uncleCountChart = []; + $scope.coinbases = []; $scope.latency = 0; @@ -230,6 +232,28 @@ function StatsCtrl($scope, $filter, socket, _, toastr) { if(typeof $scope.bestStats.miners !== 'undefined') { $scope.miners = $scope.bestStats.miners; + console.log($scope.miners); + + _.forIn($scope.miners, function(value, key) + { + if(value.name !== false) + return; + + console.error(key, value); + + var name = _.result(_.find(_.pluck($scope.nodes, 'info'), 'coinbase', value.miner), 'name'); + if(typeof name !== 'undefined') + $scope.miners[key].name = name; + + console.warn("Name: ", name); + }); + + var addresses = _.pluck(_.filter($scope.miners, 'name', false), 'miner'); + console.info('Addresses', addresses); + + var coinbases = _.pluck($scope.nodes, 'info'); + console.info('Coinbases', coinbases); + console.info('Nodes', $scope.nodes); } jQuery('.spark-blocktimes').sparkline($scope.lastBlocksTime.reverse(), {type: 'bar', tooltipSuffix: ' s'}); diff --git a/public/js/directives.js b/public/js/directives.js index b5559f1..802628d 100644 --- a/public/js/directives.js +++ b/public/js/directives.js @@ -188,7 +188,9 @@ angular.module('netStatsApp.directives', []). } scope.$watch('data', function() { - scope.init(); + if(scope.data.length > 0) { + scope.init(); + } }, true); } }; diff --git a/public/js/filters.js b/public/js/filters.js index f8218eb..d954af9 100644 --- a/public/js/filters.js +++ b/public/js/filters.js @@ -103,8 +103,9 @@ angular.module('netStatsApp.filters', []) .filter('gasPriceFilter', ['$filter', function(filter) { var numberFilter = filter('number'); return function(price) { - console.log("--------------------"); - console.log(price.length); + if(typeof price === 'undefined') + return "0 wei"; + if(price.length < 4) return price + " wei";