From 534eb8576b24a767cfc157157cdb0c5da1417315 Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 10 Dec 2024 14:23:09 +0100 Subject: [PATCH 01/12] fix: get tx receipt should return even if reverted tx --- .../fetchai/skills/erc1155_client/skill.yaml | 2 +- .../fetchai/skills/erc1155_deploy/skill.yaml | 2 +- packages/fetchai/skills/generic_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_seller/skill.yaml | 2 +- packages/packages.json | 10 +++++----- .../valory/connections/ledger/connection.yaml | 2 +- .../connections/ledger/ledger_dispatcher.py | 16 +++------------- 7 files changed, 13 insertions(+), 23 deletions(-) diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index d84dd05e49..b7ab3a3051 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/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:bafybeibq6khjuzkuok2jbght36bw2rxp5pyvqhg52zs7fs6fs7oo53zz2u contracts: - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4 protocols: diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index f56dc80199..919511c888 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/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:bafybeibq6khjuzkuok2jbght36bw2rxp5pyvqhg52zs7fs6fs7oo53zz2u contracts: - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4 protocols: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index 25fae0f272..61c580822d 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/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:bafybeibq6khjuzkuok2jbght36bw2rxp5pyvqhg52zs7fs6fs7oo53zz2u contracts: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 9defb353fa..a86f26d64c 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/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:bafybeibq6khjuzkuok2jbght36bw2rxp5pyvqhg52zs7fs6fs7oo53zz2u contracts: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 diff --git a/packages/packages.json b/packages/packages.json index 80e2f7747d..339a0a1144 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -14,7 +14,7 @@ "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": "bafybeibq6khjuzkuok2jbght36bw2rxp5pyvqhg52zs7fs6fs7oo53zz2u", "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", @@ -26,12 +26,12 @@ "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": "bafybeiht6rpcctnxai7kycrff6m53oyobexikm2i3jguvtroesggyoej4a", + "skill/fetchai/erc1155_deploy/0.30.0": "bafybeif6icmyv2bzh2mhgw6ze4x6btstnuizi2jjujyu57kv53kedkyzma", "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": "bafybeigjayrlojlada6anhg2lxwlnc7ne6sgfsqafjc4movkxpdidybdzm", + "skill/fetchai/generic_seller/0.27.0": "bafybeiavgvwf37ri7ncyuzwv4sgbm6hdnada4plmok2hocoiw5oyrqtgwa", "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", diff --git a/packages/valory/connections/ledger/connection.yaml b/packages/valory/connections/ledger/connection.yaml index b269e899e9..86327e7746 100644 --- a/packages/valory/connections/ledger/connection.yaml +++ b/packages/valory/connections/ledger/connection.yaml @@ -11,7 +11,7 @@ fingerprint: base.py: bafybeifuoq2oqlcjlgeg2fg5l2ijiylb23v65xghv7u422helief2cjjuy connection.py: bafybeicydkymhz2feqmihtkiwdfg7pp4pww2elqv4tijuhjcplyvawdk74 contract_dispatcher.py: bafybeidf2wu3rsp5pm45qwjlievbpmueeaj6hjw3kdyn67xhbocylwg3d4 - ledger_dispatcher.py: bafybeicartiu3mcavtyd3eveonrbak3uaowqzymtaza6gqtoi5msid75ci + ledger_dispatcher.py: bafybeibzabchggvsahvaygqrn3nmmpuoqz3lcfesy7k6asg3ruiff7s6de tests/__init__.py: bafybeifku7ttsmbj4gfx6dkgjvwypx7v5ysfqlzof6vh4p7gujakjtuwhe tests/conftest.py: bafybeid7vo7e2m76ey5beeadtbxywxx5ukefd5slwbc362rwmhht6i45ou tests/test_contract_dispatcher.py: bafybeiag5lnpc7h25w23ash4hk4cowxsy5buxgpr474l3tfewnhf56eqyq diff --git a/packages/valory/connections/ledger/ledger_dispatcher.py b/packages/valory/connections/ledger/ledger_dispatcher.py index de927acf70..e673035510 100644 --- a/packages/valory/connections/ledger/ledger_dispatcher.py +++ b/packages/valory/connections/ledger/ledger_dispatcher.py @@ -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,12 +285,10 @@ 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}" + f"Transaction receipt: {transaction_receipt}" ) attempts = 0 @@ -317,14 +314,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 ) From 4a789c926021e1b5e9fcc7c113749c78659697a9 Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 10 Dec 2024 15:30:06 +0100 Subject: [PATCH 02/12] chore: lint --- packages/valory/connections/ledger/ledger_dispatcher.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/valory/connections/ledger/ledger_dispatcher.py b/packages/valory/connections/ledger/ledger_dispatcher.py index e673035510..daaf4eda60 100644 --- a/packages/valory/connections/ledger/ledger_dispatcher.py +++ b/packages/valory/connections/ledger/ledger_dispatcher.py @@ -287,9 +287,7 @@ async def get_transaction_receipt( attempts += 1 await asyncio.sleep(retry_timeout * attempts) - self.logger.debug( - f"Transaction receipt: {transaction_receipt}" - ) + self.logger.debug(f"Transaction receipt: {transaction_receipt}") attempts = 0 transaction = None From fb86a7a11ff9887525c064d2f386d7026ed563c2 Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 10 Dec 2024 15:36:04 +0100 Subject: [PATCH 03/12] chore: generators --- docs/package_list.md | 10 ++++----- .../fetchai/skills/erc1155_client/skill.yaml | 2 +- .../fetchai/skills/erc1155_deploy/skill.yaml | 2 +- .../fetchai/skills/generic_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_seller/skill.yaml | 2 +- packages/packages.json | 20 ++++++++--------- .../valory/connections/ledger/connection.yaml | 2 +- .../connections/ledger/ledger_dispatcher.py | 2 +- .../connections/p2p_libp2p/connection.yaml | 2 +- .../p2p_libp2p_client/connection.yaml | 2 +- .../p2p_libp2p_mailbox/connection.yaml | 2 +- .../connections/test_libp2p/connection.yaml | 8 +++---- packages/valory/protocols/acn/acn.proto | 22 +++++++++---------- packages/valory/protocols/acn/protocol.yaml | 2 +- 14 files changed, 40 insertions(+), 40 deletions(-) diff --git a/docs/package_list.md b/docs/package_list.md index ccfd4f30b5..b35214da0b 100644 --- a/docs/package_list.md +++ b/docs/package_list.md @@ -14,7 +14,7 @@ | 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 | `bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu` | | 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` | @@ -26,12 +26,12 @@ | 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 | `bafybeif6b2dcigsxzoggofuyqo7xzv45mykn2modoxag7ss4qkuppzpzti` | +| skill/fetchai/erc1155_deploy/0.30.0 | `bafybeielryponhgq23u6ktkfoxliqst26bpqrcfylnhsu6ri6z6xftinte` | | 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 | `bafybeiadajkdrjfcweckxx75rv3vrt3fjd2fka26lxgfen6c4mkb7xoy4q` | +| skill/fetchai/generic_seller/0.27.0 | `bafybeidtmbb4izan6ea3tyaelvz75lst7zlyxcc2rewdgm3x7upra25sj4` | | 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` | diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index b7ab3a3051..add4e17123 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/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:bafybeibq6khjuzkuok2jbght36bw2rxp5pyvqhg52zs7fs6fs7oo53zz2u +- valory/ledger:0.19.0:bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu contracts: - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4 protocols: diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 919511c888..9ba8e99c95 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/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:bafybeibq6khjuzkuok2jbght36bw2rxp5pyvqhg52zs7fs6fs7oo53zz2u +- valory/ledger:0.19.0:bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu contracts: - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4 protocols: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index 61c580822d..d8ca99c017 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/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:bafybeibq6khjuzkuok2jbght36bw2rxp5pyvqhg52zs7fs6fs7oo53zz2u +- valory/ledger:0.19.0:bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu contracts: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index a86f26d64c..9246e62913 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/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:bafybeibq6khjuzkuok2jbght36bw2rxp5pyvqhg52zs7fs6fs7oo53zz2u +- valory/ledger:0.19.0:bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu contracts: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 diff --git a/packages/packages.json b/packages/packages.json index 339a0a1144..98aa9c0e71 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -2,7 +2,7 @@ "dev": { "protocol/fetchai/gym/1.0.0": "bafybeiflnuet6ofanewmst3lchg2gkoj2vuspcajya7esfkrmiqqphuwxq", "protocol/fetchai/default/1.0.0": "bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24", - "protocol/valory/acn/1.1.0": "bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe", + "protocol/valory/acn/1.1.0": "bafybeie3x5gdca6b65do4iea6drnmtmvjudqnuehl4zfyg7efcup4p7ye4", "protocol/valory/contract_api/1.0.0": "bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i", "protocol/valory/http/1.0.0": "bafybeifugzl63kfdmwrxwphrnrhj7bn6iruxieme3a4ntzejf6kmtuwmae", "protocol/valory/ledger_api/1.0.0": "bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni", @@ -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": "bafybeibq6khjuzkuok2jbght36bw2rxp5pyvqhg52zs7fs6fs7oo53zz2u", + "connection/valory/ledger/0.19.0": "bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu", "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/valory/p2p_libp2p/0.1.0": "bafybeig7hziqdv5zlpgccn5m6b4kifjycbx57c7vpmxgcncyxlyz7xwuau", + "connection/valory/p2p_libp2p_client/0.1.0": "bafybeig53m7fvlepz7wrs2nebdgiddacydpqwc2ksj57bymsqaumiohi3y", + "connection/valory/p2p_libp2p_mailbox/0.1.0": "bafybeigtub7x4idh7crlfmkamdrkg7hzqpepngxhgizczvxjmh7dctx4ry", "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": "bafybeigypnl3y6w7nfpn6labzbibtjfgxxzaf6gglek5yy2gtlgxsweyay", "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": "bafybeiht6rpcctnxai7kycrff6m53oyobexikm2i3jguvtroesggyoej4a", - "skill/fetchai/erc1155_deploy/0.30.0": "bafybeif6icmyv2bzh2mhgw6ze4x6btstnuizi2jjujyu57kv53kedkyzma", + "skill/fetchai/erc1155_client/0.28.0": "bafybeif6b2dcigsxzoggofuyqo7xzv45mykn2modoxag7ss4qkuppzpzti", + "skill/fetchai/erc1155_deploy/0.30.0": "bafybeielryponhgq23u6ktkfoxliqst26bpqrcfylnhsu6ri6z6xftinte", "skill/fetchai/error/0.17.0": "bafybeicboomvykqhel3otyv4qg5t3hzpo6kmn5bk4ljluithhuieu7flsm", "skill/fetchai/fipa_dummy_buyer/0.2.0": "bafybeidgso7lo5ay44mbxsp3lxilrgeek3ye44e6wus2ayq6kyxfvc3vjm", - "skill/fetchai/generic_buyer/0.26.0": "bafybeigjayrlojlada6anhg2lxwlnc7ne6sgfsqafjc4movkxpdidybdzm", - "skill/fetchai/generic_seller/0.27.0": "bafybeiavgvwf37ri7ncyuzwv4sgbm6hdnada4plmok2hocoiw5oyrqtgwa", + "skill/fetchai/generic_buyer/0.26.0": "bafybeiadajkdrjfcweckxx75rv3vrt3fjd2fka26lxgfen6c4mkb7xoy4q", + "skill/fetchai/generic_seller/0.27.0": "bafybeidtmbb4izan6ea3tyaelvz75lst7zlyxcc2rewdgm3x7upra25sj4", "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", diff --git a/packages/valory/connections/ledger/connection.yaml b/packages/valory/connections/ledger/connection.yaml index 86327e7746..8d13b3ceb5 100644 --- a/packages/valory/connections/ledger/connection.yaml +++ b/packages/valory/connections/ledger/connection.yaml @@ -11,7 +11,7 @@ fingerprint: base.py: bafybeifuoq2oqlcjlgeg2fg5l2ijiylb23v65xghv7u422helief2cjjuy connection.py: bafybeicydkymhz2feqmihtkiwdfg7pp4pww2elqv4tijuhjcplyvawdk74 contract_dispatcher.py: bafybeidf2wu3rsp5pm45qwjlievbpmueeaj6hjw3kdyn67xhbocylwg3d4 - ledger_dispatcher.py: bafybeibzabchggvsahvaygqrn3nmmpuoqz3lcfesy7k6asg3ruiff7s6de + ledger_dispatcher.py: bafybeig5ql7aljikwbiytsopfsqoyifpjnxdvwj5blpucowtt7eevdw6na tests/__init__.py: bafybeifku7ttsmbj4gfx6dkgjvwypx7v5ysfqlzof6vh4p7gujakjtuwhe tests/conftest.py: bafybeid7vo7e2m76ey5beeadtbxywxx5ukefd5slwbc362rwmhht6i45ou tests/test_contract_dispatcher.py: bafybeiag5lnpc7h25w23ash4hk4cowxsy5buxgpr474l3tfewnhf56eqyq diff --git a/packages/valory/connections/ledger/ledger_dispatcher.py b/packages/valory/connections/ledger/ledger_dispatcher.py index daaf4eda60..56424e6138 100644 --- a/packages/valory/connections/ledger/ledger_dispatcher.py +++ b/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"); diff --git a/packages/valory/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml index 6d85cca364..ffa8bca7d7 100644 --- a/packages/valory/connections/p2p_libp2p/connection.yaml +++ b/packages/valory/connections/p2p_libp2p/connection.yaml @@ -65,7 +65,7 @@ build_entrypoint: check_dependencies.py connections: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 -- valory/acn:1.1.0:bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe +- valory/acn:1.1.0:bafybeie3x5gdca6b65do4iea6drnmtmvjudqnuehl4zfyg7efcup4p7ye4 class_name: P2PLibp2pConnection config: delegate_uri: 127.0.0.1:11000 diff --git a/packages/valory/connections/p2p_libp2p_client/connection.yaml b/packages/valory/connections/p2p_libp2p_client/connection.yaml index 5058f5969e..b17e11c536 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_client/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/acn:1.1.0:bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe +- valory/acn:1.1.0:bafybeie3x5gdca6b65do4iea6drnmtmvjudqnuehl4zfyg7efcup4p7ye4 class_name: P2PLibp2pClientConnection config: connect_retries: 3 diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml index 2b2257b094..488d4e0d75 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/acn:1.1.0:bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe +- valory/acn:1.1.0:bafybeie3x5gdca6b65do4iea6drnmtmvjudqnuehl4zfyg7efcup4p7ye4 class_name: P2PLibp2pMailboxConnection config: connect_retries: 3 diff --git a/packages/valory/connections/test_libp2p/connection.yaml b/packages/valory/connections/test_libp2p/connection.yaml index e8df596ec9..53dee9b479 100644 --- a/packages/valory/connections/test_libp2p/connection.yaml +++ b/packages/valory/connections/test_libp2p/connection.yaml @@ -34,12 +34,12 @@ fingerprint: tests/test_p2p_libp2p_mailbox/test_mailbox_service.py: bafybeibp3bkwkrw57qahvuysjdlumywtlk3te5gsvusgrvhsc75k7rrk4u fingerprint_ignore_patterns: [] connections: -- valory/p2p_libp2p:0.1.0:bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma -- valory/p2p_libp2p_client:0.1.0:bafybeihs5zlwa5wlozct3rjlxsirm3ve3e4buse5nfehiky6ymnnfrobne -- valory/p2p_libp2p_mailbox:0.1.0:bafybeiecclc65ogngs3piaxpwhiyl77mlpqun5ejlyv4kamwzrrh746guq +- valory/p2p_libp2p:0.1.0:bafybeig7hziqdv5zlpgccn5m6b4kifjycbx57c7vpmxgcncyxlyz7xwuau +- valory/p2p_libp2p_client:0.1.0:bafybeig53m7fvlepz7wrs2nebdgiddacydpqwc2ksj57bymsqaumiohi3y +- valory/p2p_libp2p_mailbox:0.1.0:bafybeigtub7x4idh7crlfmkamdrkg7hzqpepngxhgizczvxjmh7dctx4ry protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 -- valory/acn:1.1.0:bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe +- valory/acn:1.1.0:bafybeie3x5gdca6b65do4iea6drnmtmvjudqnuehl4zfyg7efcup4p7ye4 class_name: MyScaffoldAsyncConnection config: foo: bar diff --git a/packages/valory/protocols/acn/acn.proto b/packages/valory/protocols/acn/acn.proto index a2c2dc25de..05a881aace 100644 --- a/packages/valory/protocols/acn/acn.proto +++ b/packages/valory/protocols/acn/acn.proto @@ -19,19 +19,19 @@ message AcnMessage{ message StatusBody{ enum StatusCodeEnum { // common (0x) - SUCCESS = 0; - ERROR_UNSUPPORTED_VERSION = 1; - ERROR_UNEXPECTED_PAYLOAD = 2; - ERROR_GENERIC = 3; - ERROR_DECODE = 4; + STATUS_CODE_ENUM_SUCCESS = 0; + STATUS_CODE_ENUM_ERROR_UNSUPPORTED_VERSION = 1; + STATUS_CODE_ENUM_ERROR_UNEXPECTED_PAYLOAD = 2; + STATUS_CODE_ENUM_ERROR_GENERIC = 3; + STATUS_CODE_ENUM_ERROR_DECODE = 4; // register (1x) - ERROR_WRONG_AGENT_ADDRESS = 10; - ERROR_WRONG_PUBLIC_KEY = 11; - ERROR_INVALID_PROOF = 12; - ERROR_UNSUPPORTED_LEDGER = 13; + STATUS_CODE_ENUM_ERROR_WRONG_AGENT_ADDRESS = 10; + STATUS_CODE_ENUM_ERROR_WRONG_PUBLIC_KEY = 11; + STATUS_CODE_ENUM_ERROR_INVALID_PROOF = 12; + STATUS_CODE_ENUM_ERROR_UNSUPPORTED_LEDGER = 13; // lookup & delivery (2x) - ERROR_UNKNOWN_AGENT_ADDRESS = 20; - ERROR_AGENT_NOT_READY = 21; + STATUS_CODE_ENUM_ERROR_UNKNOWN_AGENT_ADDRESS = 20; + STATUS_CODE_ENUM_ERROR_AGENT_NOT_READY = 21; } StatusCodeEnum code = 1; repeated string msgs = 2; diff --git a/packages/valory/protocols/acn/protocol.yaml b/packages/valory/protocols/acn/protocol.yaml index 2062cfb934..3124a06434 100644 --- a/packages/valory/protocols/acn/protocol.yaml +++ b/packages/valory/protocols/acn/protocol.yaml @@ -9,7 +9,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeie7paijucvzemlfhwfmmhorypwuhzbeimgoitlkokdio5c3ne4pjq __init__.py: bafybeicqlp4gkeeef5osp6zopjztlgat24nxrzq43cy7wbwxk5omf2sc2m - acn.proto: bafybeidkun7o75sxpyk2sixt7dsykgty62f6dnixnes2irbunyamilqsh4 + acn.proto: bafybeicnis6et7ootbswpmtbhmtfbptaeixnpauqkcdrwxzzmvtcmveesm acn_pb2.py: bafybeialafz3yomunwa3g5xgrdqwodzl7zg5dncvzuetv7xoew4zhw76ni custom_types.py: bafybeigpueuq6mdeyjyayzv3menkmemutfgfiwlozlpl64t67cfnnom24q dialogues.py: bafybeidjpyk7s3getyfegjdrgrt5blf2yutzqclohaktjehwcj3sqx2ole From 2f28aa8a3170d10aaea1e101c27311777f1f19a1 Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 10 Dec 2024 15:45:26 +0100 Subject: [PATCH 04/12] chore: protocol changes revert --- packages/packages.json | 10 ++++----- .../connections/p2p_libp2p/connection.yaml | 2 +- .../p2p_libp2p_client/connection.yaml | 2 +- .../p2p_libp2p_mailbox/connection.yaml | 2 +- .../connections/test_libp2p/connection.yaml | 8 +++---- packages/valory/protocols/acn/acn.proto | 22 +++++++++---------- packages/valory/protocols/acn/protocol.yaml | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 98aa9c0e71..72058ed539 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -2,7 +2,7 @@ "dev": { "protocol/fetchai/gym/1.0.0": "bafybeiflnuet6ofanewmst3lchg2gkoj2vuspcajya7esfkrmiqqphuwxq", "protocol/fetchai/default/1.0.0": "bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24", - "protocol/valory/acn/1.1.0": "bafybeie3x5gdca6b65do4iea6drnmtmvjudqnuehl4zfyg7efcup4p7ye4", + "protocol/valory/acn/1.1.0": "bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe", "protocol/valory/contract_api/1.0.0": "bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i", "protocol/valory/http/1.0.0": "bafybeifugzl63kfdmwrxwphrnrhj7bn6iruxieme3a4ntzejf6kmtuwmae", "protocol/valory/ledger_api/1.0.0": "bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni", @@ -16,12 +16,12 @@ "connection/fetchai/stub/0.21.0": "bafybeibybboiwgklfiqpkkcw6rwj65s5jalzfzf6mh6fstxdlt6habzwvy", "connection/valory/ledger/0.19.0": "bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu", "connection/valory/http_server/0.22.0": "bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m", - "connection/valory/p2p_libp2p/0.1.0": "bafybeig7hziqdv5zlpgccn5m6b4kifjycbx57c7vpmxgcncyxlyz7xwuau", - "connection/valory/p2p_libp2p_client/0.1.0": "bafybeig53m7fvlepz7wrs2nebdgiddacydpqwc2ksj57bymsqaumiohi3y", - "connection/valory/p2p_libp2p_mailbox/0.1.0": "bafybeigtub7x4idh7crlfmkamdrkg7hzqpepngxhgizczvxjmh7dctx4ry", + "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": "bafybeigypnl3y6w7nfpn6labzbibtjfgxxzaf6gglek5yy2gtlgxsweyay", + "connection/valory/test_libp2p/0.1.0": "bafybeiasj7ppsmn24mes2yw3o72nlmcircscalpl3j5ujzxstknlassa3q", "skill/fetchai/echo/0.19.0": "bafybeicoawiackcbgqo3na3e56tpdc62atag4yxknur77py37caqq4mmya", "skill/fetchai/error_test_skill/0.1.0": "bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu", "skill/fetchai/gym/0.20.0": "bafybeie7y2fsxfuhsqxqcaluo5exskmrm5q3a6e2hfcskcuvzvxjjhijh4", diff --git a/packages/valory/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml index ffa8bca7d7..6d85cca364 100644 --- a/packages/valory/connections/p2p_libp2p/connection.yaml +++ b/packages/valory/connections/p2p_libp2p/connection.yaml @@ -65,7 +65,7 @@ build_entrypoint: check_dependencies.py connections: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 -- valory/acn:1.1.0:bafybeie3x5gdca6b65do4iea6drnmtmvjudqnuehl4zfyg7efcup4p7ye4 +- valory/acn:1.1.0:bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe class_name: P2PLibp2pConnection config: delegate_uri: 127.0.0.1:11000 diff --git a/packages/valory/connections/p2p_libp2p_client/connection.yaml b/packages/valory/connections/p2p_libp2p_client/connection.yaml index b17e11c536..5058f5969e 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_client/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/acn:1.1.0:bafybeie3x5gdca6b65do4iea6drnmtmvjudqnuehl4zfyg7efcup4p7ye4 +- valory/acn:1.1.0:bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe class_name: P2PLibp2pClientConnection config: connect_retries: 3 diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml index 488d4e0d75..2b2257b094 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/acn:1.1.0:bafybeie3x5gdca6b65do4iea6drnmtmvjudqnuehl4zfyg7efcup4p7ye4 +- valory/acn:1.1.0:bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe class_name: P2PLibp2pMailboxConnection config: connect_retries: 3 diff --git a/packages/valory/connections/test_libp2p/connection.yaml b/packages/valory/connections/test_libp2p/connection.yaml index 53dee9b479..e8df596ec9 100644 --- a/packages/valory/connections/test_libp2p/connection.yaml +++ b/packages/valory/connections/test_libp2p/connection.yaml @@ -34,12 +34,12 @@ fingerprint: tests/test_p2p_libp2p_mailbox/test_mailbox_service.py: bafybeibp3bkwkrw57qahvuysjdlumywtlk3te5gsvusgrvhsc75k7rrk4u fingerprint_ignore_patterns: [] connections: -- valory/p2p_libp2p:0.1.0:bafybeig7hziqdv5zlpgccn5m6b4kifjycbx57c7vpmxgcncyxlyz7xwuau -- valory/p2p_libp2p_client:0.1.0:bafybeig53m7fvlepz7wrs2nebdgiddacydpqwc2ksj57bymsqaumiohi3y -- valory/p2p_libp2p_mailbox:0.1.0:bafybeigtub7x4idh7crlfmkamdrkg7hzqpepngxhgizczvxjmh7dctx4ry +- valory/p2p_libp2p:0.1.0:bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma +- valory/p2p_libp2p_client:0.1.0:bafybeihs5zlwa5wlozct3rjlxsirm3ve3e4buse5nfehiky6ymnnfrobne +- valory/p2p_libp2p_mailbox:0.1.0:bafybeiecclc65ogngs3piaxpwhiyl77mlpqun5ejlyv4kamwzrrh746guq protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 -- valory/acn:1.1.0:bafybeie3x5gdca6b65do4iea6drnmtmvjudqnuehl4zfyg7efcup4p7ye4 +- valory/acn:1.1.0:bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe class_name: MyScaffoldAsyncConnection config: foo: bar diff --git a/packages/valory/protocols/acn/acn.proto b/packages/valory/protocols/acn/acn.proto index 05a881aace..a2c2dc25de 100644 --- a/packages/valory/protocols/acn/acn.proto +++ b/packages/valory/protocols/acn/acn.proto @@ -19,19 +19,19 @@ message AcnMessage{ message StatusBody{ enum StatusCodeEnum { // common (0x) - STATUS_CODE_ENUM_SUCCESS = 0; - STATUS_CODE_ENUM_ERROR_UNSUPPORTED_VERSION = 1; - STATUS_CODE_ENUM_ERROR_UNEXPECTED_PAYLOAD = 2; - STATUS_CODE_ENUM_ERROR_GENERIC = 3; - STATUS_CODE_ENUM_ERROR_DECODE = 4; + SUCCESS = 0; + ERROR_UNSUPPORTED_VERSION = 1; + ERROR_UNEXPECTED_PAYLOAD = 2; + ERROR_GENERIC = 3; + ERROR_DECODE = 4; // register (1x) - STATUS_CODE_ENUM_ERROR_WRONG_AGENT_ADDRESS = 10; - STATUS_CODE_ENUM_ERROR_WRONG_PUBLIC_KEY = 11; - STATUS_CODE_ENUM_ERROR_INVALID_PROOF = 12; - STATUS_CODE_ENUM_ERROR_UNSUPPORTED_LEDGER = 13; + ERROR_WRONG_AGENT_ADDRESS = 10; + ERROR_WRONG_PUBLIC_KEY = 11; + ERROR_INVALID_PROOF = 12; + ERROR_UNSUPPORTED_LEDGER = 13; // lookup & delivery (2x) - STATUS_CODE_ENUM_ERROR_UNKNOWN_AGENT_ADDRESS = 20; - STATUS_CODE_ENUM_ERROR_AGENT_NOT_READY = 21; + ERROR_UNKNOWN_AGENT_ADDRESS = 20; + ERROR_AGENT_NOT_READY = 21; } StatusCodeEnum code = 1; repeated string msgs = 2; diff --git a/packages/valory/protocols/acn/protocol.yaml b/packages/valory/protocols/acn/protocol.yaml index 3124a06434..2062cfb934 100644 --- a/packages/valory/protocols/acn/protocol.yaml +++ b/packages/valory/protocols/acn/protocol.yaml @@ -9,7 +9,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeie7paijucvzemlfhwfmmhorypwuhzbeimgoitlkokdio5c3ne4pjq __init__.py: bafybeicqlp4gkeeef5osp6zopjztlgat24nxrzq43cy7wbwxk5omf2sc2m - acn.proto: bafybeicnis6et7ootbswpmtbhmtfbptaeixnpauqkcdrwxzzmvtcmveesm + acn.proto: bafybeidkun7o75sxpyk2sixt7dsykgty62f6dnixnes2irbunyamilqsh4 acn_pb2.py: bafybeialafz3yomunwa3g5xgrdqwodzl7zg5dncvzuetv7xoew4zhw76ni custom_types.py: bafybeigpueuq6mdeyjyayzv3menkmemutfgfiwlozlpl64t67cfnnom24q dialogues.py: bafybeidjpyk7s3getyfegjdrgrt5blf2yutzqclohaktjehwcj3sqx2ole From f1dc50338e7cf5800e9b6bce0f5af4f5e9adebc8 Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 10 Dec 2024 16:03:07 +0100 Subject: [PATCH 05/12] ci: bump mac os version --- .github/workflows/workflow.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 909d8b6d37..a245abed88 100644 --- a/.github/workflows/workflow.yml +++ b/.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, 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, 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, macos-14, 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' + name: Install dependencies (macos-14) 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, windows-latest] python-version: ["3.10"] timeout-minutes: 45 steps: From 106471d4c52a7087390d7fbc230d191903cb818b Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 10 Dec 2024 20:27:17 +0100 Subject: [PATCH 06/12] test: remove tx settlement req --- packages/fetchai/skills/erc1155_client/skill.yaml | 2 +- packages/fetchai/skills/erc1155_deploy/skill.yaml | 2 +- packages/fetchai/skills/generic_buyer/skill.yaml | 2 +- packages/fetchai/skills/generic_seller/skill.yaml | 2 +- packages/packages.json | 10 +++++----- packages/valory/connections/ledger/connection.yaml | 2 +- .../valory/connections/ledger/tests/test_ledger_api.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index add4e17123..e1e5d5d0ad 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/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:bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu +- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi contracts: - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4 protocols: diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 9ba8e99c95..22ccd8fe39 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/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:bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu +- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi contracts: - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4 protocols: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index d8ca99c017..46edcfd72c 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/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:bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu +- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi contracts: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 9246e62913..fe7e199729 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/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:bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu +- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi contracts: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 diff --git a/packages/packages.json b/packages/packages.json index 72058ed539..3ca08d04bb 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -14,7 +14,7 @@ "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": "bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu", + "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", @@ -26,12 +26,12 @@ "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": "bafybeif6b2dcigsxzoggofuyqo7xzv45mykn2modoxag7ss4qkuppzpzti", - "skill/fetchai/erc1155_deploy/0.30.0": "bafybeielryponhgq23u6ktkfoxliqst26bpqrcfylnhsu6ri6z6xftinte", + "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": "bafybeiadajkdrjfcweckxx75rv3vrt3fjd2fka26lxgfen6c4mkb7xoy4q", - "skill/fetchai/generic_seller/0.27.0": "bafybeidtmbb4izan6ea3tyaelvz75lst7zlyxcc2rewdgm3x7upra25sj4", + "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", diff --git a/packages/valory/connections/ledger/connection.yaml b/packages/valory/connections/ledger/connection.yaml index 8d13b3ceb5..ddcb7ff089 100644 --- a/packages/valory/connections/ledger/connection.yaml +++ b/packages/valory/connections/ledger/connection.yaml @@ -16,7 +16,7 @@ fingerprint: 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: diff --git a/packages/valory/connections/ledger/tests/test_ledger_api.py b/packages/valory/connections/ledger/tests/test_ledger_api.py index d0864f9eba..1b3c4a417c 100644 --- a/packages/valory/connections/ledger/tests/test_ledger_api.py +++ b/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,)) From c3f7bb8bc77c96f00a268da8fb2cf823e36315dd Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 10 Dec 2024 20:33:20 +0100 Subject: [PATCH 07/12] chore: generators --- docs/package_list.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/package_list.md b/docs/package_list.md index b35214da0b..774861b51c 100644 --- a/docs/package_list.md +++ b/docs/package_list.md @@ -14,7 +14,7 @@ | 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 | `bafybeicmb2twoim4duq3xlmxy2tigrz7nctmqqkyv6m5vjnjqiha5txfxu` | +| 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` | @@ -26,12 +26,12 @@ | 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 | `bafybeif6b2dcigsxzoggofuyqo7xzv45mykn2modoxag7ss4qkuppzpzti` | -| skill/fetchai/erc1155_deploy/0.30.0 | `bafybeielryponhgq23u6ktkfoxliqst26bpqrcfylnhsu6ri6z6xftinte` | +| 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 | `bafybeiadajkdrjfcweckxx75rv3vrt3fjd2fka26lxgfen6c4mkb7xoy4q` | -| skill/fetchai/generic_seller/0.27.0 | `bafybeidtmbb4izan6ea3tyaelvz75lst7zlyxcc2rewdgm3x7upra25sj4` | +| 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` | From ec820631cce9e42ed7c726ef9bffd6cd73ed4060 Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 11 Dec 2024 15:13:07 +0100 Subject: [PATCH 08/12] chore: add default values for `BaseP2PLibp2pTest` class attrs --- docs/package_list.md | 2 +- packages/packages.json | 2 +- .../valory/connections/test_libp2p/connection.yaml | 2 +- packages/valory/connections/test_libp2p/tests/base.py | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/package_list.md b/docs/package_list.md index b35214da0b..08e1ad1f99 100644 --- a/docs/package_list.md +++ b/docs/package_list.md @@ -21,7 +21,7 @@ | 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` | diff --git a/packages/packages.json b/packages/packages.json index 72058ed539..34a15c9838 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -21,7 +21,7 @@ "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", diff --git a/packages/valory/connections/test_libp2p/connection.yaml b/packages/valory/connections/test_libp2p/connection.yaml index e8df596ec9..1933f73efa 100644 --- a/packages/valory/connections/test_libp2p/connection.yaml +++ b/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 diff --git a/packages/valory/connections/test_libp2p/tests/base.py b/packages/valory/connections/test_libp2p/tests/base.py index af71953bc6..321054e2af 100644 --- a/packages/valory/connections/test_libp2p/tests/base.py +++ b/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 From c7e57a1cef12764e26830b139d6996fe64b2299e Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 11 Dec 2024 15:41:10 +0100 Subject: [PATCH 09/12] ci: pin macos-14-large --- .github/workflows/workflow.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a245abed88..5755bb2b98 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -240,7 +240,7 @@ jobs: continue-on-error: False strategy: matrix: - os: [ubuntu-latest, macos-14, 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-14, 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-14, windows-latest] + os: [ubuntu-latest, macos-14-large, 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-14' - name: Install dependencies (macos-14) + - 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-14, windows-latest] + os: [ubuntu-latest, macos-14-large, windows-latest] python-version: ["3.10"] timeout-minutes: 45 steps: From 154eb91729a4fbe29feaf3006e8dff641f224738 Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 11 Dec 2024 16:52:16 +0100 Subject: [PATCH 10/12] ci: rm macos from platform checks --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 5755bb2b98..36814b31f8 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -433,7 +433,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-14-large, windows-latest] + os: [ubuntu-latest, windows-latest] python_version: ['3.8', '3.9', '3.10', '3.11'] timeout-minutes: 120 steps: From 5537cc3381b0cd9375fb683e5350924a589309cf Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 11 Dec 2024 17:57:17 +0100 Subject: [PATCH 11/12] chore: review comments --- docs/p2p-connection.md | 4 ++-- docs/package_list.md | 14 +++++++------- packages/fetchai/skills/erc1155_client/skill.yaml | 2 +- packages/fetchai/skills/erc1155_deploy/skill.yaml | 2 +- packages/fetchai/skills/generic_buyer/skill.yaml | 2 +- packages/fetchai/skills/generic_seller/skill.yaml | 2 +- packages/packages.json | 14 +++++++------- packages/valory/connections/ledger/connection.yaml | 2 +- .../connections/ledger/tests/test_ledger_api.py | 10 ++-------- .../valory/connections/p2p_libp2p/connection.yaml | 2 +- .../valory/connections/p2p_libp2p/tests/base.py | 4 ++++ .../valory/connections/test_libp2p/connection.yaml | 4 ++-- .../valory/connections/test_libp2p/tests/base.py | 2 ++ tests/test_connections/test_sync_connection.py | 5 +++++ 14 files changed, 37 insertions(+), 32 deletions(-) diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md index 94db0615e3..20bdc1b31a 100644 --- a/docs/p2p-connection.md +++ b/docs/p2p-connection.md @@ -26,7 +26,7 @@ Create one AEA as follows: ``` bash aea create my_genesis_aea cd my_genesis_aea -aea add connection valory/p2p_libp2p:0.1.0:bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma --remote +aea add connection valory/p2p_libp2p:0.1.0:bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m --remote aea config set agent.default_connection valory/p2p_libp2p:0.1.0 aea install aea build @@ -58,7 +58,7 @@ Create a second AEA: ``` bash aea create my_other_aea cd my_other_aea -aea add connection valory/p2p_libp2p:0.1.0:bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma --remote +aea add connection valory/p2p_libp2p:0.1.0:bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m --remote aea config set agent.default_connection valory/p2p_libp2p:0.1.0 aea install aea build diff --git a/docs/package_list.md b/docs/package_list.md index 6f85feb461..9f5d20d87c 100644 --- a/docs/package_list.md +++ b/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 | `bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi` | +| connection/valory/ledger/0.19.0 | `bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm` | | connection/valory/http_server/0.22.0 | `bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m` | -| connection/valory/p2p_libp2p/0.1.0 | `bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma` | +| connection/valory/p2p_libp2p/0.1.0 | `bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m` | | 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 | `bafybeibjjdc3sj326rvtjjrzpbvshjp6nu6zqm4m7wswpo2ei7dzsmhecm` | +| connection/valory/test_libp2p/0.1.0 | `bafybeieht65ikcdnfevqzh7xsxfijgnu354wfwwi744cqio52ocsyxpojy` | | 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 | `bafybeibmvrmpssviyujeyqfddbgnl4iu644sq4xyhavsm34oxntoez4r7q` | -| skill/fetchai/erc1155_deploy/0.30.0 | `bafybeiczeyks4gkne4ja32pvsresqvnjhv3gd5b4nyqr2vuzoawnyi7ipi` | +| skill/fetchai/erc1155_client/0.28.0 | `bafybeiasrz6iflvwwyurssdxn2uxtdf2fjpsuamthic4fsdpdt4bhqtqam` | +| skill/fetchai/erc1155_deploy/0.30.0 | `bafybeibvwbjv4dvjmuj6cziafghitqtuuscrfig5r5nkfkfzn3l7wm2mjy` | | skill/fetchai/error/0.17.0 | `bafybeicboomvykqhel3otyv4qg5t3hzpo6kmn5bk4ljluithhuieu7flsm` | | skill/fetchai/fipa_dummy_buyer/0.2.0 | `bafybeidgso7lo5ay44mbxsp3lxilrgeek3ye44e6wus2ayq6kyxfvc3vjm` | -| skill/fetchai/generic_buyer/0.26.0 | `bafybeigyritphnqnejt6j7txrghruzkmztqobc4sp65cirlsgexeyxnzua` | -| skill/fetchai/generic_seller/0.27.0 | `bafybeifji5wgzwukexlwvhbbvsspyj7fpkaebsa3vm3i3ke4jyenhjszvq` | +| skill/fetchai/generic_buyer/0.26.0 | `bafybeietldbnmgiegadjvzj6jrlvo5z3t5oaqsvhbrp32cq2nn775ykfgq` | +| skill/fetchai/generic_seller/0.27.0 | `bafybeicdwfe5avdsfj3nftkdxeeeadndoagvw4r4p6hgxjxskogu6sxozq` | | 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` | diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index e1e5d5d0ad..85e830bed0 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/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:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi +- valory/ledger:0.19.0:bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm contracts: - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4 protocols: diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 22ccd8fe39..e0c5242a63 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/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:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi +- valory/ledger:0.19.0:bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm contracts: - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4 protocols: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index 46edcfd72c..53bb206b65 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/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:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi +- valory/ledger:0.19.0:bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm contracts: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index fe7e199729..a642f14d06 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/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:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi +- valory/ledger:0.19.0:bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm contracts: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 diff --git a/packages/packages.json b/packages/packages.json index ea9d59d982..0ee13790c7 100644 --- a/packages/packages.json +++ b/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": "bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi", + "connection/valory/ledger/0.19.0": "bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm", "connection/valory/http_server/0.22.0": "bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m", - "connection/valory/p2p_libp2p/0.1.0": "bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma", + "connection/valory/p2p_libp2p/0.1.0": "bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m", "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": "bafybeibjjdc3sj326rvtjjrzpbvshjp6nu6zqm4m7wswpo2ei7dzsmhecm", + "connection/valory/test_libp2p/0.1.0": "bafybeieht65ikcdnfevqzh7xsxfijgnu354wfwwi744cqio52ocsyxpojy", "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": "bafybeibmvrmpssviyujeyqfddbgnl4iu644sq4xyhavsm34oxntoez4r7q", - "skill/fetchai/erc1155_deploy/0.30.0": "bafybeiczeyks4gkne4ja32pvsresqvnjhv3gd5b4nyqr2vuzoawnyi7ipi", + "skill/fetchai/erc1155_client/0.28.0": "bafybeiasrz6iflvwwyurssdxn2uxtdf2fjpsuamthic4fsdpdt4bhqtqam", + "skill/fetchai/erc1155_deploy/0.30.0": "bafybeibvwbjv4dvjmuj6cziafghitqtuuscrfig5r5nkfkfzn3l7wm2mjy", "skill/fetchai/error/0.17.0": "bafybeicboomvykqhel3otyv4qg5t3hzpo6kmn5bk4ljluithhuieu7flsm", "skill/fetchai/fipa_dummy_buyer/0.2.0": "bafybeidgso7lo5ay44mbxsp3lxilrgeek3ye44e6wus2ayq6kyxfvc3vjm", - "skill/fetchai/generic_buyer/0.26.0": "bafybeigyritphnqnejt6j7txrghruzkmztqobc4sp65cirlsgexeyxnzua", - "skill/fetchai/generic_seller/0.27.0": "bafybeifji5wgzwukexlwvhbbvsspyj7fpkaebsa3vm3i3ke4jyenhjszvq", + "skill/fetchai/generic_buyer/0.26.0": "bafybeietldbnmgiegadjvzj6jrlvo5z3t5oaqsvhbrp32cq2nn775ykfgq", + "skill/fetchai/generic_seller/0.27.0": "bafybeicdwfe5avdsfj3nftkdxeeeadndoagvw4r4p6hgxjxskogu6sxozq", "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", diff --git a/packages/valory/connections/ledger/connection.yaml b/packages/valory/connections/ledger/connection.yaml index ddcb7ff089..7cb85b67b8 100644 --- a/packages/valory/connections/ledger/connection.yaml +++ b/packages/valory/connections/ledger/connection.yaml @@ -16,7 +16,7 @@ fingerprint: tests/conftest.py: bafybeid7vo7e2m76ey5beeadtbxywxx5ukefd5slwbc362rwmhht6i45ou tests/test_contract_dispatcher.py: bafybeiag5lnpc7h25w23ash4hk4cowxsy5buxgpr474l3tfewnhf56eqyq tests/test_ledger.py: bafybeigcedfr3yv3jse3xwrerrgwbelgb56uhgrvdus527d3daekh6dx4m - tests/test_ledger_api.py: bafybeibdhjxhsavs2fax4rgvsptd6a2tcnv6fq75wqqxpcwwk6zujw3e7e + tests/test_ledger_api.py: bafybeiaicxq56bujtdqxy5czakzr5wpnf23q7ya4fc6oaimh5b5ydjhahi fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/valory/connections/ledger/tests/test_ledger_api.py b/packages/valory/connections/ledger/tests/test_ledger_api.py index 1b3c4a417c..5a487e728d 100644 --- a/packages/valory/connections/ledger/tests/test_ledger_api.py +++ b/packages/valory/connections/ledger/tests/test_ledger_api.py @@ -667,16 +667,10 @@ async def test_attempts_get_transaction_receipt( assert dialogue is not None assert isinstance(dialogue, LedgerApiDialogue) - mock_api.is_transaction_settled.return_value = ( - True if failing_ledger_method_name == "get_transaction" else False - ) failing_ledger_method = getattr(mock_api, failing_ledger_method_name) - if ( - ledger_raise_error - and failing_ledger_method_name != "is_transaction_settled" - ): + if ledger_raise_error: failing_ledger_method.side_effect = ValueError() - elif failing_ledger_method_name != "is_transaction_settled": + else: failing_ledger_method.return_value = None with patch.object(dispatcher, "retry_attempts", retries): diff --git a/packages/valory/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml index 6d85cca364..f0718f8a58 100644 --- a/packages/valory/connections/p2p_libp2p/connection.yaml +++ b/packages/valory/connections/p2p_libp2p/connection.yaml @@ -55,7 +55,7 @@ fingerprint: libp2p_node/utils/utils.go: bafybeihbd2br74nm3pupy4qkijm2tnuyl7pbq3uwasidmql5znhbr575k4 libp2p_node/utils/utils_test.go: bafybeig2kkgqy7miml66w2byomeqjp4czzv45gb4jas76cxildo3lxi4xq tests/__init__.py: bafybeieftcbmxxpe7okvm3ycualpyec6xys4nx5tihcjii7lqxd3w5lx7e - tests/base.py: bafybeif4bslxqlqz2xppqz6rx44ydh7v4i2n542muip6jzznu36cmn4iwi + tests/base.py: bafybeicep6nwabliuah65lfaloistoepnr3twvotw72kuzftooyvr2r34u tests/test_aea_cli.py: bafybeic3aczdlcvbzdi2l77m36dkbjqva3itv3kbmsiuxrk26va4qtfzli tests/test_build.py: bafybeigzxvb57sauddmb7t6pwwtxu476wceklktg42bidphl5zkcnghlfu tests/test_errors.py: bafybeigfwg7cmxbgo7j2pce5vy55wvqze7wv67d4v37k3wpcflwbgzege4 diff --git a/packages/valory/connections/p2p_libp2p/tests/base.py b/packages/valory/connections/p2p_libp2p/tests/base.py index 9566d29c28..26475f3c71 100644 --- a/packages/valory/connections/p2p_libp2p/tests/base.py +++ b/packages/valory/connections/p2p_libp2p/tests/base.py @@ -47,6 +47,10 @@ condition=(platform.system() == "Windows"), reason="https://github.com/golang/go/issues/51007", ) +SKIP_MACOS = pytest.mark.skipif( + condition=(platform.system() == "Darwin"), + reason="go-ethereum not working on macos-12+", +) def libp2p_log_on_failure(fn: Callable) -> Callable: diff --git a/packages/valory/connections/test_libp2p/connection.yaml b/packages/valory/connections/test_libp2p/connection.yaml index 1933f73efa..1e481a049e 100644 --- a/packages/valory/connections/test_libp2p/connection.yaml +++ b/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: bafybeibsotk3te523igjnkmioqikgor3iwd3vunwonsmuj7debwwv5mtri + tests/base.py: bafybeihk4x2opomphxttji6stortv6tzxll2aylk7ptlg7p65d4qajkkpa tests/conftest.py: bafybeifkjrvsysdb7ujp2wxurzgytzy3ecu6fv247zfszfymdvb7y7klpu tests/test_certificate_dates.py: bafybeif4t76wsvsfvvplkmi4gecgod6ijff3bbqgtaqmpep6ywfapfptfm tests/test_dht.py: bafybeienykwwpdjlbjzxzttxjhgas2edp2f657gbsexjtkztehoq4yfb7m @@ -34,7 +34,7 @@ fingerprint: tests/test_p2p_libp2p_mailbox/test_mailbox_service.py: bafybeibp3bkwkrw57qahvuysjdlumywtlk3te5gsvusgrvhsc75k7rrk4u fingerprint_ignore_patterns: [] connections: -- valory/p2p_libp2p:0.1.0:bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma +- valory/p2p_libp2p:0.1.0:bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m - valory/p2p_libp2p_client:0.1.0:bafybeihs5zlwa5wlozct3rjlxsirm3ve3e4buse5nfehiky6ymnnfrobne - valory/p2p_libp2p_mailbox:0.1.0:bafybeiecclc65ogngs3piaxpwhiyl77mlpqun5ejlyv4kamwzrrh746guq protocols: diff --git a/packages/valory/connections/test_libp2p/tests/base.py b/packages/valory/connections/test_libp2p/tests/base.py index 321054e2af..f6547f6fc0 100644 --- a/packages/valory/connections/test_libp2p/tests/base.py +++ b/packages/valory/connections/test_libp2p/tests/base.py @@ -64,6 +64,7 @@ ) from packages.valory.connections.p2p_libp2p.tests.base import ( MockDefaultMessageProtocol, + SKIP_MACOS, SKIP_WINDOWS, TEMP_LIBP2P_TEST_DIR, TIMEOUT, @@ -276,6 +277,7 @@ def _make_libp2p_connection( @SKIP_WINDOWS +@SKIP_MACOS class BaseP2PLibp2pTest: """Base class for ACN p2p libp2p tests""" diff --git a/tests/test_connections/test_sync_connection.py b/tests/test_connections/test_sync_connection.py index 3efee05b59..cad5d3e59c 100644 --- a/tests/test_connections/test_sync_connection.py +++ b/tests/test_connections/test_sync_connection.py @@ -19,6 +19,7 @@ # ------------------------------------------------------------------------------ """This module contains the tests for the sync connection module.""" import asyncio +import platform import time from unittest.mock import MagicMock, Mock, patch @@ -70,6 +71,10 @@ def on_disconnect(self): @pytest.mark.asyncio +@pytest.mark.skipif( + condition=(platform.system() == "Darwin"), + reason="not working on macos-12+", +) async def test_sync_connection(): """Test sync connection example.""" conf = Mock() From b654724d853aa0096635050cb33c8061858e5403 Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 11 Dec 2024 20:34:59 +0100 Subject: [PATCH 12/12] chore: copyright --- docs/p2p-connection.md | 4 ++-- docs/package_list.md | 4 ++-- packages/packages.json | 4 ++-- packages/valory/connections/p2p_libp2p/connection.yaml | 2 +- packages/valory/connections/p2p_libp2p/tests/base.py | 2 +- packages/valory/connections/test_libp2p/connection.yaml | 2 +- tests/test_connections/test_sync_connection.py | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md index 20bdc1b31a..b9d40a2739 100644 --- a/docs/p2p-connection.md +++ b/docs/p2p-connection.md @@ -26,7 +26,7 @@ Create one AEA as follows: ``` bash aea create my_genesis_aea cd my_genesis_aea -aea add connection valory/p2p_libp2p:0.1.0:bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m --remote +aea add connection valory/p2p_libp2p:0.1.0:bafybeihmzdqkdukajnw4fjvkrgsyanrwxnuptlzbaxof7zfq7suvk5fknq --remote aea config set agent.default_connection valory/p2p_libp2p:0.1.0 aea install aea build @@ -58,7 +58,7 @@ Create a second AEA: ``` bash aea create my_other_aea cd my_other_aea -aea add connection valory/p2p_libp2p:0.1.0:bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m --remote +aea add connection valory/p2p_libp2p:0.1.0:bafybeihmzdqkdukajnw4fjvkrgsyanrwxnuptlzbaxof7zfq7suvk5fknq --remote aea config set agent.default_connection valory/p2p_libp2p:0.1.0 aea install aea build diff --git a/docs/package_list.md b/docs/package_list.md index 9f5d20d87c..ee9b1fbade 100644 --- a/docs/package_list.md +++ b/docs/package_list.md @@ -16,12 +16,12 @@ | connection/fetchai/stub/0.21.0 | `bafybeibybboiwgklfiqpkkcw6rwj65s5jalzfzf6mh6fstxdlt6habzwvy` | | connection/valory/ledger/0.19.0 | `bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm` | | connection/valory/http_server/0.22.0 | `bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m` | -| connection/valory/p2p_libp2p/0.1.0 | `bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m` | +| connection/valory/p2p_libp2p/0.1.0 | `bafybeihmzdqkdukajnw4fjvkrgsyanrwxnuptlzbaxof7zfq7suvk5fknq` | | 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 | `bafybeieht65ikcdnfevqzh7xsxfijgnu354wfwwi744cqio52ocsyxpojy` | +| connection/valory/test_libp2p/0.1.0 | `bafybeihgujnszlu2nd7gdary25tanimrmlbpiigid2xregwlz654x2usy4` | | skill/fetchai/echo/0.19.0 | `bafybeicoawiackcbgqo3na3e56tpdc62atag4yxknur77py37caqq4mmya` | | skill/fetchai/error_test_skill/0.1.0 | `bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu` | | skill/fetchai/gym/0.20.0 | `bafybeie7y2fsxfuhsqxqcaluo5exskmrm5q3a6e2hfcskcuvzvxjjhijh4` | diff --git a/packages/packages.json b/packages/packages.json index 0ee13790c7..94b2d2f0b1 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,12 +16,12 @@ "connection/fetchai/stub/0.21.0": "bafybeibybboiwgklfiqpkkcw6rwj65s5jalzfzf6mh6fstxdlt6habzwvy", "connection/valory/ledger/0.19.0": "bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm", "connection/valory/http_server/0.22.0": "bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m", - "connection/valory/p2p_libp2p/0.1.0": "bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m", + "connection/valory/p2p_libp2p/0.1.0": "bafybeihmzdqkdukajnw4fjvkrgsyanrwxnuptlzbaxof7zfq7suvk5fknq", "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": "bafybeieht65ikcdnfevqzh7xsxfijgnu354wfwwi744cqio52ocsyxpojy", + "connection/valory/test_libp2p/0.1.0": "bafybeihgujnszlu2nd7gdary25tanimrmlbpiigid2xregwlz654x2usy4", "skill/fetchai/echo/0.19.0": "bafybeicoawiackcbgqo3na3e56tpdc62atag4yxknur77py37caqq4mmya", "skill/fetchai/error_test_skill/0.1.0": "bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu", "skill/fetchai/gym/0.20.0": "bafybeie7y2fsxfuhsqxqcaluo5exskmrm5q3a6e2hfcskcuvzvxjjhijh4", diff --git a/packages/valory/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml index f0718f8a58..ddfe0c7794 100644 --- a/packages/valory/connections/p2p_libp2p/connection.yaml +++ b/packages/valory/connections/p2p_libp2p/connection.yaml @@ -55,7 +55,7 @@ fingerprint: libp2p_node/utils/utils.go: bafybeihbd2br74nm3pupy4qkijm2tnuyl7pbq3uwasidmql5znhbr575k4 libp2p_node/utils/utils_test.go: bafybeig2kkgqy7miml66w2byomeqjp4czzv45gb4jas76cxildo3lxi4xq tests/__init__.py: bafybeieftcbmxxpe7okvm3ycualpyec6xys4nx5tihcjii7lqxd3w5lx7e - tests/base.py: bafybeicep6nwabliuah65lfaloistoepnr3twvotw72kuzftooyvr2r34u + tests/base.py: bafybeiblwhd2bpngwwig2lrizxmvydy6whuarbnkpvedyo4w5bfcnso4oy tests/test_aea_cli.py: bafybeic3aczdlcvbzdi2l77m36dkbjqva3itv3kbmsiuxrk26va4qtfzli tests/test_build.py: bafybeigzxvb57sauddmb7t6pwwtxu476wceklktg42bidphl5zkcnghlfu tests/test_errors.py: bafybeigfwg7cmxbgo7j2pce5vy55wvqze7wv67d4v37k3wpcflwbgzege4 diff --git a/packages/valory/connections/p2p_libp2p/tests/base.py b/packages/valory/connections/p2p_libp2p/tests/base.py index 26475f3c71..96ab58dab9 100644 --- a/packages/valory/connections/p2p_libp2p/tests/base.py +++ b/packages/valory/connections/p2p_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. diff --git a/packages/valory/connections/test_libp2p/connection.yaml b/packages/valory/connections/test_libp2p/connection.yaml index 1e481a049e..af3bfc9c78 100644 --- a/packages/valory/connections/test_libp2p/connection.yaml +++ b/packages/valory/connections/test_libp2p/connection.yaml @@ -34,7 +34,7 @@ fingerprint: tests/test_p2p_libp2p_mailbox/test_mailbox_service.py: bafybeibp3bkwkrw57qahvuysjdlumywtlk3te5gsvusgrvhsc75k7rrk4u fingerprint_ignore_patterns: [] connections: -- valory/p2p_libp2p:0.1.0:bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m +- valory/p2p_libp2p:0.1.0:bafybeihmzdqkdukajnw4fjvkrgsyanrwxnuptlzbaxof7zfq7suvk5fknq - valory/p2p_libp2p_client:0.1.0:bafybeihs5zlwa5wlozct3rjlxsirm3ve3e4buse5nfehiky6ymnnfrobne - valory/p2p_libp2p_mailbox:0.1.0:bafybeiecclc65ogngs3piaxpwhiyl77mlpqun5ejlyv4kamwzrrh746guq protocols: diff --git a/tests/test_connections/test_sync_connection.py b/tests/test_connections/test_sync_connection.py index cad5d3e59c..157b5dbdfb 100644 --- a/tests/test_connections/test_sync_connection.py +++ b/tests/test_connections/test_sync_connection.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2022 Valory AG +# Copyright 2022-2024 Valory AG # Copyright 2018-2021 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License");