determine console hash rate lookback based on SHARE_PERIOD instead of constant

diff --git a/p2pool/main.py b/p2pool/main.py
index 19848d8..0fab48d 100644 (file)
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -796,8 +796,8 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
                     
                     if height > 2:
                         (stale_orphan_shares, stale_doa_shares), shares, _ = get_stale_counts()
-                        stale_prop = p2pool_data.get_average_stale_prop(tracker, current_work.value['best_share_hash'], min(720, height))
-                        real_att_s = p2pool_data.get_pool_attempts_per_second(tracker, current_work.value['best_share_hash'], min(height - 1, 720)) / (1 - stale_prop)
+                        stale_prop = p2pool_data.get_average_stale_prop(tracker, current_work.value['best_share_hash'], min(60*60//net.SHARE_PERIOD, height))
+                        real_att_s = p2pool_data.get_pool_attempts_per_second(tracker, current_work.value['best_share_hash'], min(height - 1, 60*60//net.SHARE_PERIOD)) / (1 - stale_prop)
                         
                         this_str += '\n Shares: %i (%i orphan, %i dead) Stale rate: %s Efficiency: %s Current payout: %.4f %s' % (
                             shares, stale_orphan_shares, stale_doa_shares,