From fddb346a159ac06fbfa719a91aba1d373e89a240 Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Tue, 21 Nov 2017 00:53:57 +0200 Subject: [PATCH 01/15] Better readable network difficulty When difficulty is 1598298868 (for example) it's not readable. 1.49 GH is much better to read. --- website/pages/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/pages/home.html b/website/pages/home.html index ea7fa49e2..628d17fae 100644 --- a/website/pages/home.html +++ b/website/pages/home.html @@ -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', getReadableHashRateString(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)); From a24288a5be1e563f6278a73313d06a937f9226eb Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Tue, 21 Nov 2017 00:55:21 +0200 Subject: [PATCH 02/15] Update config.js --- website/config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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"] From 00dcf3a0aa1bcd9e0235f9b15941d31432b88167 Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Tue, 21 Nov 2017 00:58:25 +0200 Subject: [PATCH 03/15] Update home.html --- website/pages/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/pages/home.html b/website/pages/home.html index 628d17fae..68e469a2f 100644 --- a/website/pages/home.html +++ b/website/pages/home.html @@ -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', getReadableHashRateString(lastStats.network.difficulty); + updateText('networkDifficulty', getReadableHashRateString(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)); From b7a7af873f4a279484c98f4783dabda0996d6570 Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Tue, 21 Nov 2017 01:24:09 +0200 Subject: [PATCH 04/15] Update blockchain_blocks.html --- website/pages/blockchain_blocks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/pages/blockchain_blocks.html b/website/pages/blockchain_blocks.html index 446ec2d50..acae8c2b0 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', getReadableHashRateString(lastStats.network.difficulty)); renderInitialBlocks(); } }; From e7112e22a7068104dfbd997f223fb2f8e11c9fa7 Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Wed, 22 Nov 2017 16:14:25 +0200 Subject: [PATCH 05/15] Correct readable hash rate calculation The denomination of hash rates follows the International System of Units (SI) https://bitcoin.stackexchange.com/a/21498 --- website/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/index.html b/website/index.html index f8f1cbd69..2c2f45e9b 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++; From 57c8f993816cb0d6dd6ade86d3bb27381fbe9fcd Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Fri, 24 Nov 2017 03:24:17 +0200 Subject: [PATCH 06/15] Correct readable hash rate calculation The denomination of hash rates follows the International System of Units (SI) https://bitcoin.stackexchange.com/a/21498 --- website/admin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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++; From 0f10221bf41967cdc6cd26793692385d9f2737db Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Sat, 25 Nov 2017 00:37:02 +0200 Subject: [PATCH 07/15] Update home.html --- website/pages/home.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/pages/home.html b/website/pages/home.html index 68e469a2f..95e816ce6 100644 --- a/website/pages/home.html +++ b/website/pages/home.html @@ -216,11 +216,11 @@

Estimate Mining Profits

From 8861f4de59ebcc4794cb91ac4587cc4717c745d8 Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Sat, 25 Nov 2017 01:38:44 +0200 Subject: [PATCH 08/15] getReadableDifficultyString Created function to get readable difficulty string --- website/index.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/website/index.html b/website/index.html index 2c2f45e9b..b41cbc50d 100644 --- a/website/index.html +++ b/website/index.html @@ -169,6 +169,17 @@ return hashrate.toFixed(2) + byteUnits[i]; } + function getReadableDifficultyString(difficulty){ + if difficulty < 1000 return difficulty; + var i = 0; + var byteUnits = [' ', ' k', ' M', ' G', ' T', ' P', ' E', ' Z', ' Y' ]; + while (difficulty > 1000){ + difficulty = difficulty / 1000; + i++; + } + return hashrate.toFixed(2) + byteUnits[i]; + } + function formatBlockLink(hash){ return '' + hash + ''; } From 137407c4d06e61e055c1a3ed7e50c69e44ce417e Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Sat, 25 Nov 2017 01:41:58 +0200 Subject: [PATCH 09/15] Update home.html --- website/pages/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/pages/home.html b/website/pages/home.html index 95e816ce6..cc3a3e389 100644 --- a/website/pages/home.html +++ b/website/pages/home.html @@ -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', getReadableHashRateString(lastStats.network.difficulty)); + 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)); From 51a28b935334a7cf635e2722ea85f80fd85b7af5 Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Sat, 25 Nov 2017 01:43:03 +0200 Subject: [PATCH 10/15] Update blockchain_blocks.html --- website/pages/blockchain_blocks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/pages/blockchain_blocks.html b/website/pages/blockchain_blocks.html index acae8c2b0..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', getReadableHashRateString(lastStats.network.difficulty)); + updateText('networkDifficulty', getReadableDifficultyString(lastStats.network.difficulty)); renderInitialBlocks(); } }; From fff2d752f47f6e3b55f7c26d9e40a525346e71e1 Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Sat, 25 Nov 2017 01:46:10 +0200 Subject: [PATCH 11/15] Update index.html --- website/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/index.html b/website/index.html index b41cbc50d..fbacf0d22 100644 --- a/website/index.html +++ b/website/index.html @@ -170,7 +170,7 @@ } function getReadableDifficultyString(difficulty){ - if difficulty < 1000 return difficulty; + if difficulty < 1000 return difficulty.toString(); var i = 0; var byteUnits = [' ', ' k', ' M', ' G', ' T', ' P', ' E', ' Z', ' Y' ]; while (difficulty > 1000){ From bf71dc8d2862c689d9e291a673087b3d5df8b6af Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Sat, 25 Nov 2017 04:03:21 +0200 Subject: [PATCH 12/15] Update index.html --- website/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/index.html b/website/index.html index fbacf0d22..c34afea47 100644 --- a/website/index.html +++ b/website/index.html @@ -170,7 +170,7 @@ } function getReadableDifficultyString(difficulty){ - if difficulty < 1000 return difficulty.toString(); + if (difficulty < 1000) return difficulty.toString(); var i = 0; var byteUnits = [' ', ' k', ' M', ' G', ' T', ' P', ' E', ' Z', ' Y' ]; while (difficulty > 1000){ From f58023adb2e98a5fa1c02c934c222d82db64af02 Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Sat, 25 Nov 2017 04:08:57 +0200 Subject: [PATCH 13/15] Update index.html --- website/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/index.html b/website/index.html index c34afea47..4871fe312 100644 --- a/website/index.html +++ b/website/index.html @@ -177,7 +177,7 @@ difficulty = difficulty / 1000; i++; } - return hashrate.toFixed(2) + byteUnits[i]; + return difficulty.toFixed(2) + byteUnits[i]; } function formatBlockLink(hash){ From 4ab1c4b57c8ebfd2307c236d0630488b589e8e9c Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Sat, 25 Nov 2017 06:13:09 +0200 Subject: [PATCH 14/15] Update api.js --- lib/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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++; From e05a38ee773ad186f47496b5b54f043a991bc40e Mon Sep 17 00:00:00 2001 From: Anton Berezianskyi Date: Sat, 25 Nov 2017 06:14:49 +0200 Subject: [PATCH 15/15] Update index.html --- website/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/index.html b/website/index.html index 4871fe312..599e81941 100644 --- a/website/index.html +++ b/website/index.html @@ -172,7 +172,7 @@ function getReadableDifficultyString(difficulty){ if (difficulty < 1000) return difficulty.toString(); var i = 0; - var byteUnits = [' ', ' k', ' M', ' G', ' T', ' P', ' E', ' Z', ' Y' ]; + var byteUnits = [' ', ' K', ' M', ' G', ' T', ' P', ' E', ' Z', ' Y' ]; while (difficulty > 1000){ difficulty = difficulty / 1000; i++;