refactor(side-dag): general improvements

Author: glevco

hathor/consensus/poa/__init__.py

@@ -7,7 +7,7 @@
     calculate_weight,
     get_active_signers,
     get_hashed_poa_data,
-    in_turn_signer_index,
+    get_signer_index_distance,
     verify_poa_signature,
 )
 from .poa_block_producer import PoaBlockProducer
@@ -18,7 +18,6 @@
     'BLOCK_WEIGHT_OUT_OF_TURN',
     'SIGNER_ID_LEN',
     'get_hashed_poa_data',
-    'in_turn_signer_index',
     'calculate_weight',
     'PoaBlockProducer',
     'PoaSigner',
@@ -27,4 +26,5 @@
     'InvalidSignature',
     'ValidSignature',
     'get_active_signers',
+    'get_signer_index_distance',
 ]

hathor/consensus/poa/poa.py

@@ -56,16 +56,21 @@ def get_active_signers(settings: PoaSettings, height: int) -> list[bytes]:
     return active_signers
 
 
-def in_turn_signer_index(settings: PoaSettings, height: int) -> int:
-    """Return the signer index that is in turn for the given height."""
+def get_signer_index_distance(*, settings: PoaSettings, signer_index: int, height: int) -> int:
+    """Considering a block height, return the signer index distance to that block. When the distance is 0, it means it
+    is the signer's turn."""
     active_signers = get_active_signers(settings, height)
-    return height % len(active_signers)
+    expected_index = height % len(active_signers)
+    signers = get_active_signers(settings, height)
+    index_distance = (signer_index - expected_index) % len(signers)
+    assert 0 <= index_distance < len(signers)
+    return index_distance
 
 
 def calculate_weight(settings: PoaSettings, block: PoaBlock, signer_index: int) -> float:
     """Return the weight for the given block and signer."""
-    expected_index = in_turn_signer_index(settings, block.get_height())
-    return BLOCK_WEIGHT_IN_TURN if expected_index == signer_index else BLOCK_WEIGHT_OUT_OF_TURN
+    index_distance = get_signer_index_distance(settings=settings, signer_index=signer_index, height=block.get_height())
+    return BLOCK_WEIGHT_IN_TURN if index_distance == 0 else BLOCK_WEIGHT_OUT_OF_TURN / index_distance
 
 
 @dataclass(frozen=True, slots=True)

hathor/consensus/poa/poa_block_producer.py

@@ -17,6 +17,7 @@
 from typing import TYPE_CHECKING
 
 from structlog import get_logger
+from twisted.internet.base import DelayedCall
 from twisted.internet.interfaces import IDelayedCall
 from twisted.internet.task import LoopingCall
 
@@ -35,11 +36,8 @@
 
 logger = get_logger()
 
-# Number of seconds to wait for a sync to finish before trying to produce blocks
-_WAIT_SYNC_DELAY: int = 30
-
 # Number of seconds used between each signer depending on its distance to the expected signer
-_SIGNER_TURN_INTERVAL: int = 1
+_SIGNER_TURN_INTERVAL: int = 10
 
 
 class PoaBlockProducer:
@@ -54,8 +52,6 @@ class PoaBlockProducer:
         '_reactor',
         '_manager',
         '_poa_signer',
-        '_started_producing',
-        '_start_producing_lc',
         '_schedule_block_lc',
         '_last_seen_best_block',
         '_delayed_call',
@@ -71,10 +67,6 @@ def __init__(self, *, settings: HathorSettings, reactor: ReactorProtocol, poa_si
         self._poa_signer = poa_signer
         self._last_seen_best_block: Block | None = None
 
-        self._started_producing = False
-        self._start_producing_lc = LoopingCall(self._start_producing)
-        self._start_producing_lc.clock = self._reactor
-
         self._schedule_block_lc = LoopingCall(self._schedule_block)
         self._schedule_block_lc.clock = self._reactor
         self._delayed_call: IDelayedCall | None = None
@@ -89,13 +81,9 @@ def manager(self, manager: HathorManager) -> None:
         self._manager = manager
 
     def start(self) -> None:
-        self._start_producing_lc.start(_WAIT_SYNC_DELAY)
         self._schedule_block_lc.start(self._settings.AVG_TIME_BETWEEN_BLOCKS)
 
     def stop(self) -> None:
-        if self._start_producing_lc.running:
-            self._start_producing_lc.stop()
-
         if self._schedule_block_lc.running:
             self._schedule_block_lc.stop()
 
@@ -113,21 +101,15 @@ def _get_signer_index(self, previous_block: Block) -> int | None:
         except ValueError:
             return None
 
-    def _start_producing(self) -> None:
-        """Start producing new blocks."""
+    def _schedule_block(self) -> None:
+        """Schedule propagation of a new block."""
         if not self.manager.can_start_mining():
             # We're syncing, so we'll try again later
-            self._log.warn('cannot start producing new blocks, node not synced')
+            self._log.info('cannot produce new block, node not synced')
             return
 
-        self._log.info('started producing new blocks')
-        self._started_producing = True
-        self._start_producing_lc.stop()
-
-    def _schedule_block(self) -> None:
-        """Schedule propagation of a new block."""
         previous_block = self.manager.tx_storage.get_best_block()
-        if not self._started_producing or previous_block == self._last_seen_best_block:
+        if previous_block == self._last_seen_best_block:
             return
 
         self._last_seen_best_block = previous_block
@@ -139,6 +121,15 @@ def _schedule_block(self) -> None:
         expected_timestamp = self._expected_block_timestamp(previous_block, signer_index)
         propagation_delay = 0 if expected_timestamp < now else expected_timestamp - now
 
+        if self._delayed_call and self._delayed_call.active():
+            from hathor.transaction.poa import PoaBlock
+            assert isinstance(self._delayed_call, DelayedCall)
+            delayed_block = self._delayed_call.args[0]
+            assert isinstance(delayed_block, PoaBlock)
+            if delayed_block.weight != poa.BLOCK_WEIGHT_IN_TURN:
+                # we only cancel our delayed block if it was out of turn
+                self._delayed_call.cancel()
+
         self._delayed_call = self._reactor.callLater(propagation_delay, self._produce_block, previous_block)
         self._log.debug(
             'scheduling block production',
@@ -158,25 +149,29 @@ def _produce_block(self, previous_block: PoaBlock) -> None:
         self._poa_signer.sign_block(block)
         block.update_hash()
 
-        self.manager.on_new_tx(block, propagate_to_peers=False, fails_silently=False)
-        if not block.get_metadata().voided_by:
-            self.manager.connections.send_tx_to_peers(block)
-
-        self._log.debug(
+        self._log.info(
             'produced new block',
             block=block.hash_hex,
             height=block.get_height(),
             weight=block.weight,
             parent=block.get_block_parent_hash().hex(),
             voided=bool(block.get_metadata().voided_by),
         )
+        self.manager.on_new_tx(block, propagate_to_peers=False, fails_silently=False)
+        if not block.get_metadata().voided_by:
+            self.manager.connections.send_tx_to_peers(block)
+        self._delayed_call = None
 
     def _expected_block_timestamp(self, previous_block: Block, signer_index: int) -> int:
         """Calculate the expected timestamp for a new block."""
         height = previous_block.get_height() + 1
-        expected_index = poa.in_turn_signer_index(settings=self._poa_settings, height=height)
-        signers = poa.get_active_signers(self._poa_settings, height)
-        index_distance = (signer_index - expected_index) % len(signers)
-        assert 0 <= index_distance < len(signers)
+        index_distance = poa.get_signer_index_distance(
+            settings=self._poa_settings,
+            signer_index=signer_index,
+            height=height,
+        )
         delay = _SIGNER_TURN_INTERVAL * index_distance
+        if index_distance > 0:
+            # if it's not our turn, we add a constant offset to the delay
+            delay += self._settings.AVG_TIME_BETWEEN_BLOCKS
         return previous_block.timestamp + self._settings.AVG_TIME_BETWEEN_BLOCKS + delay

tests/poa/test_poa.py

@@ -218,40 +218,55 @@ def get_signer() -> tuple[PoaSigner, bytes]:
 @pytest.mark.parametrize(
     ['n_signers', 'height', 'signer_index', 'expected'],
     [
-        (1, 1, 0, True),
-        (1, 2, 0, True),
-        (1, 3, 0, True),
-
-        (2, 1, 0, False),
-        (2, 2, 0, True),
-        (2, 3, 0, False),
-
-        (2, 1, 1, True),
-        (2, 2, 1, False),
-        (2, 3, 1, True),
+        (1, 1, 0, 0),
+        (1, 2, 0, 0),
+        (1, 3, 0, 0),
+
+        (2, 1, 0, 1),
+        (2, 2, 0, 0),
+        (2, 3, 0, 1),
+
+        (2, 1, 1, 0),
+        (2, 2, 1, 1),
+        (2, 3, 1, 0),
+
+        (5, 1, 0, 4),
+        (5, 2, 0, 3),
+        (5, 3, 0, 2),
+        (5, 4, 0, 1),
+        (5, 5, 0, 0),
     ]
 )
-def test_in_turn_signer_index(n_signers: int, height: int, signer_index: int, expected: bool) -> None:
+def test_get_signer_index_distance(n_signers: int, height: int, signer_index: int, expected: int) -> None:
     settings = PoaSettings.construct(signers=tuple(PoaSignerSettings(public_key=b'') for _ in range(n_signers)))
 
-    result = poa.in_turn_signer_index(settings=settings, height=height) == signer_index
+    result = poa.get_signer_index_distance(settings=settings, signer_index=signer_index, height=height)
     assert result == expected
 
 
 @pytest.mark.parametrize(
     ['n_signers', 'height', 'signer_index', 'expected'],
     [
+        (1, 0, 0, poa.BLOCK_WEIGHT_IN_TURN),
         (1, 1, 0, poa.BLOCK_WEIGHT_IN_TURN),
         (1, 2, 0, poa.BLOCK_WEIGHT_IN_TURN),
         (1, 3, 0, poa.BLOCK_WEIGHT_IN_TURN),
 
+        (2, 0, 0, poa.BLOCK_WEIGHT_IN_TURN),
         (2, 1, 0, poa.BLOCK_WEIGHT_OUT_OF_TURN),
         (2, 2, 0, poa.BLOCK_WEIGHT_IN_TURN),
         (2, 3, 0, poa.BLOCK_WEIGHT_OUT_OF_TURN),
 
+        (2, 0, 1, poa.BLOCK_WEIGHT_OUT_OF_TURN),
         (2, 1, 1, poa.BLOCK_WEIGHT_IN_TURN),
         (2, 2, 1, poa.BLOCK_WEIGHT_OUT_OF_TURN),
         (2, 3, 1, poa.BLOCK_WEIGHT_IN_TURN),
+
+        (5, 0, 0, poa.BLOCK_WEIGHT_IN_TURN),
+        (5, 1, 0, poa.BLOCK_WEIGHT_OUT_OF_TURN / 4),
+        (5, 2, 0, poa.BLOCK_WEIGHT_OUT_OF_TURN / 3),
+        (5, 3, 0, poa.BLOCK_WEIGHT_OUT_OF_TURN / 2),
+        (5, 4, 0, poa.BLOCK_WEIGHT_OUT_OF_TURN / 1),
     ]
 )
 def test_calculate_weight(n_signers: int, height: int, signer_index: int, expected: float) -> None:

tests/poa/test_poa_block_producer.py

@@ -57,7 +57,6 @@ def test_poa_block_producer_one_signer() -> None:
 
     # when we can start mining, we start producing blocks
     manager.can_start_mining = Mock(return_value=True)
-    reactor.advance(20)
 
     # we produce our first block
     reactor.advance(10)
@@ -116,7 +115,6 @@ def test_poa_block_producer_two_signers() -> None:
 
     # when we can start mining, we start producing blocks
     manager.can_start_mining = Mock(return_value=True)
-    reactor.advance(20)
 
     # we produce our first block
     reactor.advance(10)
@@ -144,14 +142,14 @@ def test_poa_block_producer_two_signers() -> None:
     manager.on_new_tx.reset_mock()
 
     # haven't produced the third block yet
-    reactor.advance(9)
+    reactor.advance(29)
 
     # we produce our third block
-    reactor.advance(2)
+    reactor.advance(1)
     manager.on_new_tx.assert_called_once()
     block3 = manager.on_new_tx.call_args.args[0]
     assert isinstance(block3, PoaBlock)
-    assert block3.timestamp == block2.timestamp + 11
+    assert block3.timestamp == block2.timestamp + 30
     assert block3.weight == poa.BLOCK_WEIGHT_OUT_OF_TURN
     assert block3.outputs == []
     assert block3.get_block_parent_hash() == block2.hash
@@ -161,15 +159,15 @@ def test_poa_block_producer_two_signers() -> None:
 @pytest.mark.parametrize(
     ['previous_height', 'signer_index', 'expected_delay'],
     [
-        (0, 0, 33),
+        (0, 0, 90),
         (0, 1, 30),
-        (0, 2, 31),
-        (0, 3, 32),
+        (0, 2, 70),
+        (0, 3, 80),
 
-        (1, 0, 32),
-        (1, 1, 33),
+        (1, 0, 80),
+        (1, 1, 90),
         (1, 2, 30),
-        (1, 3, 31),
+        (1, 3, 70),
     ]
 )
 def test_expected_block_timestamp(previous_height: int, signer_index: int, expected_delay: int) -> None: