don't display meaningless "punishing share for 'not all txs present'" message at...

[p2pool.git] / p2pool / data.py

diff --git a/p2pool/data.py b/p2pool/data.py
index 9995e6b..d326fa9 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -311,7 +311,8 @@ class NewNewShare(object):
         return gentx # only used by as_block
     
     def get_other_tx_hashes(self, tracker):
-        if tracker.get_height(self.hash) <= max(x['share_count'] for x in self.share_info['transaction_hash_refs']):
+        parents = tracker.get_height(self.hash) - 1
+        if not all(x['share_count'] <= parents for x in self.share_info['transaction_hash_refs']):
             return None
         return [tracker.items[tracker.get_nth_parent_hash(self.hash, x['share_count'])].share_info['new_transaction_hashes'][x['tx_count']] for x in self.share_info['transaction_hash_refs']]
     
@@ -334,7 +335,8 @@ class NewNewShare(object):
         
         other_txs = self._get_other_txs(tracker, known_txs)
         if other_txs is None:
-            return True, 'not all txs present'
+            if self.time_seen is not None: # ignore if loaded from ShareStore
+                return True, 'not all txs present'
         else:
             all_txs_size = sum(bitcoin_data.tx_type.packed_size(tx) for tx in other_txs)
             if all_txs_size > 1000000:
@@ -853,7 +855,8 @@ class NewShare(object):
         return gentx # only used by as_block
     
     def get_other_tx_hashes(self, tracker):
-        if tracker.get_height(self.hash) <= max(x['share_count'] for x in self.share_info['transaction_hash_refs']):
+        parents = tracker.get_height(self.hash) - 1
+        if not all(x['share_count'] <= parents for x in self.share_info['transaction_hash_refs']):
             return None
         return [tracker.items[tracker.get_nth_parent_hash(self.hash, x['share_count'])].share_info['new_transaction_hashes'][x['tx_count']] for x in self.share_info['transaction_hash_refs']]
     
@@ -1129,9 +1132,8 @@ def get_warnings(tracker, best_share, net, bitcoind_warning, bitcoind_work_value
                 majority_desired_version, 100*desired_version_counts[majority_desired_version]/sum(desired_version_counts.itervalues())))
     
     if bitcoind_warning is not None:
-        if 'This is a pre-release test build' in bitcoind_warning:
-            pass
-        res.append('(from bitcoind) %s' % (bitcoind_warning,))
+        if 'This is a pre-release test build' not in bitcoind_warning:
+            res.append('(from bitcoind) %s' % (bitcoind_warning,))
     
     if time.time() > bitcoind_work_value['last_update'] + 60:
         res.append('''LOST CONTACT WITH BITCOIND for %s! Check that it isn't frozen or dead!''' % (math.format_dt(time.time() - bitcoind_work_value['last_update']),))