Merge pull request #321 from lidofinance/develop

Release V5.5

Author: F4ever

src/bots/depositor.py

@@ -33,10 +33,6 @@
 logger = logging.getLogger(__name__)
 
 
-class ModuleNotSupportedError(Exception):
-    pass
-
-
 def run_depositor(w3):
     logger.info({'msg': 'Initialize Depositor bot.'})
     sender = Sender(w3)
@@ -112,14 +108,12 @@ def execute(self, block: BlockData) -> bool:
         for module_id in self._get_preferred_to_deposit_modules():
             logger.info({'msg': f'Do deposit to module with id: {module_id}.'})
 
-            try:
-                result = self._deposit_to_module(module_id)
-            except ModuleNotSupportedError as error:
-                logger.warning({'msg': 'Module not supported exception.', 'error': str(error)})
-                continue
-            if result:
-                logger.info({'msg': f'Deposit to module with id: {module_id} was successful.'})
-                return True
+            result = self._deposit_to_module(module_id)
+            logger.info({'msg': f'Deposit status to Module[{module_id}]: {result}.', 'value': result})
+
+            if variables.DEPOSIT_TO_FIRST_HEALTHY_MODULE_ONLY or result:
+                return result
+
             logger.warning({'msg': f'Deposit to module with id: {module_id} failed.'})
 
         return False

src/variables.py

@@ -44,7 +44,8 @@
 RABBIT_MQ_USERNAME = os.getenv('RABBIT_MQ_USERNAME', 'guest')
 RABBIT_MQ_PASSWORD = os.getenv('RABBIT_MQ_PASSWORD', 'guest')
 
-QUORUM_RETENTION_MINUTES: int = int(os.getenv('QUORUM_RETENTION_MINUTES', 5))
+QUORUM_RETENTION_MINUTES: int = int(os.getenv('QUORUM_RETENTION_MINUTES', 30))
+DEPOSIT_TO_FIRST_HEALTHY_MODULE_ONLY: bool = os.getenv('DEPOSIT_TO_FIRST_HEALTHY_MODULE_ONLY', 'true') == 'true'
 
 # data bus
 # gnosis nodes
@@ -123,6 +124,8 @@
     'ACCOUNT': '' if ACCOUNT is None else ACCOUNT.address,
     'ONCHAIN_TRANSPORT_ADDRESS': ONCHAIN_TRANSPORT_ADDRESS,
     'BLOCKS_BETWEEN_EXECUTION': BLOCKS_BETWEEN_EXECUTION,
+    'QUORUM_RETENTION_MINUTES': QUORUM_RETENTION_MINUTES,
+    'DEPOSIT_TO_FIRST_HEALTHY_MODULE_ONLY': DEPOSIT_TO_FIRST_HEALTHY_MODULE_ONLY,
 }
 
 PRIVATE_ENV_VARS = {

tests/bots/test_depositor.py

@@ -379,3 +379,27 @@ def test_depositor_bot(
     db.message_storage.messages = deposit_messages
     assert db.execute(latest)
     assert web3_lido_integration.lido.staking_router.get_staking_module_nonce(module_id) == old_module_nonce + 1
+
+
+@pytest.mark.unit
+def test_depositor_execute(web3_lido_unit, depositor_bot):
+    depositor_bot._check_balance = Mock()
+
+    depositor_bot._get_preferred_to_deposit_modules = Mock(return_value=[1, 2])
+
+    # Check unsuccess deposit to first module only
+    variables.DEPOSIT_TO_FIRST_HEALTHY_MODULE_ONLY = True
+    depositor_bot._deposit_to_module = Mock(return_value=False)
+    depositor_bot.execute(None)
+    assert depositor_bot._deposit_to_module.call_count == 1
+
+    # Check deposit to both modules
+    variables.DEPOSIT_TO_FIRST_HEALTHY_MODULE_ONLY = False
+    depositor_bot._deposit_to_module = Mock(return_value=False)
+    depositor_bot.execute(None)
+    assert depositor_bot._deposit_to_module.call_count == 2
+
+    # Check success to first module
+    depositor_bot._deposit_to_module = Mock(return_value=True)
+    depositor_bot.execute(None)
+    assert depositor_bot._deposit_to_module.call_count == 1