Use custom encoder for encode_single and is_encodable

Author: kclowes

tests/core/contracts/test_contract_constructor_encoding.py

@@ -62,8 +62,9 @@ def test_contract_constructor_encoding_encoding(web3, WithConstructorArgumentsCo
 
 
 def test_contract_constructor_encoding_encoding_warning(web3, WithConstructorArgumentsContract):
-    with pytest.warns(DeprecationWarning,
-         match="in v6 it will be invalid to pass a hexstring without the \"0x\" prefix"
+    with pytest.warns(
+        DeprecationWarning,
+        match="in v6 it will be invalid to pass a hexstring without the \"0x\" prefix"
     ):
 
         deploy_data = WithConstructorArgumentsContract._encode_constructor_data([1234, '61626364'])

tests/core/utilities/test_construct_event_data_set.py

@@ -68,6 +68,6 @@ def hex_and_pad(i):
         ),
     )
 )
-def test_construct_event_data_set(event_abi, arguments, expected):
-    actual = construct_event_data_set(event_abi, arguments)
+def test_construct_event_data_set(web3, event_abi, arguments, expected):
+    actual = construct_event_data_set(event_abi, web3, arguments)
     assert actual == expected

tests/core/utilities/test_construct_event_filter_params.py

@@ -46,8 +46,8 @@
         }),
     ),
 )
-def test_construct_event_filter_params(event_abi, fn_kwargs, expected):
-    _, actual = construct_event_filter_params(event_abi, **fn_kwargs)
+def test_construct_event_filter_params(web3, event_abi, fn_kwargs, expected):
+    _, actual = construct_event_filter_params(event_abi, web3, **fn_kwargs)
     assert actual == expected
 
 
@@ -68,7 +68,7 @@ def hex_and_pad(i):
         ]),
     ),
 )
-def test_construct_event_filter_params_for_data_filters(event_abi, fn_kwargs,
+def test_construct_event_filter_params_for_data_filters(event_abi, web3, fn_kwargs,
                                                         expected):
-    actual, _ = construct_event_filter_params(event_abi, **fn_kwargs)
+    actual, _ = construct_event_filter_params(event_abi, web3, **fn_kwargs)
     assert actual == expected

tests/core/utilities/test_construct_event_topics.py

@@ -75,6 +75,6 @@ def hex_and_pad(i):
         ),
     )
 )
-def test_construct_event_topics(event_abi, arguments, expected):
-    actual = construct_event_topic_set(event_abi, arguments)
+def test_construct_event_topics(web3, event_abi, arguments, expected):
+    actual = construct_event_topic_set(event_abi, web3, arguments)
     assert actual == expected

web3/_utils/contracts.py

@@ -1,8 +1,5 @@
 import functools
 
-from eth_abi import (
-    encode_abi as eth_abi_encode_abi,
-)
 from eth_utils import (
     add_0x_prefix,
     encode_hex,
@@ -148,7 +145,7 @@ def encode_abi(web3, abi, arguments, data=None):
         argument_types,
         arguments,
     )
-    encoded_arguments = eth_abi_encode_abi(
+    encoded_arguments = web3.codec.encode_abi(
         argument_types,
         normalized_arguments,
     )

web3/_utils/events.py

@@ -61,7 +61,7 @@
 )
 
 
-def construct_event_topic_set(event_abi, arguments=None):
+def construct_event_topic_set(event_abi, web3, arguments=None):
     if arguments is None:
         arguments = {}
     if isinstance(arguments, (list, tuple)):
@@ -89,7 +89,7 @@ def construct_event_topic_set(event_abi, arguments=None):
     ]
     encoded_args = [
         [
-            None if option is None else encode_hex(encode_single(arg['type'], option))
+            None if option is None else encode_hex(web3.codec.encode_single(arg['type'], option))
             for option in arg_options]
         for arg, arg_options in zipped_abi_and_args
     ]
@@ -98,7 +98,7 @@ def construct_event_topic_set(event_abi, arguments=None):
     return topics
 
 
-def construct_event_data_set(event_abi, arguments=None):
+def construct_event_data_set(event_abi, web3, arguments=None):
     if arguments is None:
         arguments = {}
     if isinstance(arguments, (list, tuple)):
@@ -125,7 +125,7 @@ def construct_event_data_set(event_abi, arguments=None):
     ]
     encoded_args = [
         [
-            None if option is None else encode_hex(encode_single(arg['type'], option))
+            None if option is None else encode_hex(web3.codec.encode_single(arg['type'], option))
             for option in arg_options]
         for arg, arg_options in zipped_abi_and_args
     ]

web3/_utils/filters.py

@@ -31,14 +31,15 @@
 
 
 def construct_event_filter_params(event_abi,
+                                  web3,
                                   contract_address=None,
                                   argument_filters=None,
                                   topics=None,
                                   fromBlock=None,
                                   toBlock=None,
                                   address=None):
     filter_params = {}
-    topic_set = construct_event_topic_set(event_abi, argument_filters)
+    topic_set = construct_event_topic_set(event_abi, web3, argument_filters)
 
     if topics is not None:
         if len(topic_set) > 1:
@@ -80,7 +81,7 @@ def construct_event_filter_params(event_abi,
     if toBlock is not None:
         filter_params['toBlock'] = toBlock
 
-    data_filters_set = construct_event_data_set(event_abi, argument_filters)
+    data_filters_set = construct_event_data_set(event_abi, web3, argument_filters)
 
     return data_filters_set, filter_params
 

web3/contract.py

@@ -1066,6 +1066,7 @@ def createFilter(
 
         _, event_filter_params = construct_event_filter_params(
             self._get_event_abi(),
+            self.web3,
             contract_address=self.address,
             argument_filters=_filters,
             fromBlock=fromBlock,