refactor(nano): Make NCBlockExecutor a pure executor with no side effects

Author: msbrogli

hathor/consensus/block_consensus.py

@@ -31,7 +31,7 @@
     from hathor.conf.settings import HathorSettings
     from hathor.consensus.context import ConsensusAlgorithmContext
     from hathor.feature_activation.feature_service import FeatureService
-    from hathor.nanocontracts.execution import NCBlockExecutor
+    from hathor.nanocontracts.execution import NCConsensusBlockExecutor
     from hathor.nanocontracts.nc_exec_logs import NCLogStorage
 
 logger = get_logger()
@@ -46,7 +46,7 @@ def __init__(
         self,
         settings: 'HathorSettings',
         context: 'ConsensusAlgorithmContext',
-        block_executor: 'NCBlockExecutor',
+        block_executor: 'NCConsensusBlockExecutor',
         feature_service: 'FeatureService',
     ) -> None:
         self._settings = settings
@@ -601,7 +601,7 @@ class BlockConsensusAlgorithmFactory:
     def __init__(
         self,
         settings: 'HathorSettings',
-        block_executor: 'NCBlockExecutor',
+        block_executor: 'NCConsensusBlockExecutor',
         feature_service: 'FeatureService',
     ) -> None:
         self.settings = settings

hathor/consensus/consensus.py

@@ -26,7 +26,7 @@
 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.nanocontracts.execution import NCBlockExecutor, NCConsensusBlockExecutor
 from hathor.profiler import get_cpu_profiler
 from hathor.pubsub import HathorEvents
 from hathor.transaction import BaseTransaction, Block, Transaction
@@ -100,18 +100,25 @@ def __init__(
         self.nc_storage_factory = nc_storage_factory
         self.soft_voided_tx_ids = frozenset(soft_voided_tx_ids)
 
-        # Create NCBlockExecutor with all NC-related dependencies
+        # Create NCBlockExecutor (pure) for execution
         self._block_executor = NCBlockExecutor(
             settings=settings,
             runner_factory=runner_factory,
             nc_storage_factory=nc_storage_factory,
-            nc_log_storage=nc_log_storage,
             nc_calls_sorter=nc_calls_sorter,
+        )
+
+        # Create NCConsensusBlockExecutor (with side effects) for consensus
+        self._consensus_block_executor = NCConsensusBlockExecutor(
+            settings=settings,
+            block_executor=self._block_executor,
+            nc_storage_factory=nc_storage_factory,
+            nc_log_storage=nc_log_storage,
             nc_exec_fail_trace=nc_exec_fail_trace,
         )
 
         self.block_algorithm_factory = BlockConsensusAlgorithmFactory(
-            settings, self._block_executor, feature_service,
+            settings, self._consensus_block_executor, feature_service,
         )
         self.transaction_algorithm_factory = TransactionConsensusAlgorithmFactory()
         self.nc_calls_sorter = nc_calls_sorter

hathor/nanocontracts/execution/__init__.py

@@ -15,7 +15,9 @@
 """Nano contract block execution module."""
 
 from hathor.nanocontracts.execution.block_executor import NCBlockExecutor
+from hathor.nanocontracts.execution.consensus_block_executor import NCConsensusBlockExecutor
 
 __all__ = [
     'NCBlockExecutor',
+    'NCConsensusBlockExecutor',
 ]