Change eth_getBalance and eth_getCode to use Method

ens/utils.py

@@ -212,3 +212,13 @@ 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

newsfragments/1733.misc.rst

@@ -0,0 +1 @@
+Change eth_getBalance and eth_getCode to use Method class

web3/_utils/validation.py

@@ -34,6 +34,9 @@
     valmap,
 )
 
+from ens.utils import (
+    is_valid_domain,
+)
 from web3._utils.abi import (
     abi_to_signature,
     filter_by_type,
@@ -152,10 +155,19 @@ 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

@@ -202,17 +202,6 @@ def blockNumber(self) -> BlockNumber:
     def chainId(self) -> int:
         return self.web3.manager.request_blocking(RPC.eth_chainId, [])
 
-    def getBalance(
-        self, account: Union[Address, ChecksumAddress, ENS],
-        block_identifier: Optional[BlockIdentifier] = None
-    ) -> Wei:
-        if block_identifier is None:
-            block_identifier = self.defaultBlock
-        return self.web3.manager.request_blocking(
-            RPC.eth_getBalance,
-            [account, block_identifier],
-        )
-
     def block_identifier_munger(
         self,
         *args: Any,
@@ -222,6 +211,11 @@ def block_identifier_munger(
             block_identifier = self.defaultBlock
         return [*args, block_identifier]
 
+    getBalance: Method[Callable[..., Wei]] = Method(
+        RPC.eth_getBalance,
+        mungers=[block_identifier_munger]
+    )
+
     getStorageAt: Method[
         Callable[..., HexBytes]
     ] = Method(
@@ -239,16 +233,10 @@ def block_identifier_munger(
         mungers=[block_identifier_munger],
     )
 
-    def getCode(
-        self, account: Union[Address, ChecksumAddress, ENS],
-        block_identifier: Optional[BlockIdentifier] = None
-    ) -> HexBytes:
-        if block_identifier is None:
-            block_identifier = self.defaultBlock
-        return self.web3.manager.request_blocking(
-            RPC.eth_getCode,
-            [account, block_identifier],
-        )
+    getCode: Method[Callable[..., HexBytes]] = Method(
+        RPC.eth_getCode,
+        mungers=[block_identifier_munger]
+    )
 
     def getBlock(
         self, block_identifier: BlockIdentifier, full_transactions: bool = False