web3 7.0.0b8__tar.gz → 7.1.0__tar.gz

{web3-7.0.0b8/web3.egg-info → web3-7.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: web3
-Version: 7.0.0b8
+Version: 7.1.0
 Summary: web3: A Python library for interacting with Ethereum
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -20,17 +20,18 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.7.4.post0
 Requires-Dist: eth-abi>=5.0.1
-Requires-Dist: eth-account>=0.12.2
+Requires-Dist: eth-account>=0.13.1
 Requires-Dist: eth-hash[pycryptodome]>=0.5.1
-Requires-Dist: eth-typing>=4.0.0
-Requires-Dist: eth-utils>=4.0.0
+Requires-Dist: eth-typing>=5.0.0
+Requires-Dist: eth-utils>=5.0.0
 Requires-Dist: hexbytes>=1.2.0
+Requires-Dist: aiohttp>=3.7.4.post0
 Requires-Dist: pydantic>=2.4.0
 Requires-Dist: pywin32>=223; platform_system == "Windows"
-Requires-Dist: requests>=2.16.0
+Requires-Dist: requests>=2.23.0
 Requires-Dist: typing-extensions>=4.0.1
+Requires-Dist: types-requests>=2.0.0
 Requires-Dist: websockets>=10.0.0
 Requires-Dist: pyunormalize>=15.0.0
 Provides-Extra: dev
@@ -39,6 +40,7 @@ Requires-Dist: bumpversion>=0.5.3; extra == "dev"
 Requires-Dist: flaky>=3.7.0; extra == "dev"
 Requires-Dist: hypothesis>=3.31.2; extra == "dev"
 Requires-Dist: ipython; extra == "dev"
+Requires-Dist: mypy==1.10.0; extra == "dev"
 Requires-Dist: pre-commit>=3.4.0; extra == "dev"
 Requires-Dist: pytest-asyncio<0.23,>=0.21.2; extra == "dev"
 Requires-Dist: pytest-mock>=1.10; extra == "dev"
@@ -51,9 +53,8 @@ Requires-Dist: sphinx>=6.0.0; extra == "dev"
 Requires-Dist: sphinx-autobuild>=2021.3.14; extra == "dev"
 Requires-Dist: sphinx_rtd_theme>=1.0.0; extra == "dev"
 Requires-Dist: towncrier<22,>=21; extra == "dev"
-Requires-Dist: eth-account>=0.13.0; extra == "dev"
 Requires-Dist: eth-tester[py-evm]<0.13.0b1,>=0.11.0b1; extra == "dev"
-Requires-Dist: py-geth>=5.0.0b1; extra == "dev"
+Requires-Dist: py-geth>=5.0.0; extra == "dev"
 Requires-Dist: pytest-asyncio<0.23,>=0.18.1; extra == "dev"
 Requires-Dist: pytest-mock>=1.10; extra == "dev"
 Requires-Dist: pytest-xdist>=2.4.0; extra == "dev"
@@ -63,10 +64,9 @@ Requires-Dist: sphinx>=6.0.0; extra == "docs"
 Requires-Dist: sphinx-autobuild>=2021.3.14; extra == "docs"
 Requires-Dist: sphinx_rtd_theme>=1.0.0; extra == "docs"
 Requires-Dist: towncrier<22,>=21; extra == "docs"
-Requires-Dist: eth-account>=0.13.0; extra == "docs"
 Provides-Extra: test
 Requires-Dist: eth-tester[py-evm]<0.13.0b1,>=0.11.0b1; extra == "test"
-Requires-Dist: py-geth>=5.0.0b1; extra == "test"
+Requires-Dist: py-geth>=5.0.0; extra == "test"
 Requires-Dist: pytest-asyncio<0.23,>=0.18.1; extra == "test"
 Requires-Dist: pytest-mock>=1.10; extra == "test"
 Requires-Dist: pytest-xdist>=2.4.0; extra == "test"

{web3-7.0.0b8 → web3-7.1.0}/ens/async_ens.py

@@ -4,6 +4,7 @@ from copy import (
 from typing import (
     TYPE_CHECKING,
     Any,
+    Coroutine,
     Optional,
     Sequence,
     Tuple,
@@ -469,9 +470,13 @@ class AsyncENS(BaseENS):
             resolver_addr = await self.address("resolver.eth")
         namehash = raw_name_to_hash(name)
         if await self.ens.caller.resolver(namehash) != resolver_addr:
-            await self.ens.functions.setResolver(namehash, resolver_addr).transact(
-                transact
+            coro = cast(
+                Coroutine[Any, Any, HexBytes],
+                self.ens.functions.setResolver(namehash, resolver_addr).transact(
+                    transact
+                ),
             )
+            await coro
         return cast("AsyncContract", self._resolver_contract(address=resolver_addr))
 
     async def _resolve(
@@ -553,11 +558,15 @@ class AsyncENS(BaseENS):
         transact = deepcopy(transact)
         transact["from"] = old_owner or owner
         for label in reversed(unowned):
-            await self.ens.functions.setSubnodeOwner(
-                raw_name_to_hash(owned),
-                label_to_hash(label),
-                owner,
-            ).transact(transact)
+            coro = cast(
+                Coroutine[Any, Any, HexBytes],
+                self.ens.functions.setSubnodeOwner(
+                    raw_name_to_hash(owned),
+                    label_to_hash(label),
+                    owner,
+                ).transact(transact),
+            )
+            await coro
             owned = f"{label}.{owned}"
 
     async def _setup_reverse(

{web3-7.0.0b8 → web3-7.1.0}/ens/base_ens.py

@@ -11,13 +11,15 @@ from typing import (
 from eth_typing import (
     ChecksumAddress,
 )
+from eth_utils.abi import (
+    get_abi_output_types,
+)
 from hexbytes import (
     HexBytes,
 )
 
 from .utils import (
     address_to_reverse_domain,
-    get_abi_output_types,
     is_valid_name,
     label_to_hash,
     normalize_name,

{web3-7.0.0b8 → web3-7.1.0}/ens/exceptions.py

@@ -1,6 +1,3 @@
-from eth_utils import (
-    ValidationError,
-)
 import idna
 
 
@@ -32,8 +29,7 @@ class AddressMismatch(ENSException):
     """
 
 
-# type ignored because subclassing IDNAError which has type Any
-class InvalidName(idna.IDNAError, ENSException):  # type: ignore[misc]
+class InvalidName(idna.IDNAError, ENSException):
     """
     Raised if the provided name does not meet the normalization
     standards specified in `ENSIP-15
@@ -104,8 +100,7 @@ class UnderfundedBid(ENSException):
     """
 
 
-# type ignored because subclassing ValidationError which has type Any
-class ENSValidationError(ENSException, ValidationError):  # type: ignore[misc]
+class ENSValidationError(ENSException):
     """
     Raised if there is a validation error
     """

{web3-7.0.0b8 → web3-7.1.0}/ens/utils.py

@@ -6,8 +6,6 @@ from typing import (
     TYPE_CHECKING,
     Any,
     Collection,
-    Dict,
-    List,
     Optional,
     Sequence,
     Tuple,
@@ -28,9 +26,6 @@ from eth_utils import (
     to_bytes,
     to_normalized_address,
 )
-from eth_utils.abi import (
-    collapse_if_tuple,
-)
 from hexbytes import (
     HexBytes,
 )
@@ -68,9 +63,6 @@ if TYPE_CHECKING:
         AsyncBaseProvider,
         BaseProvider,
     )
-    from web3.types import (  # noqa: F401
-        ABIFunction,
-    )
 
 
 def Web3() -> Type["_Web3"]:
@@ -293,15 +285,6 @@ def is_valid_ens_name(ens_name: str) -> bool:
     return True
 
 
-# borrowed from similar method at `web3._utils.abi` due to circular dependency
-def get_abi_output_types(abi: "ABIFunction") -> List[str]:
-    return (
-        []
-        if abi["type"] == "fallback"
-        else [collapse_if_tuple(cast(Dict[str, Any], arg)) for arg in abi["outputs"]]
-    )
-
-
 # -- async -- #
 
 

{web3-7.0.0b8 → web3-7.1.0}/pyproject.toml

@@ -32,7 +32,6 @@ warn_return_any = false
 warn_unused_configs = true
 warn_unused_ignores = true
 
-
 [tool.pydocstyle]
 # All error codes found here:
 # http://www.pydocstyle.org/en/3.0.0/error_codes.html

{web3-7.0.0b8 → web3-7.1.0}/setup.py

@@ -11,6 +11,7 @@ extras_require = {
         "flaky>=3.7.0",
         "hypothesis>=3.31.2",
         "ipython",
+        "mypy==1.10.0",
         "pre-commit>=3.4.0",
         "pytest-asyncio>=0.21.2,<0.23",
         "pytest-mock>=1.10",
@@ -25,13 +26,12 @@ extras_require = {
         "sphinx-autobuild>=2021.3.14",
         "sphinx_rtd_theme>=1.0.0",
         "towncrier>=21,<22",
-        # web3 will work but emit warnings with eth-account>=0.12.2,
-        # but doctests fail between 0.12.2 and 0.13.0
-        "eth-account>=0.13.0",
     ],
     "test": [
+        # Note: ethereum-maintained libraries in this list should be added to the
+        # `install_pre_releases.py` script.
         "eth-tester[py-evm]>=0.11.0b1,<0.13.0b1",
-        "py-geth>=5.0.0b1",
+        "py-geth>=5.0.0",
         "pytest-asyncio>=0.18.1,<0.23",
         "pytest-mock>=1.10",
         "pytest-xdist>=2.4.0",
@@ -51,7 +51,7 @@ with open("./README.md") as readme:
 setup(
     name="web3",
     # *IMPORTANT*: Don't manually change the version here. Use `make bump`, as described in readme
-    version="7.0.0-beta.8",
+    version="7.1.0",
     description="""web3: A Python library for interacting with Ethereum""",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -60,17 +60,20 @@ setup(
     url="https://github.com/ethereum/web3.py",
     include_package_data=True,
     install_requires=[
-        "aiohttp>=3.7.4.post0",
+        # Note: ethereum-maintained libraries in this list should be added to the
+        # `install_pre_releases.py` script.
         "eth-abi>=5.0.1",
-        "eth-account>=0.12.2",
+        "eth-account>=0.13.1",
         "eth-hash[pycryptodome]>=0.5.1",
-        "eth-typing>=4.0.0",
-        "eth-utils>=4.0.0",
+        "eth-typing>=5.0.0",
+        "eth-utils>=5.0.0",
         "hexbytes>=1.2.0",
+        "aiohttp>=3.7.4.post0",
         "pydantic>=2.4.0",
         "pywin32>=223;platform_system=='Windows'",
-        "requests>=2.16.0",
+        "requests>=2.23.0",
         "typing-extensions>=4.0.1",
+        "types-requests>=2.0.0",
         "websockets>=10.0.0",
         "pyunormalize>=15.0.0",
     ],

{web3-7.0.0b8 → web3-7.1.0}/tests/beacon/test_async_beacon.py

@@ -267,3 +267,16 @@ async def test_async_cl_node_get_version(async_beacon):
 async def test_async_cl_node_get_syncing(async_beacon):
     response = await async_beacon.get_syncing()
     _assert_valid_response(response)
+
+
+# Blob endpoint tests
+
+
+@pytest.mark.asyncio
+async def test_async_cl_node_get_blob_sidecars(async_beacon):
+    response = await async_beacon.get_blob_sidecars("head")
+    _assert_valid_response(response)
+
+    # test with indices
+    with_indices = await async_beacon.get_blob_sidecars("head", [0, 1])
+    _assert_valid_response(with_indices)

{web3-7.0.0b8 → web3-7.1.0}/tests/beacon/test_beacon.py

@@ -223,3 +223,15 @@ def test_cl_node_get_version(beacon):
 def test_cl_node_get_syncing(beacon):
     response = beacon.get_syncing()
     _assert_valid_response(response)
+
+
+# Blob endpoint tests
+
+
+def test_cl_node_get_blob_sidecars(beacon):
+    response = beacon.get_blob_sidecars("head")
+    _assert_valid_response(response)
+
+    # test with indices
+    with_indices = beacon.get_blob_sidecars("head", [0, 1])
+    _assert_valid_response(with_indices)

{web3-7.0.0b8 → web3-7.1.0}/tests/core/contracts/test_contract_attributes.py

@@ -1,7 +1,7 @@
 import pytest
 
 from web3.exceptions import (
-    ABIEventFunctionNotFound,
+    ABIEventNotFound,
     ABIFunctionNotFound,
 )
 
@@ -22,7 +22,7 @@ def test_getattr(w3, abi, attribute):
     "attribute,error",
     (
         ("functions", ABIFunctionNotFound),
-        ("events", ABIEventFunctionNotFound),
+        ("events", ABIEventNotFound),
         ("caller", ABIFunctionNotFound),
     ),
 )

{web3-7.0.0b8 → web3-7.1.0}/tests/core/contracts/test_contract_build_transaction.py

@@ -53,6 +53,20 @@ def test_build_transaction_with_contract_no_arguments(
     }
 
 
+def test_build_transaction_with_contract_no_arguments_no_parens(
+    w3, math_contract, build_transaction
+):
+    txn = math_contract.functions.incrementCounter.build_transaction()
+    assert dissoc(txn, "gas") == {
+        "to": math_contract.address,
+        "data": "0x5b34b966",
+        "value": 0,
+        "maxFeePerGas": 2750000000,
+        "maxPriorityFeePerGas": 10**9,
+        "chainId": 131277322940537,
+    }
+
+
 def test_build_transaction_with_contract_fallback_function(
     w3, fallback_function_contract
 ):
@@ -309,6 +323,21 @@ async def test_async_build_transaction_with_contract_no_arguments(
     }
 
 
+@pytest.mark.asyncio
+async def test_async_build_transaction_with_contract_no_arguments_no_parens(
+    async_w3, async_math_contract, async_build_transaction
+):
+    txn = await async_math_contract.functions.incrementCounter.build_transaction()
+    assert dissoc(txn, "gas") == {
+        "to": async_math_contract.address,
+        "data": "0x5b34b966",
+        "value": 0,
+        "maxFeePerGas": 2750000000,
+        "maxPriorityFeePerGas": 10**9,
+        "chainId": 131277322940537,
+    }
+
+
 @pytest.mark.asyncio
 async def test_async_build_transaction_with_contract_fallback_function(
     async_w3, async_fallback_function_contract

{web3-7.0.0b8 → web3-7.1.0}/tests/core/contracts/test_contract_call_interface.py

@@ -37,9 +37,9 @@ from web3.contract.contract import (
     ContractFunction,
 )
 from web3.exceptions import (
+    ABIReceiveNotFound,
     BadFunctionCallOutput,
     BlockNumberOutOfRange,
-    FallbackNotFound,
     InvalidAddress,
     MismatchedABI,
     NameNotFound,
@@ -145,6 +145,10 @@ def test_call_with_no_arguments(math_contract, call):
     assert result == 13
 
 
+def test_call_no_arguments_no_parens(math_contract):
+    assert math_contract.functions.return13.call() == 13
+
+
 def test_call_with_one_argument(math_contract, call):
     result = call(contract=math_contract, contract_function="multiply7", func_args=[3])
     assert result == 21
@@ -271,7 +275,7 @@ def test_set_byte_array_non_strict(
 @pytest.mark.parametrize("args", ([""], ["s"]))
 def test_set_byte_array_with_invalid_args(arrays_contract, transact, args):
     with pytest.raises(
-        Web3ValidationError,
+        MismatchedABI,
         match="Could not identify the intended function with name `setByteValue`",
     ):
         transact(
@@ -532,7 +536,7 @@ def test_call_receive_fallback_function(
 
 
 def test_call_nonexistent_receive_function(fallback_function_contract):
-    with pytest.raises(FallbackNotFound, match="No receive function was found"):
+    with pytest.raises(ABIReceiveNotFound, match="No receive function was found"):
         fallback_function_contract.receive.call()
 
 
@@ -617,13 +621,13 @@ def test_no_functions_match_identifier(arrays_contract):
 
 def test_function_1_match_identifier_wrong_number_of_args(arrays_contract):
     regex = message_regex + diagnosis_arg_regex
-    with pytest.raises(Web3ValidationError, match=regex):
+    with pytest.raises(MismatchedABI, match=regex):
         arrays_contract.functions.setBytes32Value().call()
 
 
 def test_function_1_match_identifier_wrong_args_encoding(arrays_contract):
     regex = message_regex + diagnosis_encoding_regex
-    with pytest.raises(Web3ValidationError, match=regex):
+    with pytest.raises(MismatchedABI, match=regex):
         arrays_contract.functions.setBytes32Value("dog").call()
 
 
@@ -638,7 +642,7 @@ def test_function_1_match_identifier_wrong_args_encoding(arrays_contract):
 def test_function_multiple_error_diagnoses(w3, arg1, arg2, diagnosis):
     Contract = w3.eth.contract(abi=MULTIPLE_FUNCTIONS)
     regex = message_regex + diagnosis
-    with pytest.raises(Web3ValidationError, match=regex):
+    with pytest.raises(MismatchedABI, match=regex):
         if arg2:
             Contract.functions.a(arg1, arg2).call()
         else:
@@ -656,7 +660,7 @@ def test_function_wrong_args_for_tuple_collapses_args_in_message(
     address,
     tuple_contract,
 ):
-    with pytest.raises(Web3ValidationError) as e:
+    with pytest.raises(MismatchedABI) as e:
         tuple_contract.functions.method(
             (1, [2, 3], [(4, [True, [False]], [address])])
         ).call()
@@ -684,7 +688,7 @@ def test_function_wrong_args_for_tuple_collapses_args_in_message(
 def test_function_wrong_args_for_tuple_collapses_kwargs_in_message(
     address, tuple_contract
 ):
-    with pytest.raises(Web3ValidationError) as e:
+    with pytest.raises(MismatchedABI) as e:
         tuple_contract.functions.method(
             a=(1, [2, 3], [(4, [True, [False]], [address])])  # noqa: E501
         ).call()
@@ -790,7 +794,7 @@ def test_invalid_fixed_value_reflections(
     fixed_reflector_contract, function, value, error
 ):
     contract_func = fixed_reflector_contract.functions[function]
-    with pytest.raises(Web3ValidationError, match=error):
+    with pytest.raises(MismatchedABI, match=error):
         contract_func(value).call({"gas": 420000})
 
 
@@ -1419,7 +1423,7 @@ async def test_async_set_byte_array_strict_by_default(
 async def test_async_set_strict_byte_array_with_invalid_args(
     async_arrays_contract, async_transact, args
 ):
-    with pytest.raises(Web3ValidationError):
+    with pytest.raises(MismatchedABI):
         await async_transact(
             contract=async_arrays_contract,
             contract_function="setByteValue",
@@ -1719,7 +1723,7 @@ async def test_async_call_receive_fallback_function(
 async def test_async_call_nonexistent_receive_function(
     async_fallback_function_contract,
 ):
-    with pytest.raises(FallbackNotFound, match="No receive function was found"):
+    with pytest.raises(ABIReceiveNotFound, match="No receive function was found"):
         await async_fallback_function_contract.receive.call()
 
 
@@ -1786,7 +1790,7 @@ async def test_async_function_1_match_identifier_wrong_number_of_args(
     async_arrays_contract,
 ):
     regex = message_regex + diagnosis_arg_regex
-    with pytest.raises(Web3ValidationError, match=regex):
+    with pytest.raises(MismatchedABI, match=regex):
         await async_arrays_contract.functions.setBytes32Value().call()
 
 
@@ -1795,7 +1799,7 @@ async def test_async_function_1_match_identifier_wrong_args_encoding(
     async_arrays_contract,
 ):
     regex = message_regex + diagnosis_encoding_regex
-    with pytest.raises(Web3ValidationError, match=regex):
+    with pytest.raises(MismatchedABI, match=regex):
         await async_arrays_contract.functions.setBytes32Value("dog").call()
 
 
@@ -1811,7 +1815,7 @@ async def test_async_function_1_match_identifier_wrong_args_encoding(
 async def test_async_function_multiple_error_diagnoses(async_w3, arg1, arg2, diagnosis):
     Contract = async_w3.eth.contract(abi=MULTIPLE_FUNCTIONS)
     regex = message_regex + diagnosis
-    with pytest.raises(Web3ValidationError, match=regex):
+    with pytest.raises(MismatchedABI, match=regex):
         if arg2:
             await Contract.functions.a(arg1, arg2).call()
         else:
@@ -1920,7 +1924,7 @@ async def test_async_invalid_fixed_value_reflections(
     async_fixed_reflector_contract, function, value, error
 ):
     contract_func = async_fixed_reflector_contract.functions[function]
-    with pytest.raises(Web3ValidationError, match=error):
+    with pytest.raises(MismatchedABI, match=error):
         await contract_func(value).call({"gas": 420000})
 
 
@@ -2287,6 +2291,12 @@ async def test_async_call_with_no_arguments(async_math_contract, call):
     assert result == 13
 
 
+@pytest.mark.asyncio
+async def test_async_call_with_no_arguments_no_parens(async_math_contract, call):
+    result = await async_math_contract.functions.return13.call()
+    assert result == 13
+
+
 @pytest.mark.asyncio
 async def test_async_call_with_one_argument(async_math_contract, call):
     result = await async_math_contract.functions.multiply7(3).call()

{web3-7.0.0b8 → web3-7.1.0}/tests/core/contracts/test_contract_class_construction.py

@@ -9,7 +9,7 @@ from web3.contract import (
     Contract,
 )
 from web3.exceptions import (
-    FallbackNotFound,
+    ABIFallbackNotFound,
     Web3AttributeError,
 )
 
@@ -84,5 +84,5 @@ def test_error_to_call_non_existent_fallback(
         bytecode=math_contract_bytecode,
         bytecode_runtime=math_contract_runtime,
     )
-    with pytest.raises(FallbackNotFound):
+    with pytest.raises(ABIFallbackNotFound):
         math_contract.fallback.estimate_gas()

{web3-7.0.0b8 → web3-7.1.0}/tests/core/contracts/test_contract_constructor_encoding.py

@@ -27,15 +27,15 @@ def test_contract_constructor_abi_encoding_with_constructor_with_no_args(
 @pytest.mark.parametrize(
     "args,kwargs",
     (
-        (None, "kwarg-is-ignored"),
-        ("arg-is-ignored", None),
+        (tuple(), {"kwarg-is-ignored": True}),
+        ("arg-is-ignored", {}),
     ),
 )
 def test_contract_error_if_additional_args_are_supplied_with_no_constructor_fn(
     math_contract_factory, args, kwargs
 ):
     with pytest.raises(TypeError, match="Constructor args"):
-        math_contract_factory._encode_constructor_data(args, kwargs)
+        math_contract_factory._encode_constructor_data(*args, **kwargs)
 
 
 @pytest.mark.parametrize(
@@ -53,7 +53,7 @@ def test_error_if_invalid_arguments_supplied(
     contract_with_constructor_args_factory, arguments
 ):
     with pytest.raises(TypeError):
-        contract_with_constructor_args_factory._encode_constructor_data(arguments)
+        contract_with_constructor_args_factory._encode_constructor_data(*arguments)
 
 
 @pytest.mark.parametrize(
@@ -76,7 +76,7 @@ def test_contract_constructor_encoding(
     bytes_arg,
 ):
     deploy_data = contract_with_constructor_args_factory._encode_constructor_data(
-        [1234, bytes_arg]
+        *[1234, bytes_arg]
     )
     expected_ending = encode_hex(
         w3.codec.encode(["uint256", "bytes32"], [1234, bytes_arg])
@@ -98,7 +98,7 @@ def test_contract_constructor_encoding_non_strict(
 ):
     deploy_data = (
         non_strict_contract_with_constructor_args_factory._encode_constructor_data(
-            [1234, bytes_arg]
+            *[1234, bytes_arg]
         )
     )
     encoded_args = "0x00000000000000000000000000000000000000000000000000000000000004d26162636400000000000000000000000000000000000000000000000000000000"  # noqa: E501
@@ -126,5 +126,5 @@ def test_contract_constructor_encoding_strict_errors(
         match="One or more arguments could not be encoded to the necessary ABI type.",
     ):
         contract_with_constructor_args_factory._encode_constructor_data(
-            [1234, bytes_arg]
+            *[1234, bytes_arg]
         )

{web3-7.0.0b8 → web3-7.1.0}/tests/core/contracts/test_contract_estimate_gas.py

@@ -18,6 +18,19 @@ def test_contract_estimate_gas(w3, math_contract, estimate_gas, transact):
     assert abs(gas_estimate - gas_used) < 21000
 
 
+def test_estimate_gas_can_be_called_without_parens(
+    w3, math_contract, estimate_gas, transact
+):
+    gas_estimate = math_contract.functions.incrementCounter.estimate_gas()
+
+    txn_hash = transact(contract=math_contract, contract_function="incrementCounter")
+
+    txn_receipt = w3.eth.wait_for_transaction_receipt(txn_hash)
+    gas_used = txn_receipt.get("gasUsed")
+
+    assert abs(gas_estimate - gas_used) < 21000
+
+
 def test_contract_fallback_estimate_gas(w3, fallback_function_contract):
     gas_estimate = fallback_function_contract.fallback.estimate_gas()
 
@@ -197,6 +210,24 @@ async def test_async_estimate_gas_accepts_latest_block(
     assert abs(gas_estimate - gas_used) < 21000
 
 
+@pytest.mark.asyncio
+async def test_async_estimate_gas_can_be_called_without_parens(
+    async_w3, async_math_contract, async_transact
+):
+    gas_estimate = await async_math_contract.functions.counter.estimate_gas(
+        block_identifier="latest"
+    )
+
+    txn_hash = await async_transact(
+        contract=async_math_contract, contract_function="incrementCounter"
+    )
+
+    txn_receipt = await async_w3.eth.wait_for_transaction_receipt(txn_hash)
+    gas_used = txn_receipt.get("gasUsed")
+
+    assert abs(gas_estimate - gas_used) < 21000
+
+
 @pytest.mark.asyncio
 async def test_async_estimate_gas_block_identifier_unique_estimates(
     async_w3, async_math_contract, async_transact

{web3-7.0.0b8 → web3-7.1.0}/tests/core/contracts/test_contract_method_abi_encoding.py

@@ -5,7 +5,7 @@ from web3 import (
     constants,
 )
 from web3.exceptions import (
-    Web3ValidationError,
+    MismatchedABI,
 )
 
 ABI_A = json.loads(
@@ -145,7 +145,7 @@ def test_contract_abi_encoding_kwargs(w3):
 )
 def test_contract_abi_encoding_strict_with_error(w3, arguments):
     contract = w3.eth.contract(abi=ABI_C)
-    with pytest.raises(Web3ValidationError):
+    with pytest.raises(MismatchedABI):
         contract.encode_abi("a", arguments, data=None)