gas price

.gitignore

@@ -10,3 +10,5 @@ config/nodes.js
 *.swp
 *.pem
 .node-xmlhttprequest-*
+ws_secret.json
+stats.json

Gruntfile.js

@@ -185,7 +185,7 @@ module.exports = function(grunt) {
 		concat: {
 			vendor: {
 				options: {
-					sourceMap: true,
+					souceMap: false,
 					sourceMapIncludeSources: true,
 					sourceMapIn: ['dist/js/lib/*.map']
 				},
@@ -201,21 +201,21 @@ module.exports = function(grunt) {
 			},
 			netstats: {
 				options: {
-					sourceMap: true,
+					sourceMap: false,
 					sourceMapIncludeSources: true,
 					sourceMapIn: ['dist/js/vendor.min.js.map', 'dist/js/app.min.js.map']
 				},
 				src: ['<%= concat.vendor.dest %>', '<%= uglify.app.dest %>'],
 				dest: 'dist/js/netstats.min.js',
-				nonull: true,
+				nonull: true
 			},
 			css: {
 				src: ['dist/css/*.min.css', 'dist/css/*.css'],
 				dest: 'dist/css/netstats.min.css'
 			},
 			vendor_lite: {
 				options: {
-					sourceMap: true,
+					sourceMap: false,
 					sourceMapIncludeSources: true,
 					sourceMapIn: ['dist-lite/js/lib/*.map']
 				},
@@ -231,7 +231,7 @@ module.exports = function(grunt) {
 			},
 			netstats_lite: {
 				options: {
-					sourceMap: true,
+					sourceMap: false,
 					sourceMapIncludeSources: true,
 					sourceMapIn: ['dist-lite/js/vendor.min.js.map', 'dist-lite/js/app.min.js.map']
 				},
@@ -248,7 +248,7 @@ module.exports = function(grunt) {
 			app: {
 				options: {
 					mangle: false,
-					sourceMap: true,
+					sourceMap: false,
 					sourceMapIncludeSources: true
 				},
 				dest: 'dist/js/app.min.js',
@@ -257,7 +257,7 @@ module.exports = function(grunt) {
 			app_lite: {
 				options: {
 					mangle: false,
-					sourceMap: true,
+					sourceMap: false,
 					sourceMapIncludeSources: true
 				},
 				dest: 'dist-lite/js/app.min.js',
@@ -277,4 +277,4 @@ module.exports = function(grunt) {
 	grunt.registerTask('lite', ['clean:build_lite', 'clean:cleanup_js_lite', 'clean:cleanup_css_lite', 'jade:build_lite', 'copy:build_lite', 'cssmin:build_lite', 'concat:vendor_lite', 'concat:scripts_lite', 'uglify:app_lite', 'concat:netstats_lite', 'concat:css_lite', 'clean:cleanup_js_lite', 'clean:cleanup_css_lite']);
 	grunt.registerTask('build',   'default');
 	grunt.registerTask('all',   ['default', 'lite']);
-};
+};

app.js

@@ -3,7 +3,32 @@ var logger = require('./lib/utils/logger');
 var chalk = require('chalk');
 var http = require('http');
 
-var WS_SECRET = process.env.WS_SECRET || "eth-net-stats-has-a-secret";
+// Init WS SECRET
+var WS_SECRET;
+
+if( !_.isUndefined(process.env.WS_SECRET) && !_.isNull(process.env.WS_SECRET) )
+{
+	if( process.env.WS_SECRET.indexOf('|') > 0 )
+	{
+		WS_SECRET = process.env.WS_SECRET.split('|');
+	}
+	else
+	{
+		WS_SECRET = [process.env.WS_SECRET];
+	}
+}
+else
+{
+	try {
+		var tmp_secret_json = require('./ws_secret.json');
+		WS_SECRET = _.values(tmp_secret_json);
+	}
+	catch (e)
+	{
+		console.error("WS_SECRET NOT SET!!!");
+	}
+}
+
 var banned = require('./lib/utils/config').banned;
 
 // Init http server
@@ -29,8 +54,8 @@ api = new Primus(server, {
 	parser: 'JSON'
 });
 
-api.use('emit', require('primus-emit'));
-api.use('spark-latency', require('primus-spark-latency'));
+api.plugin('emit', require('primus-emit'));
+api.plugin('spark-latency', require('primus-spark-latency'));
 
 
 // Init Client Socket connection
@@ -40,7 +65,7 @@ client = new Primus(server, {
 	parser: 'JSON'
 });
 
-client.use('emit', require('primus-emit'));
+client.plugin('emit', require('primus-emit'));
 
 
 // Init external API
@@ -50,7 +75,7 @@ external = new Primus(server, {
 	parser: 'JSON'
 });
 
-external.use('emit', require('primus-emit'));
+external.plugin('emit', require('primus-emit'));
 
 // Init collections
 var Collection = require('./lib/collection');
@@ -81,7 +106,7 @@ api.on('connection', function (spark)
 	{
 		console.info('API', 'CON', 'Hello', data['id']);
 
-		if( _.isUndefined(data.secret) || data.secret !== WS_SECRET || banned.indexOf(spark.address.ip) >= 0 )
+		if( _.isUndefined(data.secret) || WS_SECRET.indexOf(data.secret) === -1 || banned.indexOf(spark.address.ip) >= 0 )
 		{
 			spark.end(undefined, { reconnect: false });
 			console.error('API', 'CON', 'Closed - wrong auth', data);

lib/collection.js

@@ -44,7 +44,7 @@ Collection.prototype.update = function(id, stats, callback)
 	}
 	else
 	{
-		this._blockchain.clean(this.getBestBlockFromItems());
+		// this._blockchain.clean(this.getBestBlockFromItems());
 
 		var block = this._blockchain.add(stats.block, id, node.trusted);
 
@@ -75,7 +75,7 @@ Collection.prototype.addBlock = function(id, stats, callback)
 	}
 	else
 	{
-		this._blockchain.clean(this.getBestBlockFromItems());
+		// this._blockchain.clean(this.getBestBlockFromItems());
 
 		var block = this._blockchain.add(stats, id, node.trusted);
 
@@ -142,7 +142,7 @@ Collection.prototype.addHistory = function(id, blocks, callback)
 	{
 		blocks = blocks.reverse();
 
-		this._blockchain.clean(this.getBestBlockFromItems());
+		// this._blockchain.clean(this.getBestBlockFromItems());
 
 		for (var i = 0; i <= blocks.length - 1; i++)
 		{
@@ -288,7 +288,8 @@ Collection.prototype.getHistory = function()
 Collection.prototype.getBestBlockFromItems = function()
 {
 	return Math.max(this._blockchain.bestBlockNumber(), _.result(_.max(this._items, function(item) {
-		return ( !item.trusted ? 0 : item.stats.block.number );
+		// return ( !item.trusted ? 0 : item.stats.block.number );
+		return ( item.stats.block.number );
 	}), 'stats.block.number', 0));
 }
 
@@ -301,9 +302,9 @@ Collection.prototype.canNodeUpdate = function(id)
 
 	if(node.canUpdate())
 	{
-		var diff = this._blockchain.bestBlockNumber() - node.getBlockNumber();
+		var diff = node.getBlockNumber() - this._blockchain.bestBlockNumber();
 
-		return (diff <= 0);
+		return Boolean(diff >= 0);
 	}
 
 	return false;

lib/history.js

@@ -169,7 +169,7 @@ History.prototype.add = function(block, id, trusted, addingHistory)
 				propagTimes: []
 			}
 
-			if( this._items.length === 0 || (this._items.length === MAX_HISTORY && block.number > this.worstBlockNumber() && !addingHistory) || (this._items.length < MAX_HISTORY && block.number < this.bestBlockNumber()) )
+			if( this._items.length === 0 || (this._items.length === MAX_HISTORY && block.number > this.worstBlockNumber()) || (this._items.length < MAX_HISTORY && block.number < this.bestBlockNumber() && addingHistory) )
 			{
 				item.propagTimes.push({
 					node: id,
@@ -429,13 +429,32 @@ History.prototype.getBlockTimes = function()
 		.reverse()
 		.map(function (item)
 		{
-			return item.block.time;
+			return item.block.time / 1000;
 		})
 		.value();
 
 	return blockTimes;
 }
 
+History.prototype.getAvgBlocktime = function()
+{
+	var blockTimes = _( this._items )
+		.sortByOrder( 'height', false )
+		// .filter(function (item)
+		// {
+			// return item.block.trusted;
+		// })
+		// .slice(0, MAX_BINS)
+		.reverse()
+		.map(function (item)
+		{
+			return item.block.time / 1000;
+		})
+		.value();
+
+	return _.sum(blockTimes) / (blockTimes.length === 0 ? 1 : blockTimes.length);
+}
+
 History.prototype.getGasLimit = function()
 {
 	var gasLimitHistory = _( this._items )
@@ -598,7 +617,8 @@ History.prototype.getCharts = function()
 		this._callback(null, {
 			height : _.pluck( chartHistory, 'height' ),
 			blocktime : _.pluck( chartHistory, 'blocktime' ),
-			avgBlocktime : _.sum(_.pluck( chartHistory, 'blocktime' )) / (chartHistory.length === 0 ? 1 : chartHistory.length),
+			// avgBlocktime : _.sum(_.pluck( chartHistory, 'blocktime' )) / (chartHistory.length === 0 ? 1 : chartHistory.length),
+			avgBlocktime : this.getAvgBlocktime(),
 			difficulty : _.pluck( chartHistory, 'difficulty' ),
 			uncles : _.pluck( chartHistory, 'uncles' ),
 			transactions : _.pluck( chartHistory, 'transactions' ),
@@ -614,12 +634,13 @@ History.prototype.getCharts = function()
 
 History.prototype.requiresUpdate = function()
 {
-	return ( this._items.length < MAX_HISTORY && !_.isEmpty(this._items) );
+	// return ( this._items.length < MAX_HISTORY && !_.isEmpty(this._items) );
+	return ( this._items.length < MAX_HISTORY );
 }
 
 History.prototype.getHistoryRequestRange = function()
 {
-	if( _.isEmpty(this._items) )
+	if( this._items.length < 2 )
 		return false;
 
 	var blocks = _.pluck( this._items, 'height' );

lib/node.js

@@ -32,6 +32,7 @@ var Node = function(data)
 			transactions: [],
 			uncles: []
 		},
+		syncing: false,
 		propagationAvg: 0,
 		latency: 0,
 		uptime: 100
@@ -113,6 +114,7 @@ Node.prototype.getInfo = function(callback)
 		stats: {
 			active: this.stats.active,
 			mining: this.stats.mining,
+			syncing: this.stats.syncing,
 			hashrate: this.stats.hashrate,
 			peers: this.stats.peers,
 			gasPrice: this.stats.gasPrice,
@@ -235,6 +237,7 @@ Node.prototype.setBasicStats = function(stats, callback)
 		{
 			this.stats.active = stats.active;
 			this.stats.mining = stats.mining;
+			this.stats.syncing = (!_.isUndefined(stats.syncing) ? stats.syncing : false);
 			this.stats.hashrate = stats.hashrate;
 			this.stats.peers = stats.peers;
 			this.stats.gasPrice = stats.gasPrice;
@@ -284,6 +287,7 @@ Node.prototype.getStats = function()
 		stats: {
 			active: this.stats.active,
 			mining: this.stats.mining,
+			syncing: this.stats.syncing,
 			hashrate: this.stats.hashrate,
 			peers: this.stats.peers,
 			gasPrice: this.stats.gasPrice,
@@ -314,6 +318,7 @@ Node.prototype.getBasicStats = function()
 		stats: {
 			active: this.stats.active,
 			mining: this.stats.mining,
+			syncing: this.stats.syncing,
 			hashrate: this.stats.hashrate,
 			peers: this.stats.peers,
 			gasPrice: this.stats.gasPrice,
@@ -369,7 +374,11 @@ Node.prototype.getBlockNumber = function()
 
 Node.prototype.canUpdate = function()
 {
-	return (this.info.canUpdateHistory && this.trusted) || false;
+	if (this.trusted) {
+		return true;
+	}
+	// return (this.info.canUpdateHistory && this.trusted) || false;
+	return (this.info.canUpdateHistory || (this.stats.syncing === false && this.stats.peers > 0)) || false;
 }
 
 Node.prototype.isInactiveAndOld = function()

lib/utils/config.js

@@ -15,11 +15,14 @@ var trusted = [
 	'178.19.221.38',
 	'185.37.145.18',
 	'172.31.39.87',
+	'86.120.171.69',
+	'86.123.155.6',
+	'188.24.81.133',
 	'::ffff:127.0.0.1',
 ];
 
 var banned = [
-	'198.48.150.206'
+	// '198.48.150.206'
 ];
 
 module.exports = {

lib/utils/logger.js

@@ -31,6 +31,15 @@ var typeColors = {
 	'PIN': chalk.reset.bold.yellow,
 };
 
+var verbosity = [
+	[],
+	['error'],
+	['error', 'warn', 'success'],
+	['info', 'error', 'warn', 'success', 'time', 'timeEnd']
+];
+
+var ENV_VERBOSITY = process.env.VERBOSITY || 2;
+
 [
 	{
 		name: "info",
@@ -102,6 +111,9 @@ var typeColors = {
 
 	console[item.name] = function ()
 	{
+		if(verbosity[ENV_VERBOSITY].indexOf(item.name) === -1)
+			return false;
+
 		var args = Array.prototype.slice.call(arguments);
 		var type = null,
 			sign,
@@ -150,4 +162,4 @@ var typeColors = {
 
 		return fn.apply( this, item.formatter(sign, message) );
 	}
-});
+});