Improve the healthcheck

packages/packages.json

@@ -16,14 +16,14 @@
         "contract/valory/staking_token/0.1.0": "bafybeiabkkhjpybqpzdfc4vcbiz4vefctfpvwetbmo7pqpiuxprmpvnti4",
         "contract/valory/relayer/0.1.0": "bafybeibvqc3lwxtcnu6dgfkf7mzefdgtfyosyq2dow7ogyxsl25vkxjwea",
         "skill/valory/market_manager_abci/0.1.0": "bafybeihmyqkzl3bm5zvjnc4auj32qjf3pk73scyq7mntmpsudqnisb4gey",
-        "skill/valory/decision_maker_abci/0.1.0": "bafybeigehrtalp3ppnog25yuvfcdt3gmrgvxb2zm2zyngxxfcvps2s3tza",
-        "skill/valory/trader_abci/0.1.0": "bafybeideek7oe3rbcnaymd4bnwsm2kull75wfdvljv5prvcsok5sgti7bq",
-        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeih2s2dwnyxm7xhd3knc3wlaejzyvfulxkipwnidmzxgx7t3ofqbpq",
+        "skill/valory/decision_maker_abci/0.1.0": "bafybeifbu5ufyxout25e5qo4m4eh55ie52qsw6ejzx7vfbqenbqjzsejl4",
+        "skill/valory/trader_abci/0.1.0": "bafybeianhvowfav2hceteyru6smi6gfblih7ji7qqqoplapem2vgdgngk4",
+        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifie37a5g5qf2w2b5zcbaq5z75mkhmq6b7l26xiuf46dg2ztmebme",
         "skill/valory/staking_abci/0.1.0": "bafybeial5xtgzf37e2khvdrc2q2wa2xhirjwioi2szwvcgtupidjxhg7tq",
         "skill/valory/check_stop_trading_abci/0.1.0": "bafybeid7l74lmjnkeerkbvwhoo2l4cawb7c545rhcx3mjpsjux4zwy5wpm",
-        "agent/valory/trader/0.1.0": "bafybeicy63hsvgcui5p6vwjdgfwrm7ldvjxui4nyy7zykm675xjfnmdbza",
-        "service/valory/trader/0.1.0": "bafybeiawu46p7whmf6aiywqyechsolmhb56ew7c7pjphmrhzen7umk6lc4",
-        "service/valory/trader_pearl/0.1.0": "bafybeia3eztsz325jy2sbtilulfnl6pngz3bltkvogowx6xym3kr5re4ei"
+        "agent/valory/trader/0.1.0": "bafybeibwwzx3spt3wi22jb3joejrywncbad32oatrrrfb6fprp63rssy64",
+        "service/valory/trader/0.1.0": "bafybeieiukh6zokn7bjgnyywmnb32n7gmvhngzjjiusxjsh72yfksw24bu",
+        "service/valory/trader_pearl/0.1.0": "bafybeidpwx2lx5he6l3lft2er7laaboxy5j6qcrginr3v7mimzyr5hu4jq"
     },
     "third_party": {
         "protocol/valory/acn_data_share/0.1.0": "bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq",

packages/valory/agents/trader/aea-config.yaml

@@ -50,10 +50,10 @@ skills:
 - valory/reset_pause_abci:0.1.0:bafybeigebq46oqz2mx2iajupr6p5pgm6z5pvfye5w6zypsseuqtvta7b4a
 - valory/termination_abci:0.1.0:bafybeieurwmfernodqyczj5ertsgfbjtjnrlgvte7sli4sajnbopty7inu
 - valory/transaction_settlement_abci:0.1.0:bafybeifkftgkyzrxwxjdyqixpp7vk6aqmufikalmwx3kydtlg74tonu47u
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeih2s2dwnyxm7xhd3knc3wlaejzyvfulxkipwnidmzxgx7t3ofqbpq
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifie37a5g5qf2w2b5zcbaq5z75mkhmq6b7l26xiuf46dg2ztmebme
 - valory/market_manager_abci:0.1.0:bafybeihmyqkzl3bm5zvjnc4auj32qjf3pk73scyq7mntmpsudqnisb4gey
-- valory/decision_maker_abci:0.1.0:bafybeigehrtalp3ppnog25yuvfcdt3gmrgvxb2zm2zyngxxfcvps2s3tza
-- valory/trader_abci:0.1.0:bafybeideek7oe3rbcnaymd4bnwsm2kull75wfdvljv5prvcsok5sgti7bq
+- valory/decision_maker_abci:0.1.0:bafybeifbu5ufyxout25e5qo4m4eh55ie52qsw6ejzx7vfbqenbqjzsejl4
+- valory/trader_abci:0.1.0:bafybeianhvowfav2hceteyru6smi6gfblih7ji7qqqoplapem2vgdgngk4
 - valory/staking_abci:0.1.0:bafybeial5xtgzf37e2khvdrc2q2wa2xhirjwioi2szwvcgtupidjxhg7tq
 - valory/check_stop_trading_abci:0.1.0:bafybeid7l74lmjnkeerkbvwhoo2l4cawb7c545rhcx3mjpsjux4zwy5wpm
 - valory/mech_interact_abci:0.1.0:bafybeif2tpz2zet6p4z4vi3b254oxzyyzoe5tehj3me3znzt7h7otkpd54

packages/valory/services/trader/service.yaml

@@ -7,7 +7,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq
 fingerprint_ignore_patterns: []
-agent: valory/trader:0.1.0:bafybeicy63hsvgcui5p6vwjdgfwrm7ldvjxui4nyy7zykm675xjfnmdbza
+agent: valory/trader:0.1.0:bafybeibwwzx3spt3wi22jb3joejrywncbad32oatrrrfb6fprp63rssy64
 number_of_agents: 4
 deployment:
   agent:

packages/valory/services/trader_pearl/service.yaml

@@ -8,7 +8,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e
 fingerprint_ignore_patterns: []
-agent: valory/trader:0.1.0:bafybeicy63hsvgcui5p6vwjdgfwrm7ldvjxui4nyy7zykm675xjfnmdbza
+agent: valory/trader:0.1.0:bafybeibwwzx3spt3wi22jb3joejrywncbad32oatrrrfb6fprp63rssy64
 number_of_agents: 1
 deployment:
   agent:

packages/valory/skills/decision_maker_abci/handlers.py

@@ -21,7 +21,7 @@
 
 import json
 import re
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Any, Callable, Dict, Optional, Tuple, cast
 from urllib.parse import urlparse
@@ -33,6 +33,7 @@
 )
 from packages.valory.protocols.http.message import HttpMessage
 from packages.valory.protocols.ipfs import IpfsMessage
+from packages.valory.skills.abstract_round_abci.base import RoundSequence
 from packages.valory.skills.abstract_round_abci.handlers import (
     ABCIRoundHandler as BaseABCIRoundHandler,
 )
@@ -70,6 +71,9 @@
 TendermintHandler = BaseTendermintHandler
 
 
+FSM_REPR_MAX_DEPTH = 25
+
+
 class IpfsHandler(AbstractResponseHandler):
     """IPFS message handler."""
 
@@ -156,12 +160,15 @@ def setup(self) -> None:
 
         self.rounds_info = load_rounds_info_with_transitions()
 
+    @property
+    def round_sequence(self) -> RoundSequence:
+        """Return the round sequence."""
+        return self.context.state.round_sequence
+
     @property
     def synchronized_data(self) -> SynchronizedData:
         """Return the synchronized data."""
-        return SynchronizedData(
-            db=self.context.state.round_sequence.latest_synchronized_data.db
-        )
+        return SynchronizedData(db=self.round_sequence.latest_synchronized_data.db)
 
     def _get_handler(self, url: str, method: str) -> Tuple[Optional[Callable], Dict]:
         """Check if an url is meant to be handled in this handler
@@ -176,7 +183,7 @@ def _get_handler(self, url: str, method: str) -> Tuple[Optional[Callable], Dict]
         # Check base url
         if not re.match(self.handler_url_regex, url):
             self.context.logger.info(
-                f"The url {url} does not match the DynamicNFT HttpHandler's pattern"
+                f"The url {url} does not match the HttpHandler's pattern"
             )
             return None, {}
 
@@ -193,7 +200,7 @@ def _get_handler(self, url: str, method: str) -> Tuple[Optional[Callable], Dict]
 
         # No route found
         self.context.logger.info(
-            f"The message [{method}] {url} is intended for the DynamicNFT HttpHandler but did not match any valid pattern"
+            f"The message [{method}] {url} is intended for the HttpHandler but did not match any valid pattern"
         )
         return self._handle_bad_request, {}
 
@@ -274,40 +281,45 @@ def _handle_get_health(
         :param http_msg: the http message
         :param http_dialogue: the http dialogue
         """
-        seconds_since_last_transition = None
-        is_tm_unhealthy = None
-        is_transitioning_fast = None
-        current_round = None
-        rounds = None
+        is_transitioning_fast = (
+            seconds_since_last_transition
+        ) = is_tm_unhealthy = rounds = None
         has_required_funds = self._check_required_funds()
         is_receiving_mech_responses = self._check_is_receiving_mech_responses()
         is_staking_kpi_met = self.synchronized_data.is_staking_kpi_met
         staking_status = self.synchronized_data.service_staking_state.name.lower()
 
-        round_sequence = cast(SharedState, self.context.state).round_sequence
+        round_sequence = self.round_sequence
 
-        if round_sequence._last_round_transition_timestamp:
-            is_tm_unhealthy = cast(
-                SharedState, self.context.state
-            ).round_sequence.block_stall_deadline_expired
+        last_round_transition_timestamp = (
+            round_sequence._last_round_transition_timestamp
+        )
+        if last_round_transition_timestamp:
+            is_tm_unhealthy = round_sequence.block_stall_deadline_expired
 
             current_time = datetime.now().timestamp()
             seconds_since_last_transition = current_time - datetime.timestamp(
-                round_sequence._last_round_transition_timestamp
+                last_round_transition_timestamp
             )
 
+            previous_rounds = round_sequence.abci_app._previous_rounds
+            previous_round_cls = type(previous_rounds[-1])
+            previous_round_events = round_sequence.abci_app.transition_function.get(
+                previous_round_cls, {}
+            ).keys()
+            previous_round_timeouts = {
+                round_sequence.abci_app.event_to_timeout.get(event, -1)
+                for event in previous_round_events
+            }
+            last_round_timeout = max(previous_round_timeouts)
             is_transitioning_fast = (
                 not is_tm_unhealthy
-                and seconds_since_last_transition
-                < 2 * self.context.params.reset_pause_duration
+                and seconds_since_last_transition < 2 * last_round_timeout
             )
 
-        if round_sequence._abci_app:
-            current_round = round_sequence._abci_app.current_round.round_id
-            rounds = [
-                r.round_id for r in round_sequence._abci_app._previous_rounds[-25:]
+            rounds = [r.round_id for r in previous_rounds[-FSM_REPR_MAX_DEPTH:]] + [
+                round_sequence.current_round_id
             ]
-            rounds.append(current_round)
 
         data = {
             "seconds_since_last_transition": seconds_since_last_transition,
@@ -375,6 +387,6 @@ def _check_is_receiving_mech_responses(self) -> bool:
         # (an on chain transaction)
         return (
             self.synchronized_data.decision_receive_timestamp
-            < int(datetime.utcnow().timestamp())
+            < int(datetime.now(timezone.utc).timestamp())
             - self.context.params.expected_mech_response_time
         )

packages/valory/skills/decision_maker_abci/skill.yaml

@@ -29,7 +29,7 @@ fingerprint:
   behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke
   dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm
   fsm_specification.yaml: bafybeifvu7n6sjmrerogkzsftjrw2l6w5ppuq3f43ouj2rwbomdr5glp2e
-  handlers.py: bafybeieggvt2rh654s2jt2ablqtyzaycb7wlgrrdbsccf5652nptv45hie
+  handlers.py: bafybeidnrhmpngeobpv76nuyg7vdjstostrez3jiu4d4vqgk2467t6gq4i
   io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq
   io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa
   models.py: bafybeiasqxrhudkisjohjdgbkmmj6esyw52sh66xflwkatd5dyradxb37q

packages/valory/skills/trader_abci/skill.yaml

@@ -27,8 +27,8 @@ skills:
 - valory/transaction_settlement_abci:0.1.0:bafybeifkftgkyzrxwxjdyqixpp7vk6aqmufikalmwx3kydtlg74tonu47u
 - valory/termination_abci:0.1.0:bafybeieurwmfernodqyczj5ertsgfbjtjnrlgvte7sli4sajnbopty7inu
 - valory/market_manager_abci:0.1.0:bafybeihmyqkzl3bm5zvjnc4auj32qjf3pk73scyq7mntmpsudqnisb4gey
-- valory/decision_maker_abci:0.1.0:bafybeigehrtalp3ppnog25yuvfcdt3gmrgvxb2zm2zyngxxfcvps2s3tza
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeih2s2dwnyxm7xhd3knc3wlaejzyvfulxkipwnidmzxgx7t3ofqbpq
+- valory/decision_maker_abci:0.1.0:bafybeifbu5ufyxout25e5qo4m4eh55ie52qsw6ejzx7vfbqenbqjzsejl4
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifie37a5g5qf2w2b5zcbaq5z75mkhmq6b7l26xiuf46dg2ztmebme
 - valory/staking_abci:0.1.0:bafybeial5xtgzf37e2khvdrc2q2wa2xhirjwioi2szwvcgtupidjxhg7tq
 - valory/check_stop_trading_abci:0.1.0:bafybeid7l74lmjnkeerkbvwhoo2l4cawb7c545rhcx3mjpsjux4zwy5wpm
 - valory/mech_interact_abci:0.1.0:bafybeif2tpz2zet6p4z4vi3b254oxzyyzoe5tehj3me3znzt7h7otkpd54

packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml

@@ -23,7 +23,7 @@ protocols:
 - valory/ledger_api:1.0.0:bafybeihmqzcbj6t7vxz2aehd5726ofnzsfjs5cwlf42ro4tn6i34cbfrc4
 skills:
 - valory/abstract_round_abci:0.1.0:bafybeia27qmw6w5ds5fcrpj2475brnz742aampe3sgochloijs2l7jovai
-- valory/decision_maker_abci:0.1.0:bafybeigehrtalp3ppnog25yuvfcdt3gmrgvxb2zm2zyngxxfcvps2s3tza
+- valory/decision_maker_abci:0.1.0:bafybeifbu5ufyxout25e5qo4m4eh55ie52qsw6ejzx7vfbqenbqjzsejl4
 - valory/staking_abci:0.1.0:bafybeial5xtgzf37e2khvdrc2q2wa2xhirjwioi2szwvcgtupidjxhg7tq
 - valory/mech_interact_abci:0.1.0:bafybeif2tpz2zet6p4z4vi3b254oxzyyzoe5tehj3me3znzt7h7otkpd54
 behaviours: