grassrootseconomics/ethstats-server
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #115 from cubedro/develop

Browse Source 
Changed avg hashrate to last 64 blocks
This commit is contained in:
Marian OANCΞA 2015-05-05 16:10:27 +03:00
commit 1084f13094
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
models/history.js
View File

@ -318,16 +318,9 @@ History.prototype.getAvgHashrate = function()
if( _.isEmpty(this._items) ) if( _.isEmpty(this._items) )
return 0; return 0;
var difficultyHistory = _( this._items )
.map(function (item)
{
return item.block.difficulty;
})
.value();
var avgDifficulty = _.sum(difficultyHistory) / difficultyHistory.length;
var blocktimeHistory = _( this._items ) var blocktimeHistory = _( this._items )
.sortByOrder( 'height', false )
.slice(0, 64)
.map(function (item) .map(function (item)
{ {
return item.block.time; return item.block.time;
@ -336,7 +329,7 @@ History.prototype.getAvgHashrate = function()
var avgBlocktime = (_.sum(blocktimeHistory) / blocktimeHistory.length)/1000; var avgBlocktime = (_.sum(blocktimeHistory) / blocktimeHistory.length)/1000;
return this.bestBlock().block.difficulty / 12 * ( 12 / avgBlocktime ); return this.bestBlock().block.difficulty / avgBlocktime;
} }
History.prototype.getMinersCount = function() History.prototype.getMinersCount = function()