dynamically adjust share difficulty to prevent payouts below dust threshold

[p2pool.git] / p2pool / web.py

diff --git a/p2pool/web.py b/p2pool/web.py
index 2cb7ee8..e3c6330 100644 (file)
--- a/p2pool/web.py
+++ b/p2pool/web.py
@@ -91,16 +91,6 @@ def get_web_root(wb, datadir_path, bitcoind_warning_var, stop_event=variable.Eve
             if bitcoin_data.script2_to_address(script, node.net.PARENT) is not None
         ))
     
-    def get_local_rates():
-        miner_hash_rates = {}
-        miner_dead_hash_rates = {}
-        datums, dt = wb.local_rate_monitor.get_datums_in_last()
-        for datum in datums:
-            miner_hash_rates[datum['user']] = miner_hash_rates.get(datum['user'], 0) + datum['work']/dt
-            if datum['dead']:
-                miner_dead_hash_rates[datum['user']] = miner_dead_hash_rates.get(datum['user'], 0) + datum['work']/dt
-        return miner_hash_rates, miner_dead_hash_rates
-    
     def get_global_stats():
         # averaged over last hour
         if node.tracker.get_height(node.best_share_var.value) < 10:
@@ -138,7 +128,7 @@ def get_web_root(wb, datadir_path, bitcoind_warning_var, stop_event=variable.Eve
             node.tracker.items[node.tracker.get_nth_parent_hash(node.best_share_var.value, lookbehind - 1)].timestamp)
         share_att_s = my_work / actual_time
         
-        miner_hash_rates, miner_dead_hash_rates = get_local_rates()
+        miner_hash_rates, miner_dead_hash_rates = wb.get_local_rates()
         (stale_orphan_shares, stale_doa_shares), shares, _ = wb.get_stale_counts()
         
         return dict(
@@ -251,7 +241,7 @@ def get_web_root(wb, datadir_path, bitcoind_warning_var, stop_event=variable.Eve
         
         global_stale_prop = p2pool_data.get_average_stale_prop(node.tracker, node.best_share_var.value, lookbehind)
         (stale_orphan_shares, stale_doa_shares), shares, _ = wb.get_stale_counts()
-        miner_hash_rates, miner_dead_hash_rates = get_local_rates()
+        miner_hash_rates, miner_dead_hash_rates = wb.get_local_rates()
         
         stat_log.append(dict(
             time=time.time(),
@@ -429,7 +419,7 @@ def get_web_root(wb, datadir_path, bitcoind_warning_var, stop_event=variable.Eve
         
         current_txouts = node.get_current_txouts()
         hd.datastreams['current_payout'].add_datum(t, current_txouts.get(bitcoin_data.pubkey_hash_to_script2(wb.my_pubkey_hash), 0)*1e-8)
-        miner_hash_rates, miner_dead_hash_rates = get_local_rates()
+        miner_hash_rates, miner_dead_hash_rates = wb.get_local_rates()
         current_txouts_by_address = dict((bitcoin_data.script2_to_address(script, node.net.PARENT), amount) for script, amount in current_txouts.iteritems())
         hd.datastreams['current_payouts'].add_datum(t, dict((user, current_txouts_by_address[user]*1e-8) for user in miner_hash_rates if user in current_txouts_by_address))