Merge pull request #810 from valory-xyz/feat/web3-updates

Chore: Bump `eth-account` and `web3py`

Author: OjusWiZard

Pipfile

@@ -22,7 +22,7 @@ defusedxml = "==0.6.0"
 # ^ still used?
 docker = "==4.2.0"
 ecdsa = ">=0.15"
-eth-account = "<0.9.0,>=0.8.0"
+eth-account = ">=0.13.0,<0.14.0"
 gym = "==0.15.6"
 hypothesis = "==6.21.6"
 ipfshttpclient = "==0.8.0a2"
@@ -42,7 +42,7 @@ GitPython = "<4.0.0,>=3.1.37"
 requests = "==2.28.1"
 idna = "<=3.3"
 cosmpy = "==0.9.2"
-web3 = "<7,>=6.0.0"
+web3 = "<8,>=7.0.0"
 semver = "<3.0.0,>=2.9.1"
 py-multibase = ">=1.0.0"
 py-multicodec = ">=0.2.0"
@@ -52,7 +52,7 @@ mistune = "==2.0.3"
 tomte = {version = "==0.4.0", extras = ["tox", "tests"]}
 docspec = "==2.2.1"
 docspec-python = "==2.2.1"
-hexbytes = "==0.3.0"
+hexbytes = "==1.3.1"
 ledgerwallet = "==0.1.3"
 construct = "<=2.10.61"
 werkzeug = "*"

aea/contracts/base.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2022 Valory AG
+#   Copyright 2022-2025 Valory AG
 #   Copyright 2018-2019 Fetch.AI Limited
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -333,7 +333,7 @@ def get_method_data(
 
             args = [kwargs[i] for i in input_names]
             # Encode and return the contract call
-            data = instance.encodeABI(fn_name=method_name, args=args)
+            data = instance.encode_abi(abi_element_identifier=method_name, args=args)
         except KeyError as e:  # pragma: nocover
             _default_logger.warning(f"No such information in method ABI:\n{e}")
             return None

docs/api/plugins/aea_ledger_ethereum/ethereum.md

@@ -1136,13 +1136,3 @@ def items() -> Dict[str, Any]
 
 Return session items.
 
-<a id="plugins.aea-ledger-ethereum.aea_ledger_ethereum.ethereum.set_wrapper_for_web3py_session_cache"></a>
-
-#### set`_`wrapper`_`for`_`web3py`_`session`_`cache
-
-```python
-def set_wrapper_for_web3py_session_cache() -> None
-```
-
-Wrap web3py session cache with threading.Lock.
-

plugins/aea-ledger-ethereum-flashbots/aea_ledger_ethereum_flashbots/ethereum_flashbots.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 Valory AG
+#   Copyright 2023-2025 Valory AG
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -247,7 +247,9 @@ def send_bundle(
             default_builder_response.wait()
             try:
                 receipts = default_builder_response.receipts()
-                tx_hashes = [tx["hash"].hex() for tx in default_builder_response.bundle]
+                tx_hashes = [
+                    tx["hash"].to_0x_hex() for tx in default_builder_response.bundle
+                ]
                 _default_logger.debug(
                     f"Bundle with replacement uuid {replacement_uuid} was mined in block {receipts[0]['blockNumber']}"
                     f"Tx hashes: {tx_hashes}"

plugins/aea-ledger-ethereum-flashbots/tests/test_ethereum.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 Valory AG
+#   Copyright 2023-2025 Valory AG
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -144,7 +144,7 @@ def test_send_bundle_with_successful_transaction(ethereum_flashbot_api) -> None:
         send_bundle, target_blocks[0], opts={"replacementUuid": ANY}
     )
     assert response_mock.wait.called
-    assert tx_hashes == [tx["hash"].hex() for tx in response_mock.bundle]
+    assert tx_hashes == [tx["hash"].to_0x_hex() for tx in response_mock.bundle]
 
 
 def test_bundle_transactions_with_empty_list(ethereum_flashbot_api) -> None:
@@ -197,7 +197,7 @@ def test_bundle_and_send_with_successful_transaction(ethereum_flashbot_api) -> N
     ethereum_flashbot_api.flashbots.simulate.assert_called_once()
     ethereum_flashbot_api.flashbots.send_bundle.assert_called_once()
     assert response_mock.wait.called
-    assert tx_hashes == [tx["hash"].hex() for tx in response_mock.bundle]
+    assert tx_hashes == [tx["hash"].to_0x_hex() for tx in response_mock.bundle]
 
 
 def test_bundle_and_send_with_failed_simulation(ethereum_flashbot_api) -> None:

plugins/aea-ledger-ethereum-hwi/aea_ledger_ethereum_hwi/account.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 Valory AG
+#   Copyright 2023-2025 Valory AG
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -43,9 +43,9 @@
     encode_transaction,
     serializable_unsigned_transaction_from_dict,
 )
-from eth_account._utils.typed_transactions import TypedTransaction
 from eth_account.datastructures import HexBytes, SignedMessage, SignedTransaction
 from eth_account.messages import SignableMessage
+from eth_account.typed_transactions import TypedTransaction
 from eth_keys.main import PublicKey
 from eth_rlp import HashableRLP
 from eth_typing.evm import ChecksumAddress
@@ -442,7 +442,7 @@ def sign_transaction(
         transaction_hash = keccak(encoded_transaction)
 
         return SignedTransaction(
-            rawTransaction=HexBytes(encoded_transaction),
+            raw_transaction=HexBytes(encoded_transaction),
             hash=HexBytes(transaction_hash),
             r=response.r,
             s=response.s,

plugins/aea-ledger-ethereum-hwi/aea_ledger_ethereum_hwi/hwi.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 Valory AG
+#   Copyright 2023-2025 Valory AG
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -29,10 +29,7 @@
 from aea_ledger_ethereum.ethereum import (
     SignedTransactionTranslator as BaseSignedTransactionTranslator,
 )
-from aea_ledger_ethereum.ethereum import (
-    TESTNET_NAME,
-    set_wrapper_for_web3py_session_cache,
-)
+from aea_ledger_ethereum.ethereum import TESTNET_NAME
 from aea_ledger_ethereum_hwi.account import HWIAccount
 from eth_account.messages import encode_defunct
 from eth_account.signers.local import LocalAccount
@@ -152,14 +149,14 @@ def sign_message(self, message: bytes, is_deprecated_mode: bool = False) -> str:
         if is_deprecated_mode and len(message) == 32:
             with warnings.catch_warnings():
                 warnings.simplefilter("ignore")
-                signature_dict = cast(HWIAccount, self.entity).signHash(message)
-            signed_msg = signature_dict["signature"].hex()
+                signature_dict = cast(HWIAccount, self.entity).unsafe_sign_hash(message)
+            signed_msg = signature_dict["signature"].to_0x_hex()
         else:
             signable_message = encode_defunct(primitive=message)
             signature = cast(HWIAccount, self.entity).sign_message(
                 signable_message=signable_message
             )
-            signed_msg = signature["signature"].hex()
+            signed_msg = signature["signature"].to_0x_hex()
         return signed_msg
 
     def sign_transaction(self, transaction: JSONLike, **kwargs: Any) -> JSONLike:
@@ -230,6 +227,3 @@ class EthereumHWIFaucetApi(EthereumFaucetApi):
 
     identifier = _ETHEREUM_HWI
     testnet_name = TESTNET_NAME
-
-
-set_wrapper_for_web3py_session_cache()

plugins/aea-ledger-ethereum-hwi/setup.py

@@ -39,9 +39,9 @@
     },
     install_requires=[
         "open-aea>=2.0.0, <3.0.0",
-        "web3>=6.0.0,<7",
+        "web3>=7.0.0,<8",
         "ipfshttpclient==0.8.0a2",
-        "eth-account>=0.8.0,<0.9.0",
+        "eth-account>=0.13.0,<0.14.0",
         "open-aea-ledger-ethereum~=2.0.1",
         "ledgerwallet==0.1.3",
         "protobuf<4.25.0,>=4.21.6",

plugins/aea-ledger-ethereum-hwi/tests/test_account.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 Valory AG
+#   Copyright 2023-2025 Valory AG
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ def test_sign_transaction_legacy() -> None:
     ), enumerate_devices_patch:
         signed_tx = account.sign_transaction(transaction_dict=tx)
 
-    assert signed_tx.rawTransaction == HexBytes(
+    assert signed_tx.raw_transaction == HexBytes(
         "0x01f8658001843b9aca0082520894e81de7001292e482d4d1851ff7ed50c56093f8bb0180c080a00e14610af513df91f0ba4580bb39876b3ad201bc878a2d34f9654454222401daa00bf694eb1a2d3e5acaa05c659ee9ef82b9f82bacf5c60b0650b2d9f033e72713"
     )
     assert signed_tx.hash == HexBytes(
@@ -117,7 +117,7 @@ def test_sign_transaction_eip1559() -> None:
     ), enumerate_devices_patch:
         signed_tx = account.sign_transaction(transaction_dict=tx)
 
-    assert signed_tx.rawTransaction == HexBytes(
+    assert signed_tx.raw_transaction == HexBytes(
         "0x02f86b050784b2d05e00852794ca240082520894f33bb476529e93bb862262f6c6d8cc324741d7aa0180c080a00e14610af513df91f0ba4580bb39876b3ad201bc878a2d34f9654454222401daa00bf694eb1a2d3e5acaa05c659ee9ef82b9f82bacf5c60b0650b2d9f033e72713"
     )
     assert signed_tx.hash == HexBytes(