review changes

Author: glevco

hathor/consensus/consensus.py

@@ -24,11 +24,12 @@
 from hathor.consensus.transaction_consensus import TransactionConsensusAlgorithmFactory
 from hathor.execution_manager import non_critical_code
 from hathor.feature_activation.feature import Feature
+from hathor.nanocontracts.exception import NCInvalidSignature
 from hathor.nanocontracts.execution import NCBlockExecutor
 from hathor.profiler import get_cpu_profiler
 from hathor.pubsub import HathorEvents, PubSubManager
 from hathor.transaction import BaseTransaction, Block, Transaction
-from hathor.transaction.exceptions import RewardLocked
+from hathor.transaction.exceptions import InvalidInputData, RewardLocked, TooManySigOps
 from hathor.util import not_none
 from hathor.verification.verification_params import VerificationParams
 
@@ -495,7 +496,9 @@ def _checkdatasig_count_rule(self, tx: Transaction) -> bool:
         # a fail and the tx will be removed from the mempool.
         try:
             VertexVerifier._verify_sigops_output(settings=self._settings, vertex=tx, enable_checkdatasig_count=True)
-        except Exception:
+        except Exception as e:
+            if not isinstance(e, TooManySigOps):
+                self.log.exception('unexpected exception in mempool-reverification')
             return False
         return True
 
@@ -513,15 +516,19 @@ def _opcodes_v2_activation_rule(self, tx: Transaction, new_best_block: Block) ->
         # a fail and the tx will be removed from the mempool.
         try:
             TransactionVerifier._verify_inputs(self._settings, tx, params, skip_script=False)
-        except Exception:
+        except Exception as e:
+            if not isinstance(e, InvalidInputData):
+                self.log.exception('unexpected exception in mempool-reverification')
             return False
 
         # Any exception in the nc_signature verification will be considered
         # a fail and the tx will be removed from the mempool.
         if tx.is_nano_contract():
             try:
                 NanoHeaderVerifier._verify_nc_signature(self._settings, tx, params)
-            except Exception:
+            except Exception as e:
+                if not isinstance(e, NCInvalidSignature):
+                    self.log.exception('unexpected exception in mempool-reverification')
                 return False
 
         return True