Add address resolver to Eth class

ens/utils.py

@@ -212,13 +212,3 @@ def assert_signer_in_modifier_kwargs(modifier_kwargs: Any) -> ChecksumAddress:
 
 def is_none_or_zero_address(addr: Union[Address, ChecksumAddress, HexAddress]) -> bool:
     return not addr or addr == EMPTY_ADDR_HEX
-
-
-def is_valid_domain(domain: str) -> bool:
-    split_domain = domain.split('.')
-    if len(split_domain) == 1:
-        return False
-    for name in split_domain:
-        if not is_valid_name(name):
-            return False
-    return True

web3/_utils/validation.py

@@ -34,9 +34,6 @@
     valmap,
 )
 
-from ens.utils import (
-    is_valid_domain,
-)
 from web3._utils.abi import (
     abi_to_signature,
     filter_by_type,
@@ -155,19 +152,10 @@ def validate_abi_value(abi_type: TypeStr, value: Any) -> None:
     )
 
 
-def is_non_address_string(value: str) -> bool:
-    return (is_string(value) and not is_bytes(value) and not
-            is_checksum_address(value) and not is_hex_address(value))
-
-
 def validate_address(value: Any) -> None:
     """
     Helper function for validating an address
     """
-    if is_non_address_string(value):
-        if not is_valid_domain(value):
-            raise InvalidAddress("Address needs to be a full domain name including a TLD", value)
-        return
     if is_bytes(value):
         if not is_binary_address(value):
             raise InvalidAddress("Address must be 20 bytes when input type is bytes", value)

web3/eth.py

@@ -52,6 +52,9 @@
     LogFilter,
     TransactionFilter,
 )
+from web3._utils.normalizers import (
+    abi_ens_resolver,
+)
 from web3._utils.rpc_abi import (
     RPC,
 )
@@ -211,9 +214,15 @@ def block_identifier_munger(
             block_identifier = self.defaultBlock
         return [*args, block_identifier]
 
+    def address_resolver_munger(self, account, block_identifier=None):
+        resolved_addr = abi_ens_resolver(self.web3, 'address', account)[1]
+        if block_identifier is None:
+            block_identifier = self.defaultBlock
+        return [resolved_addr, block_identifier]
+
     getBalance: Method[Callable[..., Wei]] = Method(
         RPC.eth_getBalance,
-        mungers=[block_identifier_munger]
+        mungers=[address_resolver_munger],
     )
 
     getStorageAt: Method[
@@ -235,7 +244,7 @@ def block_identifier_munger(
 
     getCode: Method[Callable[..., HexBytes]] = Method(
         RPC.eth_getCode,
-        mungers=[block_identifier_munger]
+        mungers=[address_resolver_munger]
     )
 
     def getBlock(