Revert "reduce aggression; will make stales more fair now and will be reenabled later"

This reverts commit e768452743d62bf0ac88bd0adefad40ebd6121d7.

diff --git a/p2pool/data.py b/p2pool/data.py
index bf57acf..3157efc 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -365,7 +365,7 @@ class OkayTracker(bitcoin_data.Tracker):
         scores = sorted(self.verified.tails.get(best_tail, []), key=lambda h: (
             self.verified.get_work(self.verified.get_nth_parent_hash(h, min(5, self.verified.get_height(h)))),
             ht.get_min_height(self.verified.shares[h].previous_block),
-            #self.verified.shares[h].peer is None,
+            self.verified.shares[h].peer is None,
             -self.verified.shares[h].time_seen
         ))
         
@@ -376,7 +376,7 @@ class OkayTracker(bitcoin_data.Tracker):
                 print '   ', format_hash(h), format_hash(self.verified.shares[h].previous_hash), (
                     self.verified.get_work(self.verified.get_nth_parent_hash(h, min(5, self.verified.get_height(h)))),
                     ht.get_min_height(self.verified.shares[h].previous_block),
-                    #self.verified.shares[h].peer is None,
+                    self.verified.shares[h].peer is None,
                     -self.verified.shares[h].time_seen
                 )
         
@@ -395,7 +395,7 @@ class OkayTracker(bitcoin_data.Tracker):
         
         if best is not None:
             best_share = self.verified.shares[best]
-            if ht.get_min_height(best_share.header['previous_block']) < ht.get_min_height(previous_block) and best_share.bitcoin_hash != previous_block: # and best_share.peer is not None:
+            if ht.get_min_height(best_share.header['previous_block']) < ht.get_min_height(previous_block) and best_share.bitcoin_hash != previous_block and best_share.peer is not None:
                 if p2pool.DEBUG:
                     print 'Stale detected!'
                 best = best_share.previous_hash