Remove ENS check for mainnet

- ENS supports many chains now. We should remove the mainnet check.

Author: fselmo

tests/core/middleware/test_name_to_address_middleware.py

@@ -7,13 +7,14 @@
     Web3,
 )
 from web3.exceptions import (
-    InvalidAddress,
+    NameNotFound,
 )
-from web3.middleware import (  # noqa: F401
-    construct_fixture_middleware,
+from web3.middleware import (
     name_to_address_middleware,
 )
-from web3.middleware.names import async_name_to_address_middleware
+from web3.middleware.names import (
+    async_name_to_address_middleware,
+)
 from web3.providers.eth_tester import (
     AsyncEthereumTesterProvider,
     EthereumTesterProvider,
@@ -49,24 +50,12 @@ def w3(_w3_setup, ens_mapped_address):
 
 
 def test_pass_name_resolver(w3, ens_mapped_address):
-    return_chain_on_mainnet = construct_fixture_middleware(
-        {
-            "net_version": "1",
-        }
-    )
     known_account_balance = w3.eth.get_balance(ens_mapped_address)
-    w3.middleware_onion.inject(return_chain_on_mainnet, layer=0)
     assert w3.eth.get_balance(NAME) == known_account_balance
 
 
 def test_fail_name_resolver(w3):
-    return_chain_on_mainnet = construct_fixture_middleware(
-        {
-            "net_version": "2",
-        }
-    )
-    w3.middleware_onion.inject(return_chain_on_mainnet, layer=0)
-    with pytest.raises(InvalidAddress, match=r".*ethereum\.eth.*"):
+    with pytest.raises(NameNotFound, match=r".*ethereum\.eth.*"):
         w3.eth.get_balance("ethereum.eth")
 
 
@@ -104,5 +93,5 @@ async def test_async_pass_name_resolver(async_w3, async_ens_mapped_address):
 
 @pytest.mark.asyncio
 async def test_async_fail_name_resolver(async_w3):
-    with pytest.raises(InvalidAddress, match=r".*ethereum\.eth.*"):
+    with pytest.raises(NameNotFound, match=r".*ethereum\.eth.*"):
         await async_w3.eth.get_balance("ethereum.eth")

web3/_utils/normalizers.py

@@ -218,16 +218,10 @@ def abi_ens_resolver(
             )
 
         _ens = cast(ENS, w3.ens)
-        net_version = int(w3.net.version) if hasattr(w3, "net") else None
         if _ens is None:
             raise InvalidAddress(
                 f"Could not look up name {val!r} because ENS is" " set to None"
             )
-        elif net_version != 1 and not isinstance(_ens, StaticENS):
-            raise InvalidAddress(
-                f"Could not look up name {val!r} because web3 is"
-                " not connected to mainnet"
-            )
         else:
             return type_str, validate_name_has_address(_ens, val)
     else: