Merge pull request #779 from valory-xyz/fix/encoding

Specify encoding and remove incorrect key from the fallback estimate

Author: Adamantios

aea/components/base.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2022-2023 Valory AG
+#   Copyright 2022-2024 Valory AG
 #   Copyright 2018-2021 Fetch.AI Limited
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,6 +42,7 @@
 from aea.helpers.logging import WithLogger
 
 
+ENCODING = "utf-8"
 _default_logger = logging.getLogger(__name__)
 
 
@@ -225,7 +226,7 @@ def _find_all_used_packages(
 
         used_packages: Dict[PackageIdPrefix, Set[Path]] = defaultdict(set)
         for python_module in aea_package_root_dir.rglob("*.py"):
-            module_content = python_module.read_text()
+            module_content = python_module.read_text(encoding=ENCODING)
             module_package_id_prefixes = cls._extract_imported_packages_as_ids(
                 module_content
             )

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:bafybeihrgx6nvfp2jom472hsy7wx4xwvbesua4bsloinyjoip7gmkhfqnq
+- valory/ledger:0.19.0:bafybeib4q36hr3rnfq5geuzkkgih3q5oridjdnewzvajb4lflijdyrn7pq
 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:bafybeihrgx6nvfp2jom472hsy7wx4xwvbesua4bsloinyjoip7gmkhfqnq
+- valory/ledger:0.19.0:bafybeib4q36hr3rnfq5geuzkkgih3q5oridjdnewzvajb4lflijdyrn7pq
 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:bafybeihrgx6nvfp2jom472hsy7wx4xwvbesua4bsloinyjoip7gmkhfqnq
+- valory/ledger:0.19.0:bafybeib4q36hr3rnfq5geuzkkgih3q5oridjdnewzvajb4lflijdyrn7pq
 contracts: []
 protocols:
 - fetchai/default:1.0.0:bafybeiaf3qhrdttthrisrl2tlpt3mpo5btkozw2dnxlj4cbqq56ilcl6oa

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:bafybeihrgx6nvfp2jom472hsy7wx4xwvbesua4bsloinyjoip7gmkhfqnq
+- valory/ledger:0.19.0:bafybeib4q36hr3rnfq5geuzkkgih3q5oridjdnewzvajb4lflijdyrn7pq
 contracts: []
 protocols:
 - fetchai/default:1.0.0:bafybeiaf3qhrdttthrisrl2tlpt3mpo5btkozw2dnxlj4cbqq56ilcl6oa

packages/packages.json

@@ -14,7 +14,7 @@
         "contract/fetchai/erc1155/0.22.0": "bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4",
         "connection/fetchai/gym/0.19.0": "bafybeicpzcp2otfv4p3bvz44n2wurpsqddlwyc6mnuwbhimidjqvttw27y",
         "connection/fetchai/stub/0.21.0": "bafybeibqrgcch7dufgvzoxi43vxbbhx6isfn3njhq5q3eud6yhhyjdnthm",
-        "connection/valory/ledger/0.19.0": "bafybeihrgx6nvfp2jom472hsy7wx4xwvbesua4bsloinyjoip7gmkhfqnq",
+        "connection/valory/ledger/0.19.0": "bafybeib4q36hr3rnfq5geuzkkgih3q5oridjdnewzvajb4lflijdyrn7pq",
         "connection/valory/http_server/0.22.0": "bafybeic3jpkum7g6qo6x6vdrmvvhj7vqw7ec2op72uc3yfhmnlp5hn3joy",
         "connection/valory/p2p_libp2p/0.1.0": "bafybeig2atkjnrz7lsboubaque567ndtzog6k53dnmrrq3eeqgbqmmcq5y",
         "connection/valory/p2p_libp2p_client/0.1.0": "bafybeic6ayusdwy4dks75njwk32ac7ur7salgllwf4fdc34ue5z2k5iz4q",
@@ -26,12 +26,12 @@
         "skill/fetchai/error_test_skill/0.1.0": "bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu",
         "skill/fetchai/gym/0.20.0": "bafybeih27hdrpzjz2fp5u2n7mgyrqqk3cyuempiixn6ptkkztvld7d4jhe",
         "skill/fetchai/http_echo/0.20.0": "bafybeiabpmclv4njsrxfwgsmei5vbcj7bzm53h5dsi5lubiuelboauedwy",
-        "skill/fetchai/erc1155_client/0.28.0": "bafybeics3c52hslishtxoju243yfazqnmzjt73kvgcgffi224x2edjzpni",
-        "skill/fetchai/erc1155_deploy/0.30.0": "bafybeiboajtx7g3kt62lavadud3v4doqaxfakwhyjkwkakkx5gbtc2bg2e",
+        "skill/fetchai/erc1155_client/0.28.0": "bafybeiezbjumow3sh324pue5mxafrcj7sea27h6us3tqtt3fydttn6kdvi",
+        "skill/fetchai/erc1155_deploy/0.30.0": "bafybeifjygruiz2zyewa3no24icclxfpc2c2e7gflztyss6ea2jpudmygu",
         "skill/fetchai/error/0.17.0": "bafybeib3sed2rk7monjh23gorihtnzpov5yrlqqjvyavnjjtxchz2uxeoy",
         "skill/fetchai/fipa_dummy_buyer/0.2.0": "bafybeifior4ve3cjsnq6uqi4ipcltkoab47dh2b4evcmwq53kx52fzbqga",
-        "skill/fetchai/generic_buyer/0.26.0": "bafybeianvr5gmazahzcfkk6pjuew5xwrxlddylbiin2b7xdhfqnieyk2jm",
-        "skill/fetchai/generic_seller/0.27.0": "bafybeibljxmbtotjbbxq43dpoghuibych2vz2lqqpbiuif2nyqnwgs35pq",
+        "skill/fetchai/generic_buyer/0.26.0": "bafybeiegz6ldnrhky6p5zgxeyae6s2jowbx7dfeldenqy7tiodjqsbljlq",
+        "skill/fetchai/generic_seller/0.27.0": "bafybeidxgdaejcflbgdnfk53hbs2rfkhslo5brz2waynxleuspksuuyozy",
         "skill/fetchai/task_test_skill/0.1.0": "bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble",
         "agent/fetchai/error_test/0.1.0": "bafybeifkbnneq3vhxxzl4ajw2l4j4ndrrqpcxih2i6ymrgfqecjitdfx6a",
         "agent/fetchai/gym_aea/0.25.0": "bafybeig2hwgtvqndklrablhdlo4fhxjh2bhntejcu62pmojcwba5i77aky",

packages/valory/connections/ledger/connection.yaml

@@ -41,7 +41,6 @@ config:
           fallback_estimate:
             maxFeePerGas: 20000000000
             maxPriorityFeePerGas: 3000000000
-            baseFee: null
           priority_fee_increase_boundary: 200
       is_gas_estimation_enabled: true
       poa_chain: false

tests/test_cli/test_run.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2021-2023 Valory AG
+#   Copyright 2021-2025 Valory AG
 #   Copyright 2018-2019 Fetch.AI Limited
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -260,7 +260,7 @@ def test_run_with_profiling():
             logfile=sys.stdout,
         )
 
-        process.expect("Start processing messages", timeout=60)
+        process.expect("Start processing messages", timeout=120)
         process.expect("Profiling details", timeout=10)
         process.control_c()
         process.wait_to_complete(10)