Pass codec from contract class

Author: Stuart Reed

web3/_utils/contracts.py

@@ -280,7 +280,9 @@ def encode_transaction_data(
         raise Web3TypeError("Unsupported function identifier")
 
     return add_0x_prefix(
-        encode_abi(fn_abi, fn_arguments, strict=w3.strict_bytes_type_checking)
+        encode_abi(
+            fn_abi, fn_arguments, data=fn_selector, strict=w3.strict_bytes_type_checking
+        )
     )
 
 

web3/contract/base_contract.py

@@ -613,7 +613,13 @@ def _build_transaction(self, transaction: Optional[TxParams] = None) -> TxParams
     @combomethod
     def _encode_transaction_data(cls) -> HexStr:
         return add_0x_prefix(
-            encode_abi(cls.abi, cls.arguments, strict=cls.w3.strict_bytes_type_checking)
+            encode_abi(
+                cls.abi,
+                cls.arguments,
+                data=cls.selector,
+                abi_codec=cls.w3.codec,
+                strict=cls.w3.strict_bytes_type_checking,
+            )
         )
 
     _return_data_normalizers: Optional[Tuple[Callable[..., Any], ...]] = tuple()
@@ -754,7 +760,11 @@ def encode_abi(
             data = fn_selector
 
         return encode_abi(
-            fn_abi, fn_arguments, data, strict=cls.w3.strict_bytes_type_checking
+            fn_abi,
+            fn_arguments,
+            data,
+            abi_codec=cls.w3.codec,
+            strict=cls.w3.strict_bytes_type_checking,
         )
 
     @combomethod
@@ -899,6 +909,7 @@ def _encode_constructor_data(
                     constructor_abi,
                     arguments,
                     data=cls.bytecode,
+                    abi_codec=cls.w3.codec,
                     strict=cls.w3.strict_bytes_type_checking,
                 )
             )
@@ -1086,6 +1097,7 @@ def _encode_data_in_transaction(self, *args: Any, **kwargs: Any) -> HexStr:
                     constructor_abi,
                     arguments,
                     data=self.bytecode,
+                    abi_codec=self.w3.codec,
                     strict=self.w3.strict_bytes_type_checking,
                 )
             )

web3/contract/utils.py

@@ -108,7 +108,10 @@ def call_contract_function(
             contract_abi, w3.codec, function_identifier, args, kwargs
         )
 
-    output_types = get_abi_output_types(fn_abi)
+    try:
+        output_types = get_abi_output_types(fn_abi)
+    except ValueError:
+        output_types = []
 
     try:
         output_data = w3.codec.decode(output_types, return_data)
@@ -319,7 +322,10 @@ async def async_call_contract_function(
             contract_abi, async_w3.codec, function_identifier, args, kwargs
         )
 
-    output_types = get_abi_output_types(fn_abi)
+    try:
+        output_types = get_abi_output_types(fn_abi)
+    except ValueError:
+        output_types = []
 
     try:
         output_data = async_w3.codec.decode(output_types, return_data)