From 23721dba97a36690541f816a60115e4a9b3ead3e Mon Sep 17 00:00:00 2001 From: cubedro Date: Tue, 21 Jul 2015 19:24:42 +0300 Subject: [PATCH] added LITE flag --- dist/index-lite.html | 2 +- lib/history.js | 1 + lib/node.js | 2 +- src/views/index-lite.jade | 44 --------------------------------------- 4 files changed, 3 insertions(+), 46 deletions(-) diff --git a/dist/index-lite.html b/dist/index-lite.html index aa504bb..e82ee32 100644 --- a/dist/index-lite.html +++ b/dist/index-lite.html @@ -1 +1 @@ -Ethereum Network Status
best block{{'#'}}{{ bestBlock | number}}
uncles (current / last 50){{ bestStats.block.uncles.length }}/{{ uncleCount }}
last block{{ lastBlock | blockTimeFilter }}
avg block time{{ avgBlockTime | avgTimeFilter }}
avg network hashrate
difficulty{{ lastDifficulty | number }}
active nodes{{nodesActive}}/{{nodesTotal}}
nodes status{{ nodes | consensusFilter : bestStats }}
page latency{{latency}} ms
uptime{{ upTimeTotal | upTimeFilter }}
 
{{node.info.name}} ({{node.info.ip}})
{{ node.readable.latency }}{{'#'}}{{ node.stats.block.number | number }}{{node.stats.block.hash | hashFilter}}{{node.stats.block.totalDifficulty | number}}{{node.stats.block.received | blockTimeFilter }}
{{node.stats.block.propagation | blockPropagationFilter}}
\ No newline at end of file +Ethereum Network Status
best block{{'#'}}{{ bestBlock | number}}
uncles (current / last 50){{ bestStats.block.uncles.length }}/{{ uncleCount }}
last block{{ lastBlock | blockTimeFilter }}
avg block time{{ avgBlockTime | avgTimeFilter }}
avg network hashrate
difficulty{{ lastDifficulty | number }}
active nodes{{nodesActive}}/{{nodesTotal}}
nodes status{{ nodes | consensusFilter : bestStats }}
page latency{{latency}} ms
 
{{node.info.name}} ({{node.info.ip}})
{{ node.readable.latency }}{{'#'}}{{ node.stats.block.number | number }}{{node.stats.block.hash | hashFilter}}{{node.stats.block.totalDifficulty | number}}{{node.stats.block.received | blockTimeFilter }}
{{node.stats.block.propagation | blockPropagationFilter}}
\ No newline at end of file diff --git a/lib/history.js b/lib/history.js index 6b19cc4..621a8bc 100644 --- a/lib/history.js +++ b/lib/history.js @@ -23,6 +23,7 @@ History.prototype.add = function(block, id, trusted, addingHistory) if( !_.isUndefined(block) && !_.isUndefined(block.number) && !_.isUndefined(block.uncles) && !_.isUndefined(block.transactions) && !_.isUndefined(block.difficulty) && block.number > 0 ) { + trusted = (process.env.LITE === true ? true : trusted); var historyBlock = this.search(block.number); var forkIndex = -1; diff --git a/lib/node.js b/lib/node.js index 726e79b..c412124 100644 --- a/lib/node.js +++ b/lib/node.js @@ -81,7 +81,7 @@ Node.prototype.setInfo = function(data, callback) if( !_.isUndefined(data.ip) ) { - if( trusted.indexOf(data.ip) >= 0 ) + if( trusted.indexOf(data.ip) >= 0 || process.env.LITE === true) { this.trusted = true; } diff --git a/src/views/index-lite.jade b/src/views/index-lite.jade index 2d5f204..8433a7f 100644 --- a/src/views/index-lite.jade +++ b/src/views/index-lite.jade @@ -76,50 +76,6 @@ block content span.small-title page latency span.small-value {{latency}} ms - //- div.row - div.col-xs-3.stat-holder - div.big-info.chart(class="{{ avgBlockTime | avgTimeClass }}") - span.small-title block time - sparkchart.big-details.spark-blocktimes(data="{{lastBlocksTime.join(',')}}", tooltipsuffix="s") - - div.col-xs-3.stat-holder - div.big-info.chart.text-info - span.small-title difficulty - sparkchart.big-details.spark-difficulty(data="{{difficultyChart.join(',')}}") - - div.col-xs-3.stat-holder.xpull-right - div.big-info.chart.xdouble-chart(class="{{ blockPropagationAvg | propagationAvgTimeClass : true }}") - span.small-title block propagation - histogram.big-details.d3-blockpropagation(data="blockPropagationChart") - - div.col-xs-3.stat-holder.pull-right - div.big-info.chart.double-chart - span.small-title last blocks miners - div.blocks-holder(ng-repeat='miner in miners track by miner.miner', data-toggle="tooltip", data-placement="right", data-original-title="{{miner.blocks}}") - div.block-count(class="{{miner.blocks | minerBlocksClass : 'text-'}}") {{miner.blocks}} - div.small-title-miner {{miner.miner}} - minerblock(blocks="{{miner.blocks}}") - div.clearfix - - div.col-xs-3.stat-holder - div.big-info.chart.text-info - span.small-title uncle count  - span.small (25 blocks per bar) - sparkchart.big-details.spark-uncles(data="{{uncleCountChart.join(',')}}") - - div.col-xs-3.stat-holder - div.big-info.chart.text-info - span.small-title transactions - sparkchart.big-details.spark-transactions(data="{{transactionDensity.join(',')}}") - - div.col-xs-3.stat-holder - div.big-info.chart.text-info - span.small-title gas spending - sparkchart.big-details.spark-gasspending(data="{{gasSpending.join(',')}}") - - //- div.col-xs-4.stat-holder.map-holder - nodemap#mapHolder(data="map") - div.row(ng-cloak, style="padding-top: 10px") table.table.table-striped thead