reenable not discarding own shares based on block staleness
authorForrest Voight <forrest@forre.st>
Sat, 27 Aug 2011 03:32:04 +0000 (23:32 -0400)
committerForrest Voight <forrest@forre.st>
Sat, 27 Aug 2011 03:32:04 +0000 (23:32 -0400)
p2pool/data.py

index ab6a3fd..faf00af 100644 (file)
@@ -423,7 +423,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! %x < %x' % (best_share.header['previous_block'], previous_block)
                 best = best_share.previous_hash