LBRYFoundation/pool
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/pool.git synced 2025-09-21 02:19:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stats: remove stake blocks from pool blocks count

Browse source
This commit is contained in:
Tanguy Pruvot 2016-03-17 08:29:48 +01:00
parent 1a625a3869
commit 12fd0d0b6c
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/yaamp/modules/site/results/current_results.php
View file

@ -94,7 +94,9 @@ foreach($algos as $item)
$avgprice = $avgprice? mbitcoinvaluetoa(take_yaamp_fee($avgprice, $algo)): '-';
$total1 = controller()->memcache->get_database_scalar("current_total-$algo",
"select sum(amount*price) from blocks where category!='orphan' and time>$t and algo=:algo", array(':algo'=>$algo));
"SELECT SUM(amount*price) AS total FROM blocks WHERE time>$t AND algo=:algo AND NOT category IN ('orphan','stake','generated')",
array(':algo'=>$algo)
);
$hashrate1 = controller()->memcache->get_database_scalar("current_hashrate1-$algo",
"select avg(hashrate) from hashrate where time>$t and algo=:algo", array(':algo'=>$algo));

12
web/yaamp/modules/site/results/history_results.php
View file

@ -25,7 +25,7 @@ td.symb {
<tr>
<th></th>
<th>Name</th>
<th class="symb">Sym.</th>
<th class="symb">Symbol</th>
<th align=right>Last Hour</th>
<th align=right>Last 24 Hours</th>
<th align=right>Last 7 Days</th>
@ -48,7 +48,7 @@ $main_ids = array();
$algo = user()->getState('yaamp-algo');
$list = dbolist("SELECT coin_id FROM blocks WHERE coin_id IN (select id from coins where algo=:algo and enable=1 and visible=1)
AND time>$t4 AND category!='orphan' GROUP BY coin_id ORDER BY coin_id DESC",
AND time>$t4 AND NOT category IN ('orphan','stake','generated') GROUP BY coin_id ORDER BY coin_id DESC",
array(':algo'=>$algo)
);
@ -62,19 +62,19 @@ foreach($list as $item)
if($coin->symbol == 'BTC') continue;
$res1 = controller()->memcache->get_database_row("history_item1-$id-$algo",
"SELECT COUNT(*) as a, SUM(amount*price) as b FROM blocks WHERE coin_id=$id AND category!='orphan' AND time>$t1 AND algo=:algo",
"SELECT COUNT(id) as a, SUM(amount*price) as b FROM blocks WHERE coin_id=$id AND NOT category IN ('orphan','stake','generated') AND time>$t1 AND algo=:algo",
array(':algo'=>$algo));
$res2 = controller()->memcache->get_database_row("history_item2-$id-$algo",
"SELECT COUNT(*) as a, SUM(amount*price) as b FROM blocks WHERE coin_id=$id AND category!='orphan' AND time>$t2 AND algo=:algo",
"SELECT COUNT(id) as a, SUM(amount*price) as b FROM blocks WHERE coin_id=$id AND NOT category IN ('orphan','stake','generated') AND time>$t2 AND algo=:algo",
array(':algo'=>$algo));
$res3 = controller()->memcache->get_database_row("history_item3-$id-$algo",
"SELECT COUNT(*) as a, SUM(amount*price) as b FROM blocks WHERE coin_id=$id AND category!='orphan' AND time>$t3 AND algo=:algo",
"SELECT COUNT(id) as a, SUM(amount*price) as b FROM blocks WHERE coin_id=$id AND NOT category IN ('orphan','stake','generated') AND time>$t3 AND algo=:algo",
array(':algo'=>$algo));
$res4 = controller()->memcache->get_database_row("history_item4-$id-$algo",
"SELECT COUNT(*) as a, SUM(amount*price) as b FROM blocks WHERE coin_id=$id AND category!='orphan' AND time>$t4 AND algo=:algo",
"SELECT COUNT(id) as a, SUM(amount*price) as b FROM blocks WHERE coin_id=$id AND NOT category IN ('orphan','stake','generated') AND time>$t4 AND algo=:algo",
array(':algo'=>$algo));
$total1 += $res1['b'];