display current version on web

[p2pool.git] / p2pool / web.py

diff --git a/p2pool/web.py b/p2pool/web.py
index f30485f..0205c52 100644 (file)
--- a/p2pool/web.py
+++ b/p2pool/web.py
@@ -10,6 +10,7 @@ from twisted.internet import task
 from twisted.python import log
 from twisted.web import resource, static
 
+import p2pool
 from bitcoin import data as bitcoin_data
 from . import data as p2pool_data
 from util import graph, math
@@ -43,7 +44,7 @@ def _atomic_write(filename, data):
         os.remove(filename)
         os.rename(filename + '.new', filename)
 
-def get_web_root(tracker, current_work, current_work2, get_current_txouts, datadir_path, net, get_stale_counts, my_pubkey_hash, local_rate_monitor, worker_fee, p2p_node, my_share_hashes, pseudoshare_received, share_received):
+def get_web_root(tracker, current_work, get_current_txouts, datadir_path, net, get_stale_counts, my_pubkey_hash, local_rate_monitor, worker_fee, p2p_node, my_share_hashes, pseudoshare_received, share_received):
     start_time = time.time()
     
     web_root = resource.Resource()
@@ -171,7 +172,7 @@ def get_web_root(tracker, current_work, current_work2, get_current_txouts, datad
                 dead=stale_doa_shares,
             ),
             uptime=time.time() - start_time,
-            block_value=current_work2.value['subsidy']*1e-8,
+            block_value=current_work.value['subsidy']*1e-8,
             warnings=p2pool_data.get_warnings(tracker, current_work, net),
         )
     
@@ -242,7 +243,7 @@ def get_web_root(tracker, current_work, current_work2, get_current_txouts, datad
             ),
             attempts_to_share=bitcoin_data.target_to_average_attempts(tracker.shares[current_work.value['best_share_hash']].max_target),
             attempts_to_block=bitcoin_data.target_to_average_attempts(current_work.value['bits'].target),
-            block_value=current_work2.value['subsidy']*1e-8,
+            block_value=current_work.value['subsidy']*1e-8,
         ))
         
         with open(os.path.join(datadir_path, 'stats'), 'wb') as f:
@@ -302,6 +303,7 @@ def get_web_root(tracker, current_work, current_work2, get_current_txouts, datad
         block_explorer_url_prefix=net.PARENT.BLOCK_EXPLORER_URL_PREFIX,
         address_explorer_url_prefix=net.PARENT.ADDRESS_EXPLORER_URL_PREFIX,
     )))
+    new_root.putChild('version', WebInterface(lambda: p2pool.__version__))
     
     hd_path = os.path.join(datadir_path, 'graph_db')
     hd_data = _atomic_read(hd_path)
@@ -330,17 +332,18 @@ def get_web_root(tracker, current_work, current_work2, get_current_txouts, datad
             def get_value(obj, t):
                 n = int((obj['last_bin_end'] - t)/dv_desc.bin_width)
                 if n < 0 or n >= dv_desc.bin_count:
-                    return None
+                    return None, 0
                 total, count = obj['bins'][n].get('null', [0, 0])
                 if count == 0:
-                    return None
-                return total/count
+                    return None, 0
+                return total/count, count
             def get_bin(t):
-                total = get_value(pool_rate, t)
-                bad = get_value(pool_stale_rate, t)
+                total, total_count = get_value(pool_rate, t)
+                bad, bad_count = get_value(pool_stale_rate, t)
                 if total is None or bad is None:
                     return {}
-                return dict(good=[total-bad, 1], bad=[bad, 1])
+                count = int((total_count+bad_count)/2+1/2)
+                return dict(good=[(total-bad)*count, count], bad=[bad*count, count], null=[0, count])
             bins = [get_bin(last_bin_end - (i+1/2)*dv_desc.bin_width) for i in xrange(dv_desc.bin_count)]
         return graph.DataView(dv_desc, ds_desc, last_bin_end, bins)
     hd = graph.HistoryDatabase.from_obj({