remove change to decode_function_input to a separate pr

Author: pacrob

web3/_utils/abi.py

@@ -908,7 +908,10 @@ def build_strict_registry() -> ABIRegistry:
     return registry
 
 
-def named_tree(abi: List[Dict[str, Any]], data: Tuple[Any, ...]) -> Dict[str, Any]:
+# def named_tree(abi: List[Dict[str, Any]], data: Tuple[Any, ...]) -> Dict[str, Any]:
+def named_tree(
+    abi: Sequence[ABIFunctionParams], data: Tuple[Any, ...]
+) -> Dict[str, Any]:
     """
     Convert function inputs/outputs or event data tuple to dict with names from ABI.
     """

web3/contract/base_contract.py

@@ -43,13 +43,15 @@
     check_if_arguments_can_be_encoded,
     fallback_func_abi_exists,
     filter_by_type,
+    get_abi_input_names,
+    get_abi_input_types,
     get_constructor_abi,
     is_array_type,
+    map_abi_data,
     merge_args_and_kwargs,
     receive_func_abi_exists,
 )
 from web3._utils.contracts import (
-    decode_transaction_data,
     encode_abi,
     find_matching_event_abi,
     find_matching_fn_abi,
@@ -253,11 +255,16 @@ def decode_function_input(
     ) -> Tuple["BaseContractFunction", Dict[str, Any]]:
         # type ignored b/c expects data arg to be HexBytes
         data = HexBytes(data)  # type: ignore
-        func = self.get_function_by_selector(data[:4])
-        arguments = decode_transaction_data(
-            func.abi, data, normalizers=BASE_RETURN_NORMALIZERS
-        )
-        return func, arguments
+        selector, params = data[:4], data[4:]
+        func = self.get_function_by_selector(selector)
+
+        names = get_abi_input_names(func.abi)
+        types = get_abi_input_types(func.abi)
+
+        decoded = self.w3.codec.decode(types, cast(HexBytes, params))
+        normalized = map_abi_data(BASE_RETURN_NORMALIZERS, types, decoded)
+
+        return func, dict(zip(names, normalized))
 
     @combomethod
     def find_functions_by_args(self, *args: Any) -> "BaseContractFunction":