From c1f1a0989da0a2ed18d0247ad0bb4d594807c0f2 Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Thu, 6 Aug 2015 12:22:47 +0200 Subject: [PATCH] add gas limit chart --- lib/history.js | 21 +++++++++++++++++++++ src/js/controllers.js | 4 ++++ src/views/index.jade | 21 +++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/lib/history.js b/lib/history.js index 0975634..e50cd92 100644 --- a/lib/history.js +++ b/lib/history.js @@ -436,6 +436,25 @@ History.prototype.getBlockTimes = function() return blockTimes; } +History.prototype.getGasLimit = function() +{ + var gasLimitHistory = _( this._items ) + .sortByOrder( 'height', false ) + .filter(function (item) + { + return item.block.trusted; + }) + .slice(0, MAX_BINS) + .reverse() + .map(function (item) + { + return item.block.gasLimit; + }) + .value(); + + return gasLimitHistory; +} + History.prototype.getDifficulty = function() { var difficultyHistory = _( this._items ) @@ -570,6 +589,7 @@ History.prototype.getCharts = function() uncles: item.block.uncles.length, transactions: item.block.transactions.length, gasSpending: item.block.gasUsed, + gasLimit: item.block.gasLimit, miner: item.block.miner }; }) @@ -583,6 +603,7 @@ History.prototype.getCharts = function() uncles : _.pluck( chartHistory, 'uncles' ), transactions : _.pluck( chartHistory, 'transactions' ), gasSpending : _.pluck( chartHistory, 'gasSpending' ), + gasLimit : _.pluck( chartHistory, 'gasLimit' ), miners : this.getMinersCount(), propagation : this.getBlockPropagation(), uncleCount : this.getUncleCount(), diff --git a/src/js/controllers.js b/src/js/controllers.js index 7246095..ee9bb87 100644 --- a/src/js/controllers.js +++ b/src/js/controllers.js @@ -21,6 +21,7 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc $scope.uncleCount = 0; $scope.bestStats = {}; + $scope.lastGasLimit = _.fill(Array(MAX_BINS), 2); $scope.lastBlocksTime = _.fill(Array(MAX_BINS), 2); $scope.difficultyChart = _.fill(Array(MAX_BINS), 2); $scope.transactionDensity = _.fill(Array(MAX_BINS), 2); @@ -327,6 +328,9 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc if( !_.isEqual($scope.avgHashrate, data.avgHashrate) ) $scope.avgHashrate = data.avgHashrate; + if( !_.isEqual($scope.lastGasLimit, data.gasLimit) && data.gasLimit.length >= MAX_BINS ) + $scope.lastGasLimit = data.gasLimit; + if( !_.isEqual($scope.lastBlocksTime, data.blocktime) && data.blocktime.length >= MAX_BINS ) $scope.lastBlocksTime = data.blocktime; diff --git a/src/views/index.jade b/src/views/index.jade index 42a87d9..fc113bd 100644 --- a/src/views/index.jade +++ b/src/views/index.jade @@ -88,6 +88,16 @@ block content span.small-title uptime span.small-value {{ upTimeTotal | upTimeFilter }} + div.row.second-row + div.col-xs-3.stat-holder.box + div.col-xs-3.stat-holder.box + div.gasprice.text-info + i.icon-gasprice + span.small-title gas limit + span.small-value {{ bestStats.block.gasLimit }} gas + div.col-xs-3.stat-holder.box + div.col-xs-3.stat-holder.box + div.row div.col-xs-3.stat-holder div.big-info.chart(class="{{ avgBlockTime | avgTimeClass }}") @@ -146,6 +156,16 @@ block content //- div.col-xs-12 nodemap#mapHolder(data="map") + + div.row + div.col-xs-3.stat-holder + div.big-info.chart.text-info + //- i.icon-difficulty + span.small-title gas limit + //- span.small-value {{ lastDifficulty | number }} + sparkchart.big-details.spark-difficulty(data="{{lastGasLimit.join(',')}}") + + div.row div.col-xs-12.stats-boxes div.row.second-row div.col-xs-12.stat-holder.box @@ -154,6 +174,7 @@ block content span.small-title Block #1028201 hash span.small-value {{frontierHash}} + //- div.clearfix div.row(ng-cloak, style="padding-top: 10px")