diff --git a/docs/ens_overview.rst b/docs/ens_overview.rst index 45ae06e9a2..faecfdb133 100644 --- a/docs/ens_overview.rst +++ b/docs/ens_overview.rst @@ -233,28 +233,5 @@ Wildcard Resolution Support The ``ENS`` module supports Wildcard Resolution for resolvers that implement the ``ExtendedResolver`` interface as described in `ENSIP-10 `_. Resolvers that implement the extended resolver interface should return ``True`` when calling the -``supportsInterface()`` function with the extended resolver interface id ``0x9061b923`` and should resolve subdomains +``supportsInterface()`` function with the extended resolver interface id ``"0x9061b923"`` and should resolve subdomains to a unique address. - -A working example of a resolver that supports wildcard resolution is the resolver for the ``hatch.eth`` record on the -Ropsten testnet. - -.. code-block:: python - - # connect to the Ropsten testnet - >>> w3 = Web3(WebsocketProvider("wss://{ropsten_provider}")) - >>> ns = ENS.fromWeb3(w3) - - # get the resolver for `hatch.eth` - >>> resolver = ns.resolver('hatch.eth') - >>> resolver.address - '0x8fc4C380c5d539aE631daF3Ca9182b40FB21D1ae' - - # verify extended resolver interface support - >>> resolver.caller.supportsInterface('0x9061b923') - True - - >>> ns.address('random-subdomain.hatch.eth') - '0x49D4c4ff230688e4A357bc057e7E35e64d271939' - >>> ns.address('another-random-subdomain.hatch.eth') - '0xb35359B6450B0CbC9BE15A4eE6bcb8c5b0d9fC4A' diff --git a/docs/ethpm.rst b/docs/ethpm.rst index 8004986e7b..884edc5911 100644 --- a/docs/ethpm.rst +++ b/docs/ethpm.rst @@ -234,7 +234,6 @@ way through the EIP process) - ``chain_id``: Chain ID of the chain on which the registry lives. Defaults to Mainnet. Supported chains include... - 1: Mainnet - - 3: Ropsten - 4: Rinkeby - 5: Goerli diff --git a/docs/node.rst b/docs/node.rst index 55438d77d8..8fdf7ba473 100644 --- a/docs/node.rst +++ b/docs/node.rst @@ -94,9 +94,7 @@ then you connect to the main Ethereum network. If you want to test these things without using real ether, though, then you need to connect to a test network. There are several test networks to -choose from. One test network, Ropsten, is the most similar to the production network. -However, spam and mining attacks have happened, -which is disruptive when you want to test out a contract. +choose from, Rinkeby and Goerli being the longest running. There are some alternative networks that limit the damage of spam attacks, but they are not standardized across node software. Geth runs their own (Rinkeby). diff --git a/docs/providers.rst b/docs/providers.rst index 08668e675f..280f2cc18d 100644 --- a/docs/providers.rst +++ b/docs/providers.rst @@ -106,7 +106,7 @@ successful connection it can make: 2. :class:`~web3.providers.ipc.IPCProvider`, which looks for several IPC file locations. ``IPCProvider`` will not automatically detect a testnet connection, it is suggested that the user instead uses a ``w3`` instance from ``web3.auto.infura`` (e.g. - ``from web3.auto.infura.ropsten import w3``) if they want to auto-detect a testnet. + ``from web3.auto.infura.goerli import w3``) if they want to auto-detect a testnet. 3. :class:`~web3.providers.rpc.HTTPProvider`, which attempts to connect to "http://localhost:8545" 4. ``None`` - if no providers are successful, you can still use Web3 APIs that do not require a connection, like: diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index 2e4e1c6512..a1ee5e0496 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -111,10 +111,9 @@ Faucet mechanisms tend to come and go, so if any information here is out of date, try the `Ethereum Stackexchange `_. Here are some links to testnet ether instructions (in no particular order): -- `Kovan `_ - `Rinkeby `_ -- `Ropsten `_ - +- `Goerli `_ (different faucet links on top menu bar) +- `Sepolia `_ .. _account_troubleshooting: diff --git a/ethpm/constants.py b/ethpm/constants.py index c6818e5210..8fa0e70113 100644 --- a/ethpm/constants.py +++ b/ethpm/constants.py @@ -12,7 +12,6 @@ SUPPORTED_CHAIN_IDS = { 1: "mainnet", - 3: "ropsten", 4: "rinkeby", 5: "goerli", 11155111: "sepolia", diff --git a/ethpm/validation/uri.py b/ethpm/validation/uri.py index 89f13ecc7d..d2a214db0d 100644 --- a/ethpm/validation/uri.py +++ b/ethpm/validation/uri.py @@ -103,7 +103,7 @@ def validate_registry_uri_authority(auth: str) -> None: if not is_supported_chain_id(to_int(text=chain_id)): raise EthPMValidationError( f"Chain ID: {chain_id} is not supported. Supported chain ids include: " - "1 (mainnet), 3 (ropsten), 4 (rinkeby), 5 (goerli), and 11155111 (sepolia)." + "1 (mainnet), 4 (rinkeby), 5 (goerli), and 11155111 (sepolia)." "Please try again with a valid registry URI." ) diff --git a/newsfragments/2672.removal.rst b/newsfragments/2672.removal.rst new file mode 100644 index 0000000000..75398cc804 --- /dev/null +++ b/newsfragments/2672.removal.rst @@ -0,0 +1 @@ +Remove Ropsten auto provider and the relevant references to Ropsten across the repo diff --git a/tests/ethpm/_utils/test_chain_utils.py b/tests/ethpm/_utils/test_chain_utils.py index 096d8a51a1..bf197592ad 100644 --- a/tests/ethpm/_utils/test_chain_utils.py +++ b/tests/ethpm/_utils/test_chain_utils.py @@ -46,7 +46,6 @@ def test_parse_BIP122_uri(value, expected_resource_type): "chain_id,expected", ( (1, True), - (3, True), (4, True), (5, True), (11155111, True), diff --git a/tests/ethpm/test_uri.py b/tests/ethpm/test_uri.py index 1e5034aea4..5d34fd7598 100644 --- a/tests/ethpm/test_uri.py +++ b/tests/ethpm/test_uri.py @@ -77,10 +77,6 @@ def test_create_github_uri(): "erc1319://0x6b5DA3cA4286Baa7fBaf64EEEE1834C7d430B729", ["0x6b5DA3cA4286Baa7fBaf64EEEE1834C7d430B729", "1", None, None, None, None], ), - ( - "erc1319://0x6b5DA3cA4286Baa7fBaf64EEEE1834C7d430B729:3", - ["0x6b5DA3cA4286Baa7fBaf64EEEE1834C7d430B729", "3", None, None, None, None], - ), ( "erc1319://0x6b5DA3cA4286Baa7fBaf64EEEE1834C7d430B729:5/owned", [ diff --git a/web3/_utils/contract_sources/SimpleResolver.sol b/web3/_utils/contract_sources/SimpleResolver.sol index 30fce21479..08f00cc889 100644 --- a/web3/_utils/contract_sources/SimpleResolver.sol +++ b/web3/_utils/contract_sources/SimpleResolver.sol @@ -1,8 +1,6 @@ pragma solidity ^0.8.13; contract SimpleResolver { - // deployed on ropsten at address = 0xD4D522c96111679bF86220deFE75e0aA1df890b4 - function supportsInterface(bytes4 interfaceID) public returns (bool) { return interfaceID == 0x3b3b57de; } diff --git a/web3/auto/infura/endpoints.py b/web3/auto/infura/endpoints.py index 33c53ac088..6e599e7467 100644 --- a/web3/auto/infura/endpoints.py +++ b/web3/auto/infura/endpoints.py @@ -17,7 +17,6 @@ ) INFURA_MAINNET_DOMAIN = "mainnet.infura.io" -INFURA_ROPSTEN_DOMAIN = "ropsten.infura.io" INFURA_GOERLI_DOMAIN = "goerli.infura.io" INFURA_RINKEBY_DOMAIN = "rinkeby.infura.io" INFURA_SEPOLIA_DOMAIN = "sepolia.infura.io" diff --git a/web3/auto/infura/ropsten.py b/web3/auto/infura/ropsten.py deleted file mode 100644 index d82356bcaa..0000000000 --- a/web3/auto/infura/ropsten.py +++ /dev/null @@ -1,15 +0,0 @@ -from web3 import Web3 -from web3.providers.auto import ( - load_provider_from_uri, -) - -from .endpoints import ( - INFURA_ROPSTEN_DOMAIN, - build_http_headers, - build_infura_url, -) - -_headers = build_http_headers() -_infura_url = build_infura_url(INFURA_ROPSTEN_DOMAIN) - -w3 = Web3(load_provider_from_uri(_infura_url, _headers))