X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=p2pool%2Fweb.py;h=f342460394cf51a9d326e596d1dc2223ef7c76ec;hb=e4d5a81540a34f0a415ddc75653b755b88602fc0;hp=cc80a07110bbcffe3877129e8f19cb13f39c9713;hpb=2a6efdafd9c0830bafd25f227d1076fb90af57aa;p=p2pool.git diff --git a/p2pool/web.py b/p2pool/web.py index cc80a07..f342460 100644 --- a/p2pool/web.py +++ b/p2pool/web.py @@ -86,7 +86,7 @@ def get_web_root(wb, datadir_path, bitcoind_warning_var, stop_event=variable.Eve total = int(float(total)*1e8) trunc = int(float(trunc)*1e8) return json.dumps(dict( - (bitcoin_data.script2_to_address(script, node.net.PARENT), value/1e8) + (bitcoin_data.script2_to_address(script, node.net.PARENT), value/1e6) for script, value in get_current_scaled_txouts(total, trunc).iteritems() if bitcoin_data.script2_to_address(script, node.net.PARENT) is not None )) @@ -204,7 +204,7 @@ def get_web_root(wb, datadir_path, bitcoind_warning_var, stop_event=variable.Eve web_root.putChild('user_stales', WebInterface(lambda: dict((bitcoin_data.pubkey_to_address(ph, node.net.PARENT), prop) for ph, prop in p2pool_data.get_user_stale_props(node.tracker, node.best_share_var.value, node.tracker.get_height(node.best_share_var.value)).iteritems()))) web_root.putChild('fee', WebInterface(lambda: wb.worker_fee)) - web_root.putChild('current_payouts', WebInterface(lambda: dict((bitcoin_data.script2_to_address(script, node.net.PARENT), value/1e8) for script, value in node.get_current_txouts().iteritems()))) + web_root.putChild('current_payouts', WebInterface(lambda: dict((bitcoin_data.script2_to_address(script, node.net.PARENT), value/1e6) for script, value in node.get_current_txouts().iteritems()))) web_root.putChild('patron_sendmany', WebInterface(get_patron_sendmany, 'text/plain')) web_root.putChild('global_stats', WebInterface(get_global_stats)) web_root.putChild('local_stats', WebInterface(get_local_stats))