Fix problem with constructor _encode_data_in_transaction exception handling

Author: Stuart Reed

web3/_utils/abi.py

@@ -49,6 +49,7 @@
     ABI,
     ABIComponent,
     ABIComponentIndexed,
+    ABIConstructor,
     ABIElement,
     ABIEvent,
     ABIFallback,
@@ -370,6 +371,24 @@ def _align_abi_input(
     )
 
 
+def find_constructor_abi_element_by_type(contract_abi: ABI) -> ABIConstructor:
+    """
+    Find the constructor ABI element in the contract ABI.
+
+    This function is often used in place of `web3.utils.abi.get_abi_element` to find
+    a constructor without considering it's argument types. This is used prior to
+    encoding the abi, since the argument types are not known at that time.
+    """
+    candidates = [abi for abi in contract_abi if abi["type"] == "constructor"]
+    if len(candidates) == 1:
+        return candidates[0]
+    elif len(candidates) == 0:
+        return None
+    elif len(candidates) > 1:
+        raise Web3ValueError("Found multiple constructors.")
+    return None
+
+
 DYNAMIC_TYPES = ["bytes", "string"]
 
 INT_SIZES = range(8, 257, 8)

web3/_utils/contracts.py

@@ -136,7 +136,6 @@ def encode_abi(
         abi,
         *arguments,
         abi_codec=w3.codec,
-        **{},
     ):
         raise Web3TypeError(
             "One or more arguments could not be encoded to the necessary "

web3/contract/base_contract.py

@@ -47,6 +47,7 @@
 
 from web3._utils.abi import (
     fallback_func_abi_exists,
+    find_constructor_abi_element_by_type,
     is_array_type,
     receive_func_abi_exists,
 )
@@ -86,7 +87,6 @@
     MutableAttributeDict,
 )
 from web3.exceptions import (
-    ABIConstructorNotFound,
     ABIEventNotFound,
     ABIFallbackNotFound,
     ABIFunctionNotFound,
@@ -911,10 +911,7 @@ def _get_event_abi(
     def _encode_constructor_data(
         cls, *args: Sequence[Any], **kwargs: Dict[str, Any]
     ) -> HexStr:
-        try:
-            constructor_abi = get_abi_element(cls.abi, "constructor")
-        except ABIConstructorNotFound:
-            constructor_abi = None
+        constructor_abi = find_constructor_abi_element_by_type(cls.abi)
 
         if constructor_abi:
             arguments = get_normalized_abi_inputs(constructor_abi, *args, **kwargs)
@@ -1095,12 +1092,7 @@ def __init__(
 
     @combomethod
     def _encode_data_in_transaction(self, *args: Any, **kwargs: Any) -> HexStr:
-        try:
-            constructor_abi = get_abi_element(self.abi, "constructor", *args, **kwargs)
-        except MismatchedABI as e:
-            raise TypeError(e)
-        except ABIConstructorNotFound:
-            constructor_abi = None
+        constructor_abi = find_constructor_abi_element_by_type(self.abi)
 
         if constructor_abi:
             if not args:
@@ -1109,6 +1101,7 @@ def _encode_data_in_transaction(self, *args: Any, **kwargs: Any) -> HexStr:
                 kwargs = {}
 
             arguments = get_normalized_abi_inputs(constructor_abi, *args, **kwargs)
+
             data = add_0x_prefix(
                 encode_abi(self.w3, constructor_abi, arguments, data=self.bytecode)
             )