diff --git a/lib/api.js b/lib/api.js index afc6f1c55..aac52a6e0 100644 --- a/lib/api.js +++ b/lib/api.js @@ -178,7 +178,7 @@ function getPublicPorts(ports){ function getReadableHashRateString(hashrate){ var i = 0; - var byteUnits = [' H', ' KH', ' MH', ' GH', ' TH', ' PH' ]; + var byteUnits = [' H', ' kH', ' MH', ' GH', ' TH', ' PH', ' EH', ' ZH', ' YH' ]; while (hashrate > 1000){ hashrate = hashrate / 1000; i++; diff --git a/website/admin.html b/website/admin.html index 8b1311599..800f23565 100644 --- a/website/admin.html +++ b/website/admin.html @@ -122,7 +122,7 @@ function getReadableHashRateString(hashrate) { hashrate = hashrate || 0; var i = 0; - var byteUnits = [' H', ' KH', ' MH', ' GH', ' TH', ' PH' ]; + var byteUnits = [' H', ' kH', ' MH', ' GH', ' TH', ' PH', ' EH', ' ZH', ' YH' ]; while(hashrate > 1000) { hashrate = hashrate / 1000; i++; diff --git a/website/config.js b/website/config.js index 0ef0f2763..31cea55cc 100644 --- a/website/config.js +++ b/website/config.js @@ -49,7 +49,8 @@ var networkStat = { ["krb.sberex.com", "http://krb.sberex.com:7006"], ["krb.crypto-coins.club", "http://krb.crypto-coins.club:8118"], ["krb.cryptonotepool.com", "http://5.189.135.137:8618"], - ["krbpool.ml", "http://krbpool.ml:8117"] + ["krbpool.ml", "http://krbpool.ml:8117"], + ["mine4all.pp.ua", "http://mine4all.pp.ua:8877"] ], "qcn": [ ["qcn.mypool.online", "http://qcn.mypool.online:23084"] diff --git a/website/index.html b/website/index.html index f8f1cbd69..599e81941 100644 --- a/website/index.html +++ b/website/index.html @@ -161,7 +161,7 @@ function getReadableHashRateString(hashrate){ var i = 0; - var byteUnits = [' H', ' KH', ' MH', ' GH', ' TH', ' PH' ]; + var byteUnits = [' H', ' kH', ' MH', ' GH', ' TH', ' PH', ' EH', ' ZH', ' YH' ]; while (hashrate > 1000){ hashrate = hashrate / 1000; i++; @@ -169,6 +169,17 @@ return hashrate.toFixed(2) + byteUnits[i]; } + function getReadableDifficultyString(difficulty){ + if (difficulty < 1000) return difficulty.toString(); + var i = 0; + var byteUnits = [' ', ' K', ' M', ' G', ' T', ' P', ' E', ' Z', ' Y' ]; + while (difficulty > 1000){ + difficulty = difficulty / 1000; + i++; + } + return difficulty.toFixed(2) + byteUnits[i]; + } + function formatBlockLink(hash){ return '' + hash + ''; } diff --git a/website/pages/blockchain_blocks.html b/website/pages/blockchain_blocks.html index 446ec2d50..dece645a9 100644 --- a/website/pages/blockchain_blocks.html +++ b/website/pages/blockchain_blocks.html @@ -148,7 +148,7 @@ update: function(){ updateText('networkLastReward', lastStats.network.height.toString()); updateText('networkHashrate', getReadableHashRateString(lastStats.network.difficulty / lastStats.config.coinDifficultyTarget) + '/sec'); - updateText('networkDifficulty', lastStats.network.difficulty.toString()); + updateText('networkDifficulty', getReadableDifficultyString(lastStats.network.difficulty)); renderInitialBlocks(); } }; diff --git a/website/pages/home.html b/website/pages/home.html index ea7fa49e2..cc3a3e389 100644 --- a/website/pages/home.html +++ b/website/pages/home.html @@ -216,11 +216,11 @@

Estimate Mining Profits

@@ -317,7 +317,7 @@

Payments

$('#networkLastBlockFound').timeago('update', new Date(lastStats.network.timestamp * 1000).toISOString()); updateText('networkHashrate', getReadableHashRateString(lastStats.network.difficulty / lastStats.config.coinDifficultyTarget) + '/sec'); - updateText('networkDifficulty', lastStats.network.difficulty.toString()); + updateText('networkDifficulty', getReadableDifficultyString(lastStats.network.difficulty)); updateText('blockchainHeight', lastStats.network.height.toString()); updateText('networkLastReward', getReadableCoins(lastStats.network.reward, 4)); updateText('lastHash', lastStats.network.hash.substr(0, 13) + '...').setAttribute('href', getBlockchainUrl(lastStats.network.hash));