From f42d4205618de9847bec2bcec354a4928d294d83 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 22 Oct 2013 16:17:12 +0200 Subject: [PATCH 1/3] [FIX] Contirbutor detection Fixes #745 once merged. --- .../templates/mmcFE/statistics/pool/contributors_hashrate.tpl | 2 +- public/templates/mmcFE/statistics/pool/contributors_shares.tpl | 2 +- public/templates/mpos/statistics/pool/contributors_hashrate.tpl | 2 +- public/templates/mpos/statistics/pool/contributors_shares.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl b/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl index 212a4695..5be84abe 100644 --- a/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl @@ -15,7 +15,7 @@ {assign var=listed value=0} {section contrib $CONTRIBHASHES} {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} - + {$rank++} {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} {($CONTRIBHASHES[contrib].hashrate * $GLOBAL.hashmods.personal)|number_format:"2"} diff --git a/public/templates/mmcFE/statistics/pool/contributors_shares.tpl b/public/templates/mmcFE/statistics/pool/contributors_shares.tpl index 6dd36eb8..948d2abf 100644 --- a/public/templates/mmcFE/statistics/pool/contributors_shares.tpl +++ b/public/templates/mmcFE/statistics/pool/contributors_shares.tpl @@ -12,7 +12,7 @@ {assign var=rank value=1} {assign var=listed value=0} {section shares $CONTRIBSHARES} - + {$rank++} {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} {$CONTRIBSHARES[shares].shares|number_format} diff --git a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl index aa121749..6f738777 100644 --- a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl @@ -17,7 +17,7 @@ {assign var=listed value=0} {section contrib $CONTRIBHASHES} {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} - + {$rank++} {if $CONTRIBHASHES[contrib].donate_percent > 0}{/if} {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} diff --git a/public/templates/mpos/statistics/pool/contributors_shares.tpl b/public/templates/mpos/statistics/pool/contributors_shares.tpl index 5af2b911..e4a0194a 100644 --- a/public/templates/mpos/statistics/pool/contributors_shares.tpl +++ b/public/templates/mpos/statistics/pool/contributors_shares.tpl @@ -13,7 +13,7 @@ {assign var=rank value=1} {assign var=listed value=0} {section shares $CONTRIBSHARES} - + {$rank++} {if $CONTRIBSHARES[shares].donate_percent > 0}{/if} {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} From d3d183cfe0cecbf69d49eb1d5c2f8be4537d5d86 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 22 Oct 2013 16:27:37 +0200 Subject: [PATCH 2/3] [FIX] Next attempt to fix #745 --- .../templates/mmcFE/statistics/pool/contributors_hashrate.tpl | 2 +- public/templates/mmcFE/statistics/pool/contributors_shares.tpl | 2 +- public/templates/mpos/statistics/pool/contributors_hashrate.tpl | 2 +- public/templates/mpos/statistics/pool/contributors_shares.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl b/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl index 5be84abe..f971fcc3 100644 --- a/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl @@ -15,7 +15,7 @@ {assign var=listed value=0} {section contrib $CONTRIBHASHES} {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} - + {$rank++} {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} {($CONTRIBHASHES[contrib].hashrate * $GLOBAL.hashmods.personal)|number_format:"2"} diff --git a/public/templates/mmcFE/statistics/pool/contributors_shares.tpl b/public/templates/mmcFE/statistics/pool/contributors_shares.tpl index 948d2abf..a628c75b 100644 --- a/public/templates/mmcFE/statistics/pool/contributors_shares.tpl +++ b/public/templates/mmcFE/statistics/pool/contributors_shares.tpl @@ -12,7 +12,7 @@ {assign var=rank value=1} {assign var=listed value=0} {section shares $CONTRIBSHARES} - + {$rank++} {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} {$CONTRIBSHARES[shares].shares|number_format} diff --git a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl index 6f738777..9c9142f7 100644 --- a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl @@ -17,7 +17,7 @@ {assign var=listed value=0} {section contrib $CONTRIBHASHES} {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} - + {$rank++} {if $CONTRIBHASHES[contrib].donate_percent > 0}{/if} {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} diff --git a/public/templates/mpos/statistics/pool/contributors_shares.tpl b/public/templates/mpos/statistics/pool/contributors_shares.tpl index e4a0194a..4032007d 100644 --- a/public/templates/mpos/statistics/pool/contributors_shares.tpl +++ b/public/templates/mpos/statistics/pool/contributors_shares.tpl @@ -13,7 +13,7 @@ {assign var=rank value=1} {assign var=listed value=0} {section shares $CONTRIBSHARES} - + {$rank++} {if $CONTRIBSHARES[shares].donate_percent > 0}{/if} {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} From f4c68d721bf4243c6199b745aaff6a50efc744b9 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 22 Oct 2013 16:45:53 +0200 Subject: [PATCH 3/3] Revert "[FIX] Next attempt to fix #745" This reverts commit d3d183cfe0cecbf69d49eb1d5c2f8be4537d5d86. --- .../templates/mmcFE/statistics/pool/contributors_hashrate.tpl | 2 +- public/templates/mmcFE/statistics/pool/contributors_shares.tpl | 2 +- public/templates/mpos/statistics/pool/contributors_hashrate.tpl | 2 +- public/templates/mpos/statistics/pool/contributors_shares.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl b/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl index f971fcc3..5be84abe 100644 --- a/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl @@ -15,7 +15,7 @@ {assign var=listed value=0} {section contrib $CONTRIBHASHES} {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} - + {$rank++} {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} {($CONTRIBHASHES[contrib].hashrate * $GLOBAL.hashmods.personal)|number_format:"2"} diff --git a/public/templates/mmcFE/statistics/pool/contributors_shares.tpl b/public/templates/mmcFE/statistics/pool/contributors_shares.tpl index a628c75b..948d2abf 100644 --- a/public/templates/mmcFE/statistics/pool/contributors_shares.tpl +++ b/public/templates/mmcFE/statistics/pool/contributors_shares.tpl @@ -12,7 +12,7 @@ {assign var=rank value=1} {assign var=listed value=0} {section shares $CONTRIBSHARES} - + {$rank++} {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} {$CONTRIBSHARES[shares].shares|number_format} diff --git a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl index 9c9142f7..6f738777 100644 --- a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl @@ -17,7 +17,7 @@ {assign var=listed value=0} {section contrib $CONTRIBHASHES} {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} - + {$rank++} {if $CONTRIBHASHES[contrib].donate_percent > 0}{/if} {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} diff --git a/public/templates/mpos/statistics/pool/contributors_shares.tpl b/public/templates/mpos/statistics/pool/contributors_shares.tpl index 4032007d..e4a0194a 100644 --- a/public/templates/mpos/statistics/pool/contributors_shares.tpl +++ b/public/templates/mpos/statistics/pool/contributors_shares.tpl @@ -13,7 +13,7 @@ {assign var=rank value=1} {assign var=listed value=0} {section shares $CONTRIBSHARES} - + {$rank++} {if $CONTRIBSHARES[shares].donate_percent > 0}{/if} {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if}