fix(indexes): Blocks cannot be removed from block's index, even when they are voided

Author: msbrogli

hathor/indexes.py

@@ -59,7 +59,7 @@ def add_tx(self, tx: BaseTransaction) -> bool:
             assert r1 == r2
         return r1
 
-    def del_tx(self, tx: BaseTransaction, *, relax_assert: bool = False) -> None:
+    def del_tx(self, tx: BaseTransaction, *, relax_assert: bool = False) -> bool:
         """ Delete a transaction from the indexes
 
         :param tx: Transaction to be deleted

hathor/transaction/storage/transaction_storage.py

@@ -534,7 +534,7 @@ def remove_transaction(self, tx: BaseTransaction) -> None:
         if self.with_index:
             assert self.all_index is not None
 
-            self.del_from_indexes(tx, relax_assert=True)
+            self.del_from_indexes(tx, relax_assert=True, del_blocks=True)
             # TODO Move it to self.del_from_indexes. We cannot simply do it because
             #      this method is used by the consensus algorithm which does not
             #      expect to have it removed from self.all_index.
@@ -810,7 +810,7 @@ def add_to_indexes(self, tx: BaseTransaction) -> None:
         raise NotImplementedError
 
     @abstractmethod
-    def del_from_indexes(self, tx: BaseTransaction, *, relax_assert: bool = False) -> None:
+    def del_from_indexes(self, tx: BaseTransaction, *, relax_assert: bool = False, del_blocks: bool = False) -> None:
         raise NotImplementedError
 
     @abstractmethod
@@ -1170,16 +1170,20 @@ def add_to_indexes(self, tx: BaseTransaction) -> None:
             if self.tx_index.add_tx(tx):
                 self._cache_tx_count += 1
 
-    def del_from_indexes(self, tx: BaseTransaction, *, relax_assert: bool = False) -> None:
+    def del_from_indexes(self, tx: BaseTransaction, *, relax_assert: bool = False, del_blocks: bool = False) -> None:
         if not self.with_index:
             raise NotImplementedError
         assert self.block_index is not None
         assert self.tx_index is not None
         if self.tokens_index:
             self.tokens_index.del_tx(tx)
         if tx.is_block:
-            if self.block_index.del_tx(tx, relax_assert=relax_assert):
-                self._cache_block_count -= 1
+            # This is the code to remove the block from the indexes.
+            # But we cannot remove blocks from index because they are used to validate
+            # block rewards.
+            if del_blocks:
+                if self.block_index.del_tx(tx, relax_assert=relax_assert):
+                    self._cache_block_count -= 1
         else:
             if self.tx_index.del_tx(tx, relax_assert=relax_assert):
                 self._cache_tx_count -= 1

tests/tx/test_tx_storage.py

@@ -187,7 +187,7 @@ def validate_save(self, obj):
                 else:
                     self.assertTrue(obj.hash in self.tx_storage.tx_index.tips_index.tx_last_interval)
 
-            self.tx_storage.del_from_indexes(obj)
+            self.tx_storage.del_from_indexes(obj, del_blocks=True)
 
             if self.tx_storage.with_index:
                 if obj.is_block: