review changes

Author: glevco

hathor/transaction/storage/transaction_storage.py

@@ -1100,7 +1100,9 @@ def compute_transactions_that_became_invalid(self, new_best_height: int) -> list
         to_remove: list[BaseTransaction] = []
         for tx in self.iter_mempool_from_best_index():
             try:
-                TransactionVerifier.verify_reward_locked_for_height(tx, new_best_height, verify_min_height=True)
+                TransactionVerifier.verify_reward_locked_for_height(
+                    tx, new_best_height, assert_min_height_verification=False
+                )
             except RewardLocked:
                 tx.set_validation(ValidationState.INVALID)
                 to_remove.append(tx)

hathor/verification/transaction_verifier.py

@@ -149,9 +149,29 @@ def verify_reward_locked(self, tx: Transaction) -> None:
         self.verify_reward_locked_for_height(tx, best_height)
 
     @staticmethod
-    def verify_reward_locked_for_height(tx: Transaction, best_height: int, *, verify_min_height: bool = False) -> None:
-        """Will raise `RewardLocked` if any reward is spent before the best block height is enough, considering both
-        the block rewards spent by this tx itself, and the inherited `min_height`."""
+    def verify_reward_locked_for_height(
+        tx: Transaction,
+        best_height: int,
+        *,
+        assert_min_height_verification: bool = True
+    ) -> None:
+        """
+        Will raise `RewardLocked` if any reward is spent before the best block height is enough, considering both
+        the block rewards spent by this tx itself, and the inherited `min_height`.
+
+        Args:
+            tx: the transaction to be verified.
+            best_height: the height of the best chain to be used for verification.
+            assert_min_height_verification: whether the inherited `min_height` verification must pass.
+
+        Note: for verification of new transactions, `assert_min_height_verification` must be `True`. This
+        verification is always expected to pass for new txs, as a failure would mean one of its dependencies would
+        have failed too. So an `AssertionError` is raised if it fails.
+
+        However, when txs are being re-verified for Reward Lock during a reorg, it's possible that txs may fail
+        their inherited `min_height` verification. So in that case `assert_min_height_verification` is `False`,
+        and a normal `RewardLocked` exception is raised instead.
+        """
         assert tx.storage is not None
         info = get_spent_reward_locked_info(tx, tx.storage)
         if info is not None:
@@ -161,12 +181,11 @@ def verify_reward_locked_for_height(tx: Transaction, best_height: int, *, verify
         assert meta.min_height is not None
         # We use +1 here because a tx is valid if it can be confirmed by the next block
         if best_height + 1 < meta.min_height:
-            if verify_min_height:
-                raise RewardLocked(
-                    f'Tx {tx.hash_hex} has min_height={meta.min_height}, but the best_height={best_height}.'
-                )
-            else:
-                raise AssertionError('a new tx should never be invalid by its inherited min_height')
+            if assert_min_height_verification:
+                raise AssertionError('a new tx should never be invalid by its inherited min_height.')
+            raise RewardLocked(
+                f'Tx {tx.hash_hex} has min_height={meta.min_height}, but the best_height={best_height}.'
+            )
 
     def verify_number_of_inputs(self, tx: Transaction) -> None:
         """Verify number of inputs is in a valid range"""