rebase to main and clear remaining issues

Author: pacrob

newsfragments/3414.internal.rst

@@ -0,0 +1 @@
+Run ``mypy`` locally using ``pre-commit`` hook, instead of within ``pre-commit`` container

setup.py

@@ -63,7 +63,7 @@
     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>=5.0.0b1",
         "eth-utils>=5.0.0b1",

web3/_utils/events.py

@@ -113,11 +113,11 @@ def _log_entry_data_to_bytes(
 def construct_event_topic_set(
     event_abi: ABIEvent,
     abi_codec: ABICodec,
-    arguments: Optional[Union[Sequence[Any], Dict[str, Any]]] = None,
+    arguments: Optional[Union[List[Any], Tuple[Any], Dict[str, Any]]] = None,
 ) -> List[HexStr]:
     if arguments is None:
         arguments = {}
-    if isinstance(arguments, (list, tuple)):
+    elif isinstance(arguments, (list, tuple)):
         if len(arguments) != len(event_abi["inputs"]):
             raise Web3ValueError(
                 "When passing an argument list, the number of arguments must "
@@ -127,14 +127,12 @@ def construct_event_topic_set(
             arg["name"]: [arg_value]
             for arg, arg_value in zip(event_abi["inputs"], arguments)
         }
-
     normalized_args = {
         key: value if is_list_like(value) else [value]
-        # type ignored b/c arguments is always a dict at this point
-        for key, value in arguments.items()  # type: ignore
+        for key, value in arguments.items()
     }
 
-    event_topic = encode_hex(event_abi_to_log_topic(cast(Dict[str, Any], event_abi)))
+    event_topic = encode_hex(event_abi_to_log_topic(event_abi))
     indexed_args = get_indexed_event_inputs(event_abi)
     zipped_abi_and_args = [
         (arg, normalized_args.get(arg["name"], [None])) for arg in indexed_args
@@ -475,7 +473,7 @@ async def deploy(self, async_w3: "AsyncWeb3") -> "AsyncLogFilter":
 
 def initialize_event_topics(event_abi: ABIEvent) -> Union[bytes, List[Any]]:
     if event_abi["anonymous"] is False:
-        return event_abi_to_log_topic(cast(Dict[str, Any], event_abi))
+        return event_abi_to_log_topic(event_abi)
     else:
         return list()
 

web3/_utils/filters.py

@@ -10,7 +10,6 @@
     Sequence,
     Tuple,
     Union,
-    cast,
 )
 
 from eth_abi.codec import (
@@ -79,9 +78,9 @@ def construct_event_filter_params(
     address: Optional[ChecksumAddress] = None,
 ) -> Tuple[List[List[Optional[HexStr]]], FilterParams]:
     filter_params: FilterParams = {}
-    topic_set: Union[
-        Sequence[HexStr], Sequence[Sequence[HexStr]]
-    ] = construct_event_topic_set(event_abi, abi_codec, argument_filters)
+    topic_set: Sequence[HexStr] = construct_event_topic_set(
+        event_abi, abi_codec, argument_filters
+    )
 
     if topics is not None:
         if len(topic_set) > 1:
@@ -91,10 +90,7 @@ def construct_event_filter_params(
             )
         topic_set = topics
 
-    if len(topic_set) == 1 and is_list_like(topic_set[0]):
-        filter_params["topics"] = cast(Sequence[HexStr], topic_set[0])
-    else:
-        filter_params["topics"] = topic_set
+    filter_params["topics"] = topic_set
 
     if address and contract_address:
         if is_list_like(address):

web3/contract/base_contract.py

@@ -830,9 +830,9 @@ def get_function_by_selector(
         self, selector: Union[bytes, int, HexStr]
     ) -> "BaseContractFunction":
         def callable_check(fn_abi: ABIFunction) -> bool:
-            return encode_hex(
-                function_abi_to_4byte_selector(cast(Dict[str, Any], fn_abi))
-            ) == to_4byte_hex(selector)
+            return encode_hex(function_abi_to_4byte_selector(fn_abi)) == to_4byte_hex(
+                selector
+            )
 
         fns = self.find_functions_by_identifier(
             self.abi, self.w3, self.address, callable_check

web3/contract/utils.py

@@ -61,6 +61,7 @@
 from web3.types import (
     ABIElementIdentifier,
     BlockIdentifier,
+    RPCEndpoint,
     StateOverride,
     TContractFn,
     TxParams,
@@ -227,7 +228,7 @@ def call_contract_function(
     )
     normalized_data = map_abi_data(_normalizers, output_types, output_data)
 
-    if decode_tuples:
+    if decode_tuples and abi_callable["type"] == "function":
         decoded = named_tree(abi_callable["outputs"], normalized_data)
         normalized_data = recursive_dict_to_namedtuple(decoded)
 
@@ -438,7 +439,6 @@ async def async_call_contract_function(
                 current_request_id, contract_call_return_data_formatter
             )
         else:
-            # request_information == ((method, params), response_formatters)
             BatchingReturnData: TypeAlias = Tuple[
                 Tuple[RPCEndpoint, Any], Tuple[Any, ...]
             ]

web3/middleware/signing.py

@@ -6,9 +6,7 @@
     TYPE_CHECKING,
     Any,
     Collection,
-    Dict,
     Iterable,
-    Sequence,
     Tuple,
     TypeVar,
     Union,
@@ -21,6 +19,9 @@
 from eth_account.signers.local import (
     LocalAccount,
 )
+from eth_account.types import (
+    TransactionDictType as EthAccountTxParams,
+)
 from eth_keys.datatypes import (
     PrivateKey,
 )
@@ -46,9 +47,6 @@
     async_fill_nonce,
     async_fill_transaction_defaults,
 )
-from web3._utils.compat import (
-    TypeAlias,
-)
 from web3._utils.method_formatters import (
     STANDARD_NORMALIZERS,
 )
@@ -216,15 +214,6 @@ async def async_request_processor(self, method: "RPCEndpoint", params: Any) -> A
                 return method, params
             else:
                 account = self._accounts[to_checksum_address(tx_from)]
-                EthAccountTxParams: TypeAlias = Dict[
-                    str,
-                    Union[
-                        Sequence[Dict[str, Union[HexStr, Sequence[HexStr]]]],
-                        bytes,
-                        HexStr,
-                        int,
-                    ],
-                ]
                 raw_tx = account.sign_transaction(
                     cast(EthAccountTxParams, filled_transaction)
                 ).raw_transaction