prefer own bitcoin-stales to others' older shares, just because it makes the orphanin...

diff --git a/p2pool/data.py b/p2pool/data.py
index a4e9976..1c41329 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -345,7 +345,7 @@ class OkayTracker(forest.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)))),
             #self.verified.shares[h].peer is None,
-            ht.get_height_rel_highest(self.verified.shares[h].previous_block),
+            0 if self.verified.shares[h].peer is None else ht.get_height_rel_highest(self.verified.shares[h].previous_block),
             -self.verified.shares[h].time_seen
         ))
         
@@ -358,7 +358,7 @@ class OkayTracker(forest.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)))),
                     self.verified.shares[h].peer is None,
-                    ht.get_height_rel_highest(self.verified.shares[h].previous_block),
+                    0 if self.verified.shares[h].peer is None else ht.get_height_rel_highest(self.verified.shares[h].previous_block),
                     -self.verified.shares[h].time_seen
                 )