Add and pass test for data tree normalization

Author: davesque

tests/core/utilities/test_abi.py

@@ -251,6 +251,18 @@ def test_abi_data_tree(types, data, expected):
             BASE_RETURN_NORMALIZERS,
             [['0x5B2063246F2191f18F2675ceDB8b28102e957458'] * 2],
         ),
+        (
+            ["(address,address)[]"],
+            [[(
+                '0x5b2063246f2191f18f2675cedb8b28102e957458',
+                '0xebe0da78ecb266c7ea605dc889c64849f860383f',
+            )] * 2],
+            BASE_RETURN_NORMALIZERS,
+            [[(
+                '0x5B2063246F2191f18F2675ceDB8b28102e957458',
+                '0xeBe0DA78ecb266C7EA605DC889c64849F860383F',
+            )] * 2],
+        ),
     ],
 )
 def test_map_abi_data(types, data, funcs, expected):

web3/_utils/abi.py

@@ -22,6 +22,7 @@
 )
 from eth_abi.grammar import (
     ABIType,
+    TupleType,
     parse,
 )
 from eth_abi.registry import (
@@ -669,11 +670,27 @@ def abi_sub_tree(abi_type: Optional[Union[TypeStr, ABIType]], data_value: Any) -
     if isinstance(abi_type, TypeStr):
         abi_type = parse(abi_type)
 
+    # In the two special cases below, we rebuild the given data structures with
+    # annotated items
     if abi_type.is_array:
-        it = abi_type.item_type
-        return ABITypedData([abi_type.to_type_str(), [abi_sub_tree(it, i) for i in data_value]])
-    else:
-        return ABITypedData([abi_type.to_type_str(), data_value])
+        # If type is array, determine item type and annotate all
+        # items in iterable with that type
+        item_type_str = abi_type.item_type.to_type_str()
+        data_value = type(data_value)(
+            abi_sub_tree(item_type_str, i) for i in data_value
+        )
+    elif isinstance(abi_type, TupleType):
+        # Otherwise, if type is tuple, determine component types and annotate
+        # items in iterable respectively with those types
+        data_value = type(data_value)(
+            abi_sub_tree(comp_type.to_type_str(), i)
+            for comp_type, i in zip(abi_type.components, data_value)
+        )
+
+    return ABITypedData([
+        abi_type.to_type_str(),
+        data_value,
+    ])
 
 
 def strip_abi_type(elements):