web3 7.0.0b7__tar.gz → 7.0.0b9__tar.gz

{web3-7.0.0b7/web3.egg-info → web3-7.0.0b9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: web3
-Version: 7.0.0b7
+Version: 7.0.0b9
 Summary: web3: A Python library for interacting with Ethereum
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -22,15 +22,16 @@ 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.0b3
+Requires-Dist: eth-utils>=5.0.0b1
 Requires-Dist: hexbytes>=1.2.0
 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"
@@ -80,7 +82,9 @@ Requires-Dist: pytest>=7.0.0; extra == "test"
 [![Python versions](https://img.shields.io/pypi/pyversions/web3.svg)](https://pypi.python.org/pypi/web3)
 [![Docs build](https://readthedocs.org/projects/web3py/badge/?version=latest)](https://web3py.readthedocs.io/en/latest/?badge=latest)
 
-A Python library for interacting with Ethereum.
+## A Python Library for Interacting with Ethereum
+
+web3.py allows you to interact with the Ethereum blockchain using Python, enabling you to build decentralized applications, interact with smart contracts, and much more.
 
 - Python 3.8+ support
 
@@ -95,7 +99,7 @@ ______________________________________________________________________
 
 For additional guides, examples, and APIs, see the [documentation](https://web3py.readthedocs.io/en/latest/).
 
-## Want to help?
+## Want to Help?
 
 Want to file a bug, contribute some code, or improve documentation? Excellent! Read up on our
 guidelines for [contributing](https://web3py.readthedocs.io/en/latest/contributing.html),
@@ -104,4 +108,6 @@ then check out issues that are labeled
 
 ______________________________________________________________________
 
-#### Questions on implementation or usage? Join the conversation on [discord](https://discord.gg/GHryRvPB84).
+## Questions on Implementation or Usage?
+
+Join the conversation in the Ethereum Python Community [Discord](https://discord.gg/GHryRvPB84).

{web3-7.0.0b7 → web3-7.0.0b9}/README.md

@@ -6,7 +6,9 @@
 [![Python versions](https://img.shields.io/pypi/pyversions/web3.svg)](https://pypi.python.org/pypi/web3)
 [![Docs build](https://readthedocs.org/projects/web3py/badge/?version=latest)](https://web3py.readthedocs.io/en/latest/?badge=latest)
 
-A Python library for interacting with Ethereum.
+## A Python Library for Interacting with Ethereum
+
+web3.py allows you to interact with the Ethereum blockchain using Python, enabling you to build decentralized applications, interact with smart contracts, and much more.
 
 - Python 3.8+ support
 
@@ -21,7 +23,7 @@ ______________________________________________________________________
 
 For additional guides, examples, and APIs, see the [documentation](https://web3py.readthedocs.io/en/latest/).
 
-## Want to help?
+## Want to Help?
 
 Want to file a bug, contribute some code, or improve documentation? Excellent! Read up on our
 guidelines for [contributing](https://web3py.readthedocs.io/en/latest/contributing.html),
@@ -30,4 +32,6 @@ then check out issues that are labeled
 
 ______________________________________________________________________
 
-#### Questions on implementation or usage? Join the conversation on [discord](https://discord.gg/GHryRvPB84).
+## Questions on Implementation or Usage?
+
+Join the conversation in the Ethereum Python Community [Discord](https://discord.gg/GHryRvPB84).

{web3-7.0.0b7 → web3-7.0.0b9}/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.0b7 → web3-7.0.0b9}/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.0b7 → web3-7.0.0b9}/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.0b7 → web3-7.0.0b9}/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.0b7 → web3-7.0.0b9}/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.0b7 → web3-7.0.0b9}/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",
@@ -51,7 +52,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.7",
+    version="7.0.0-beta.9",
     description="""web3: A Python library for interacting with Ethereum""",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -62,15 +63,16 @@ setup(
     install_requires=[
         "aiohttp>=3.7.4.post0",
         "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.0b3",
+        "eth-utils>=5.0.0b1",
         "hexbytes>=1.2.0",
         "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.0b7 → web3-7.0.0b9}/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.0b7 → web3-7.0.0b9}/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,
@@ -271,7 +271,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 +532,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 +617,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 +638,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 +656,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 +684,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 +790,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 +1419,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 +1719,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 +1786,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 +1795,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 +1811,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 +1920,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})
 
 

{web3-7.0.0b7 → web3-7.0.0b9}/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.0b7 → web3-7.0.0b9}/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.0b7 → web3-7.0.0b9}/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)
 
 

{web3-7.0.0b7 → web3-7.0.0b9}/tests/core/contracts/test_contract_method_to_argument_matching.py

@@ -1,15 +1,16 @@
 import json
 import pytest
 
-from web3._utils.abi import (
+from eth_utils.abi import (
     get_abi_input_types,
 )
-from web3._utils.function_identifiers import (
+
+from web3._utils.abi_element_identifiers import (
     FallbackFn,
     ReceiveFn,
 )
 from web3.exceptions import (
-    Web3ValidationError,
+    MismatchedABI,
 )
 
 SINGLE_FN_NO_ARGS = json.loads(
@@ -106,7 +107,7 @@ MULTIPLE_FUNCTIONS = json.loads(
 def test_finds_single_function_without_args(w3):
     Contract = w3.eth.contract(abi=SINGLE_FN_NO_ARGS)
 
-    abi = Contract._find_matching_fn_abi("a", [])
+    abi = Contract._find_matching_fn_abi("a", *[])
     assert abi["name"] == "a"
     assert abi["inputs"] == []
 
@@ -114,7 +115,7 @@ def test_finds_single_function_without_args(w3):
 def test_finds_single_function_with_args(w3):
     Contract = w3.eth.contract(abi=SINGLE_FN_ONE_ARG)
 
-    abi = Contract._find_matching_fn_abi("a", [1234])
+    abi = Contract._find_matching_fn_abi("a", *[1234])
     assert abi["name"] == "a"
     assert len(abi["inputs"]) == 1
     assert abi["inputs"][0]["type"] == "uint256"
@@ -123,22 +124,22 @@ def test_finds_single_function_with_args(w3):
 def test_finds_fallback_function(w3):
     Contract = w3.eth.contract(abi=FALLBACK_FUNCTION)
 
-    abi = Contract._find_matching_fn_abi(FallbackFn, [])
+    abi = Contract._find_matching_fn_abi(FallbackFn, *[])
     assert abi["type"] == "fallback"
 
 
 def test_finds_receive_function(w3):
     Contract = w3.eth.contract(abi=RECEIVE_FUNCTION)
 
-    abi = Contract._find_matching_fn_abi(ReceiveFn, [])
+    abi = Contract._find_matching_fn_abi(ReceiveFn, *[])
     assert abi["type"] == "receive"
 
 
 def test_error_when_no_function_name_match(w3):
     Contract = w3.eth.contract(abi=SINGLE_FN_NO_ARGS)
 
-    with pytest.raises(Web3ValidationError):
-        Contract._find_matching_fn_abi("no_function_name", [1234])
+    with pytest.raises(MismatchedABI):
+        Contract._find_matching_fn_abi("no_function_name", *[1234])
 
 
 @pytest.mark.parametrize(
@@ -159,7 +160,7 @@ def test_finds_function_with_matching_args_non_strict(
 ):
     contract = w3_non_strict_abi.eth.contract(abi=MULTIPLE_FUNCTIONS)
 
-    abi = contract._find_matching_fn_abi("a", arguments)
+    abi = contract._find_matching_fn_abi("a", *arguments)
     assert abi["name"] == "a"
     assert len(abi["inputs"]) == len(expected_types)
     assert get_abi_input_types(abi) == expected_types
@@ -167,23 +168,23 @@ def test_finds_function_with_matching_args_non_strict(
 
 def test_finds_function_with_matching_args_strict_type_checking_by_default(w3):
     contract = w3.eth.contract(abi=MULTIPLE_FUNCTIONS)
-    with pytest.raises(Web3ValidationError):
-        contract._find_matching_fn_abi("a", [""])
+    with pytest.raises(MismatchedABI):
+        contract._find_matching_fn_abi("a", *[""])
 
 
 def test_error_when_duplicate_match(w3):
     Contract = w3.eth.contract(abi=MULTIPLE_FUNCTIONS)
 
-    with pytest.raises(Web3ValidationError):
-        Contract._find_matching_fn_abi("a", [100])
+    with pytest.raises(MismatchedABI):
+        Contract._find_matching_fn_abi("a", *[100])
 
 
 @pytest.mark.parametrize("arguments", (["0xf00b47"], [b""], [""], ["00" * 16]))
 def test_strict_errors_if_type_is_wrong(w3, arguments):
     Contract = w3.eth.contract(abi=MULTIPLE_FUNCTIONS)
 
-    with pytest.raises(Web3ValidationError):
-        Contract._find_matching_fn_abi("a", arguments)
+    with pytest.raises(MismatchedABI):
+        Contract._find_matching_fn_abi("a", *arguments)
 
 
 @pytest.mark.parametrize(
@@ -198,7 +199,7 @@ def test_strict_errors_if_type_is_wrong(w3, arguments):
 def test_strict_finds_function_with_matching_args(w3, arguments, expected_types):
     Contract = w3.eth.contract(abi=MULTIPLE_FUNCTIONS)
 
-    abi = Contract._find_matching_fn_abi("a", arguments)
+    abi = Contract._find_matching_fn_abi("a", *arguments)
     assert abi["name"] == "a"
     assert len(abi["inputs"]) == len(expected_types)
     assert get_abi_input_types(abi) == expected_types