fix: get tx receipt should return even if reverted tx

.github/workflows/workflow.yml

@@ -240,7 +240,7 @@ jobs:
     continue-on-error: False
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-12, windows-latest]
+        os: [ubuntu-latest, macos-14-large, windows-latest]
         python_version: ["3.10",]
     timeout-minutes: 10
     runs-on: ${{ matrix.os }}
@@ -271,7 +271,7 @@ jobs:
         sys:
           - { os: windows-latest, shell: "msys2 {0}" }
           - { os: ubuntu-latest, shell: bash }
-#          - { os: macos-12, shell: bash }
+#          - { os: macos-14-large, shell: bash }
         python_version: ["3.10",]
     timeout-minutes: 15
     steps:
@@ -433,7 +433,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-12, windows-latest]
+        os: [ubuntu-latest, windows-latest]
         python_version: ['3.8', '3.9', '3.10', '3.11']
     timeout-minutes: 120
     steps:
@@ -469,8 +469,8 @@ jobs:
       # sudo apt-get install -y protobuf-compiler
       # use sudo rm /var/lib/apt/lists/lock above in line above update if dependency install failures persist
       # use sudo apt-get dist-upgrade above in line below update if dependency install failures persist
-      - if: matrix.os == 'macos-12'
-        name: Install dependencies (macos-12)
+      - if: matrix.os == 'macos-14-large'
+        name: Install dependencies (macos-14-large)
         run: |
           pip install tomte[tox]==0.2.13
           brew install gcc
@@ -558,7 +558,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-12, windows-latest]
+        os: [ubuntu-latest, macos-14-large, windows-latest]
         python-version: ["3.10"]
     timeout-minutes: 45
     steps:

docs/package_list.md

@@ -14,24 +14,24 @@
 | contract/fetchai/erc1155/0.22.0                               | `bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4` |
 | connection/fetchai/gym/0.19.0                                 | `bafybeicqqvl4tt3qbulnkoffciagmfd6p3hxxi3i2mrrqtnbycv757pn6y` |
 | connection/fetchai/stub/0.21.0                                | `bafybeibybboiwgklfiqpkkcw6rwj65s5jalzfzf6mh6fstxdlt6habzwvy` |
-| connection/valory/ledger/0.19.0                               | `bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e` |
+| connection/valory/ledger/0.19.0                               | `bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi` |
 | connection/valory/http_server/0.22.0                          | `bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m` |
 | connection/valory/p2p_libp2p/0.1.0                            | `bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma` |
 | connection/valory/p2p_libp2p_client/0.1.0                     | `bafybeihs5zlwa5wlozct3rjlxsirm3ve3e4buse5nfehiky6ymnnfrobne` |
 | connection/valory/p2p_libp2p_mailbox/0.1.0                    | `bafybeiecclc65ogngs3piaxpwhiyl77mlpqun5ejlyv4kamwzrrh746guq` |
 | connection/fetchai/local/0.20.0                               | `bafybeiema4rnxi54luhzbrccb27pfrwlohemka45eqf4nidgmtkwwmxeyi` |
 | connection/valory/http_client/0.23.0                          | `bafybeihi772xgzpqeipp3fhmvpct4y6e6tpjp4sogwqrnf3wqspgeilg4u` |
-| connection/valory/test_libp2p/0.1.0                           | `bafybeiasj7ppsmn24mes2yw3o72nlmcircscalpl3j5ujzxstknlassa3q` |
+| connection/valory/test_libp2p/0.1.0                           | `bafybeibjjdc3sj326rvtjjrzpbvshjp6nu6zqm4m7wswpo2ei7dzsmhecm` |
 | skill/fetchai/echo/0.19.0                                     | `bafybeicoawiackcbgqo3na3e56tpdc62atag4yxknur77py37caqq4mmya` |
 | skill/fetchai/error_test_skill/0.1.0                          | `bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu` |
 | skill/fetchai/gym/0.20.0                                      | `bafybeie7y2fsxfuhsqxqcaluo5exskmrm5q3a6e2hfcskcuvzvxjjhijh4` |
 | skill/fetchai/http_echo/0.20.0                                | `bafybeicfiri2juaqh3azeit3z3rf44kgxdo6oj4lgxjgvnowq6m7j47qrm` |
-| skill/fetchai/erc1155_client/0.28.0                           | `bafybeih7q6b2lcqcbh7rln3mgcnbtzlw7cpzjl23znnz6jj74cc4noahvq` |
-| skill/fetchai/erc1155_deploy/0.30.0                           | `bafybeigoarj6k2czdhhfqzry5w5jn2ux7chszem37zxiqy3232jr2mxs64` |
+| skill/fetchai/erc1155_client/0.28.0                           | `bafybeibmvrmpssviyujeyqfddbgnl4iu644sq4xyhavsm34oxntoez4r7q` |
+| skill/fetchai/erc1155_deploy/0.30.0                           | `bafybeiczeyks4gkne4ja32pvsresqvnjhv3gd5b4nyqr2vuzoawnyi7ipi` |
 | skill/fetchai/error/0.17.0                                    | `bafybeicboomvykqhel3otyv4qg5t3hzpo6kmn5bk4ljluithhuieu7flsm` |
 | skill/fetchai/fipa_dummy_buyer/0.2.0                          | `bafybeidgso7lo5ay44mbxsp3lxilrgeek3ye44e6wus2ayq6kyxfvc3vjm` |
-| skill/fetchai/generic_buyer/0.26.0                            | `bafybeihzzcbki3p5l4nt5spbddx6nzbejv7b6nruhycwaxfrstjwmrfucq` |
-| skill/fetchai/generic_seller/0.27.0                           | `bafybeig3ffbcefeandebzepxabztob5sdkumydzla52k7pvztmjfegwflq` |
+| skill/fetchai/generic_buyer/0.26.0                            | `bafybeigyritphnqnejt6j7txrghruzkmztqobc4sp65cirlsgexeyxnzua` |
+| skill/fetchai/generic_seller/0.27.0                           | `bafybeifji5wgzwukexlwvhbbvsspyj7fpkaebsa3vm3i3ke4jyenhjszvq` |
 | skill/fetchai/task_test_skill/0.1.0                           | `bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble` |
 | agent/fetchai/error_test/0.1.0                                | `bafybeiecm675ndzbh35jkejtxn4ughoutztltjhgwzfbp57okabedjmnpq` |
 | agent/fetchai/gym_aea/0.25.0                                  | `bafybeibzn3qomqmkaksgpd3gn6aijffvvw7rojswhoytiovohuc737fvfm` |

packages/fetchai/skills/erc1155_client/skill.yaml

@@ -21,7 +21,7 @@ fingerprint:
   tests/test_strategy.py: bafybeicbxie3v6vue3gcnru6vsvggcgy3shxwrldis5gppizbuhooslcqa
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e
+- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi
 contracts:
 - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4
 protocols:

packages/fetchai/skills/erc1155_deploy/skill.yaml

@@ -21,7 +21,7 @@ fingerprint:
   tests/test_strategy.py: bafybeigxtw2j2c7vl6xhdwos62jbtmx62xfgdyadptm5eewmkesmcooyea
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e
+- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi
 contracts:
 - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4
 protocols:

packages/fetchai/skills/generic_buyer/skill.yaml

@@ -19,7 +19,7 @@ fingerprint:
   tests/test_models.py: bafybeibh72j3n72yseqvmpppucpu5wtidf6ebxbxkfnmrnlh4zv5y5apei
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e
+- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi
 contracts: []
 protocols:
 - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24

packages/fetchai/skills/generic_seller/skill.yaml

@@ -20,7 +20,7 @@ fingerprint:
   tests/test_models.py: bafybeihabrc22zqssit3fmqhxptosy6qz6mx65ukhf5iayvirfv42xrhoq
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e
+- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi
 contracts: []
 protocols:
 - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24

packages/packages.json

@@ -14,24 +14,24 @@
         "contract/fetchai/erc1155/0.22.0": "bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4",
         "connection/fetchai/gym/0.19.0": "bafybeicqqvl4tt3qbulnkoffciagmfd6p3hxxi3i2mrrqtnbycv757pn6y",
         "connection/fetchai/stub/0.21.0": "bafybeibybboiwgklfiqpkkcw6rwj65s5jalzfzf6mh6fstxdlt6habzwvy",
-        "connection/valory/ledger/0.19.0": "bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e",
+        "connection/valory/ledger/0.19.0": "bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi",
         "connection/valory/http_server/0.22.0": "bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m",
         "connection/valory/p2p_libp2p/0.1.0": "bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma",
         "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihs5zlwa5wlozct3rjlxsirm3ve3e4buse5nfehiky6ymnnfrobne",
         "connection/valory/p2p_libp2p_mailbox/0.1.0": "bafybeiecclc65ogngs3piaxpwhiyl77mlpqun5ejlyv4kamwzrrh746guq",
         "connection/fetchai/local/0.20.0": "bafybeiema4rnxi54luhzbrccb27pfrwlohemka45eqf4nidgmtkwwmxeyi",
         "connection/valory/http_client/0.23.0": "bafybeihi772xgzpqeipp3fhmvpct4y6e6tpjp4sogwqrnf3wqspgeilg4u",
-        "connection/valory/test_libp2p/0.1.0": "bafybeiasj7ppsmn24mes2yw3o72nlmcircscalpl3j5ujzxstknlassa3q",
+        "connection/valory/test_libp2p/0.1.0": "bafybeibjjdc3sj326rvtjjrzpbvshjp6nu6zqm4m7wswpo2ei7dzsmhecm",
         "skill/fetchai/echo/0.19.0": "bafybeicoawiackcbgqo3na3e56tpdc62atag4yxknur77py37caqq4mmya",
         "skill/fetchai/error_test_skill/0.1.0": "bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu",
         "skill/fetchai/gym/0.20.0": "bafybeie7y2fsxfuhsqxqcaluo5exskmrm5q3a6e2hfcskcuvzvxjjhijh4",
         "skill/fetchai/http_echo/0.20.0": "bafybeicfiri2juaqh3azeit3z3rf44kgxdo6oj4lgxjgvnowq6m7j47qrm",
-        "skill/fetchai/erc1155_client/0.28.0": "bafybeih7q6b2lcqcbh7rln3mgcnbtzlw7cpzjl23znnz6jj74cc4noahvq",
-        "skill/fetchai/erc1155_deploy/0.30.0": "bafybeigoarj6k2czdhhfqzry5w5jn2ux7chszem37zxiqy3232jr2mxs64",
+        "skill/fetchai/erc1155_client/0.28.0": "bafybeibmvrmpssviyujeyqfddbgnl4iu644sq4xyhavsm34oxntoez4r7q",
+        "skill/fetchai/erc1155_deploy/0.30.0": "bafybeiczeyks4gkne4ja32pvsresqvnjhv3gd5b4nyqr2vuzoawnyi7ipi",
         "skill/fetchai/error/0.17.0": "bafybeicboomvykqhel3otyv4qg5t3hzpo6kmn5bk4ljluithhuieu7flsm",
         "skill/fetchai/fipa_dummy_buyer/0.2.0": "bafybeidgso7lo5ay44mbxsp3lxilrgeek3ye44e6wus2ayq6kyxfvc3vjm",
-        "skill/fetchai/generic_buyer/0.26.0": "bafybeihzzcbki3p5l4nt5spbddx6nzbejv7b6nruhycwaxfrstjwmrfucq",
-        "skill/fetchai/generic_seller/0.27.0": "bafybeig3ffbcefeandebzepxabztob5sdkumydzla52k7pvztmjfegwflq",
+        "skill/fetchai/generic_buyer/0.26.0": "bafybeigyritphnqnejt6j7txrghruzkmztqobc4sp65cirlsgexeyxnzua",
+        "skill/fetchai/generic_seller/0.27.0": "bafybeifji5wgzwukexlwvhbbvsspyj7fpkaebsa3vm3i3ke4jyenhjszvq",
         "skill/fetchai/task_test_skill/0.1.0": "bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble",
         "agent/fetchai/error_test/0.1.0": "bafybeiecm675ndzbh35jkejtxn4ughoutztltjhgwzfbp57okabedjmnpq",
         "agent/fetchai/gym_aea/0.25.0": "bafybeibzn3qomqmkaksgpd3gn6aijffvvw7rojswhoytiovohuc737fvfm",

packages/valory/connections/ledger/connection.yaml

@@ -11,12 +11,12 @@ fingerprint:
   base.py: bafybeifuoq2oqlcjlgeg2fg5l2ijiylb23v65xghv7u422helief2cjjuy
   connection.py: bafybeicydkymhz2feqmihtkiwdfg7pp4pww2elqv4tijuhjcplyvawdk74
   contract_dispatcher.py: bafybeidf2wu3rsp5pm45qwjlievbpmueeaj6hjw3kdyn67xhbocylwg3d4
-  ledger_dispatcher.py: bafybeicartiu3mcavtyd3eveonrbak3uaowqzymtaza6gqtoi5msid75ci
+  ledger_dispatcher.py: bafybeig5ql7aljikwbiytsopfsqoyifpjnxdvwj5blpucowtt7eevdw6na
   tests/__init__.py: bafybeifku7ttsmbj4gfx6dkgjvwypx7v5ysfqlzof6vh4p7gujakjtuwhe
   tests/conftest.py: bafybeid7vo7e2m76ey5beeadtbxywxx5ukefd5slwbc362rwmhht6i45ou
   tests/test_contract_dispatcher.py: bafybeiag5lnpc7h25w23ash4hk4cowxsy5buxgpr474l3tfewnhf56eqyq
   tests/test_ledger.py: bafybeigcedfr3yv3jse3xwrerrgwbelgb56uhgrvdus527d3daekh6dx4m
-  tests/test_ledger_api.py: bafybeihlwfzfffyr3gcrwa74g2ctoeymv76ahnxbxyal3xikgb7ftvpnl4
+  tests/test_ledger_api.py: bafybeibdhjxhsavs2fax4rgvsptd6a2tcnv6fq75wqqxpcwwk6zujw3e7e
 fingerprint_ignore_patterns: []
 connections: []
 protocols:

packages/valory/connections/ledger/ledger_dispatcher.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2021-2023 Valory AG
+#   Copyright 2021-2024 Valory AG
 #   Copyright 2018-2021 Fetch.AI Limited
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -267,10 +267,9 @@ async def get_transaction_receipt(
         )
 
         transaction_receipt = None
-        is_settled = False
         attempts = 0
         while (
-            not is_settled
+            transaction_receipt is None
             and attempts < retry_attempts
             and self.connection_state.get() == ConnectionStates.connected
         ):
@@ -286,13 +285,9 @@ async def get_transaction_receipt(
                 self.logger.warning(e)
                 transaction_receipt = None
 
-            if transaction_receipt is not None:
-                is_settled = api.is_transaction_settled(transaction_receipt)
             attempts += 1
             await asyncio.sleep(retry_timeout * attempts)
-        self.logger.debug(
-            f"Transaction receipt: {transaction_receipt}, settled: {is_settled}"
-        )
+        self.logger.debug(f"Transaction receipt: {transaction_receipt}")
 
         attempts = 0
         transaction = None
@@ -317,14 +312,7 @@ async def get_transaction_receipt(
             await asyncio.sleep(retry_timeout * attempts)
         self.logger.debug(f"Transaction: {transaction}")
 
-        if not is_settled:
-            response = self.get_error_message(
-                ValueError("Transaction not settled within timeout"),
-                api,
-                message,
-                dialogue,
-            )
-        elif transaction_receipt is None:  # pragma: nocover
+        if transaction_receipt is None:  # pragma: nocover
             response = self.get_error_message(
                 ValueError("No transaction_receipt returned"), api, message, dialogue
             )

packages/valory/connections/ledger/tests/test_ledger_api.py

@@ -638,7 +638,7 @@ async def test_no_raw_tx(
     @pytest.mark.asyncio
     @pytest.mark.parametrize(
         "failing_ledger_method_name",
-        ("get_transaction_receipt", "is_transaction_settled", "get_transaction"),
+        ("get_transaction_receipt", "get_transaction"),
     )
     @pytest.mark.parametrize("retries", (0, 5, 20))
     @pytest.mark.parametrize("retry_timeout", (0.1,))

packages/valory/connections/test_libp2p/connection.yaml

@@ -12,7 +12,7 @@ fingerprint:
   readme.md: bafybeihg5yfzgqvg5ngy7r2o5tfeqnelx2ffxw4po5hmheqjfhumpmxpoq
   tests/__init__.py: bafybeiarz6mhky6pnkdihibcuqrfpx3qo55roygneoaoq2mndi5lzdlcj4
   tests/acn_image.py: bafybeidkaavxkfocmg5c6y3i32fmbdf5i77jmqteoylmutifoh4zig3pr4
-  tests/base.py: bafybeicnngqp7pw6thjf4yjewk6kazaezpfumiob6mfwupdvwxaij6xwwm
+  tests/base.py: bafybeibsotk3te523igjnkmioqikgor3iwd3vunwonsmuj7debwwv5mtri
   tests/conftest.py: bafybeifkjrvsysdb7ujp2wxurzgytzy3ecu6fv247zfszfymdvb7y7klpu
   tests/test_certificate_dates.py: bafybeif4t76wsvsfvvplkmi4gecgod6ijff3bbqgtaqmpep6ywfapfptfm
   tests/test_dht.py: bafybeienykwwpdjlbjzxzttxjhgas2edp2f657gbsexjtkztehoq4yfb7m

packages/valory/connections/test_libp2p/tests/base.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2022-2023 Valory AG
+#   Copyright 2022-2024 Valory AG
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -279,10 +279,10 @@ def _make_libp2p_connection(
 class BaseP2PLibp2pTest:
     """Base class for ACN p2p libp2p tests"""
 
-    cwd: str
-    tmp: str
-    tmp_dir: str
-    tmp_client_dir: str
+    cwd: str = ""
+    tmp: str = ""
+    tmp_dir: str = ""
+    tmp_client_dir: str = ""
     log_files: List[str] = []
     multiplexers: List[Multiplexer] = []
     capture_log = True