work on typing

Author: pacrob

web3/_utils/abi.py

@@ -924,13 +924,17 @@ def named_tree(
 
 
 def named_subtree(
-    abi: Dict[str, Any], data: Tuple[Any, ...]
+    # TODO make this a better type
+    abi: Any,
+    data: Tuple[Any, ...],
 ) -> Union[Dict[str, Any], Tuple[Any, ...], Any]:
-    abi_type = parse(collapse_if_tuple(abi))
+    abi_type = parse(collapse_if_tuple(dict(abi)))
 
     if abi_type.is_array:
         item_type = abi_type.item_type.to_type_str()
         item_abi = {**abi, "type": item_type, "name": ""}
+        # cast(ABIFunctionParams, item_abi)
+        # breakpoint()
         items = [named_subtree(item_abi, item) for item in data]
         return items
 

web3/_utils/contracts.py

@@ -10,9 +10,6 @@
     cast,
 )
 
-from eth_abi import (
-    decode,
-)
 from eth_abi.codec import (
     ABICodec,
 )
@@ -50,7 +47,6 @@
     get_receive_func_abi,
     map_abi_data,
     merge_args_and_kwargs,
-    named_tree,
 )
 from web3._utils.blocks import (
     is_hex_encoded_block_hash,
@@ -317,15 +313,6 @@ def encode_transaction_data(
     return add_0x_prefix(encode_abi(w3, fn_abi, fn_arguments, fn_selector))
 
 
-def decode_transaction_data(fn_abi, data, normalizers=None):
-    data = HexBytes(data)
-    types = get_abi_input_types(fn_abi)
-    decoded = decode(types, data[4:])
-    if normalizers:
-        decoded = map_abi_data(normalizers, types, decoded)
-    return named_tree(fn_abi["inputs"], decoded)
-
-
 def get_fallback_function_info(
     contract_abi: Optional[ABI] = None, fn_abi: Optional[ABIFunction] = None
 ) -> Tuple[ABIFunction, HexStr, Tuple[Any, ...]]: