web3 7.0.0b8__py3-none-any.whl → 7.0.0b9__py3-none-any.whl

web3/_utils/normalizers.py

@@ -19,6 +19,7 @@ from eth_abi.grammar import (
     parse,
 )
 from eth_typing import (
+    ABI,
     ChecksumAddress,
     HexStr,
     TypeStr,
@@ -62,9 +63,6 @@ from web3.exceptions import (
     NameNotFound,
     Web3ValueError,
 )
-from web3.types import (
-    ABI,
-)
 
 if TYPE_CHECKING:
     from web3 import (  # noqa: F401
@@ -256,7 +254,9 @@ def normalize_abi(abi: Union[ABI, str]) -> ABI:
     return cast(ABI, abi)
 
 
-def normalize_address(ens: ENS, address: ChecksumAddress) -> ChecksumAddress:
+def normalize_address(
+    ens: ENS, address: Optional[ChecksumAddress]
+) -> Union[ChecksumAddress, None]:
     if address:
         if is_ens_name(address):
             validate_name_has_address(ens, address)
@@ -265,15 +265,17 @@ def normalize_address(ens: ENS, address: ChecksumAddress) -> ChecksumAddress:
     return address
 
 
-def normalize_address_no_ens(address: ChecksumAddress) -> ChecksumAddress:
+def normalize_address_no_ens(
+    address: Optional[ChecksumAddress],
+) -> Union[ChecksumAddress, None]:
     if address:
         validate_address(address)
     return address
 
 
-def normalize_bytecode(bytecode: bytes) -> HexBytes:
-    if bytecode:
-        bytecode = HexBytes(bytecode)
+def normalize_bytecode(bytecode: Optional[bytes]) -> Union[HexBytes, None]:
+    if bytecode is not None:
+        return HexBytes(bytecode)
     return bytecode
 
 

web3/_utils/validation.py

@@ -5,10 +5,14 @@ from typing import (
 )
 
 from eth_typing import (
+    ABI,
+    ABIFunction,
     HexStr,
     TypeStr,
 )
 from eth_utils import (
+    abi_to_signature,
+    filter_abi_by_type,
     function_abi_to_4byte_selector,
     is_0x_prefixed,
     is_binary_address,
@@ -38,8 +42,6 @@ from ens.utils import (
     is_valid_ens_name,
 )
 from web3._utils.abi import (
-    abi_to_signature,
-    filter_by_type,
     is_address_type,
     is_array_type,
     is_bool_type,
@@ -56,10 +58,6 @@ from web3.exceptions import (
     Web3TypeError,
     Web3ValueError,
 )
-from web3.types import (
-    ABI,
-    ABIFunction,
-)
 
 
 def _prepare_selector_collision_msg(duplicates: Dict[HexStr, ABIFunction]) -> str:
@@ -81,7 +79,7 @@ def validate_abi(abi: ABI) -> None:
     if not all(is_dict(e) for e in abi):
         raise Web3ValueError("'abi' is not a list of dictionaries")
 
-    functions = filter_by_type("function", abi)
+    functions = filter_abi_by_type("function", abi)
     selectors = groupby(compose(encode_hex, function_abi_to_4byte_selector), functions)
     duplicates = valfilter(lambda funcs: len(funcs) > 1, selectors)
     if duplicates:

web3/contract/async_contract.py

@@ -14,11 +14,16 @@ from typing import (
 )
 
 from eth_typing import (
+    ABI,
     ChecksumAddress,
 )
 from eth_utils import (
     combomethod,
 )
+from eth_utils.abi import (
+    get_abi_input_names,
+    get_all_function_abis,
+)
 from eth_utils.toolz import (
     partial,
 )
@@ -28,9 +33,12 @@ from hexbytes import (
 
 from web3._utils.abi import (
     fallback_func_abi_exists,
-    filter_by_type,
     receive_func_abi_exists,
 )
+from web3._utils.abi_element_identifiers import (
+    FallbackFn,
+    ReceiveFn,
+)
 from web3._utils.async_transactions import (
     async_fill_transaction_defaults,
 )
@@ -50,10 +58,6 @@ from web3._utils.events import (
 from web3._utils.filters import (
     AsyncLogFilter,
 )
-from web3._utils.function_identifiers import (
-    FallbackFn,
-    ReceiveFn,
-)
 from web3._utils.normalizers import (
     normalize_abi,
     normalize_address_no_ens,
@@ -88,15 +92,11 @@ from web3.exceptions import (
     Web3ValueError,
 )
 from web3.types import (
-    ABI,
     BlockIdentifier,
     EventData,
     StateOverride,
     TxParams,
 )
-from web3.utils import (
-    get_abi_input_names,
-)
 
 if TYPE_CHECKING:
     from ens import AsyncENS  # noqa: F401
@@ -311,7 +311,7 @@ class AsyncContractFunction(BaseContractFunction):
             self.w3,
             self.address,
             self._return_data_normalizers,
-            self.function_identifier,
+            self.abi_element_identifier,
             call_transaction,
             block_id,
             self.contract_abi,
@@ -328,7 +328,7 @@ class AsyncContractFunction(BaseContractFunction):
         return await async_transact_with_contract_function(
             self.address,
             self.w3,
-            self.function_identifier,
+            self.abi_element_identifier,
             setup_transaction,
             self.contract_abi,
             self.abi,
@@ -346,7 +346,7 @@ class AsyncContractFunction(BaseContractFunction):
         return await async_estimate_gas_for_function(
             self.address,
             self.w3,
-            self.function_identifier,
+            self.abi_element_identifier,
             setup_transaction,
             self.contract_abi,
             self.abi,
@@ -363,7 +363,7 @@ class AsyncContractFunction(BaseContractFunction):
         return await async_build_transaction_for_function(
             self.address,
             self.w3,
-            self.function_identifier,
+            self.abi_element_identifier,
             built_transaction,
             self.contract_abi,
             self.abi,
@@ -383,7 +383,7 @@ class AsyncContractFunction(BaseContractFunction):
                 w3=async_w3,
                 contract_abi=abi,
                 address=address,
-                function_identifier=FallbackFn,
+                abi_element_identifier=FallbackFn,
             )()
         return cast(AsyncContractFunction, NonExistentFallbackFunction())
 
@@ -399,7 +399,7 @@ class AsyncContractFunction(BaseContractFunction):
                 w3=async_w3,
                 contract_abi=abi,
                 address=address,
-                function_identifier=ReceiveFn,
+                abi_element_identifier=ReceiveFn,
             )()
         return cast(AsyncContractFunction, NonExistentReceiveFunction())
 
@@ -577,14 +577,15 @@ class AsyncContractCaller(BaseContractCaller):
             if transaction is None:
                 transaction = {}
 
-            self._functions = filter_by_type("function", self.abi)
+            self._functions = get_all_function_abis(self.abi)
+
             for func in self._functions:
                 fn = AsyncContractFunction.factory(
                     func["name"],
                     w3=w3,
                     contract_abi=self.abi,
                     address=self.address,
-                    function_identifier=func["name"],
+                    abi_element_identifier=func["name"],
                     decode_tuples=decode_tuples,
                 )