Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove rinkeby refs and replace with goerli where appropriate #2815

Merged
merged 1 commit into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/ethpm.rst
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ 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
- 4: Rinkeby
- 5: Goerli
- 11155111: Sepolia

- ``package-name``: Must conform to the package-name as specified in
the
Expand Down
6 changes: 3 additions & 3 deletions docs/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ like so:
:code: python
:start-line: 1

Using Infura Rinkeby Node
Using Infura Goerli Node
-------------------------
Import your required libraries

Expand All @@ -695,7 +695,7 @@ Initialize a web3 instance with an Infura node

.. code-block:: python

w3 = Web3(Web3.HTTPProvider("https://rinkeby.infura.io/v3/YOUR_INFURA_KEY"))
w3 = Web3(Web3.HTTPProvider("https://goerli.infura.io/v3/YOUR_INFURA_KEY"))


Inject the middleware into the middleware onion
Expand Down Expand Up @@ -728,7 +728,7 @@ And finally, send the transaction

Tip : afterwards you can use the value stored in ``txn_hash``, in an explorer like `etherscan`_ to view the transaction's details

.. _etherscan: https://rinkeby.etherscan.io
.. _etherscan: https://goerli.etherscan.io


Adjusting log levels
Expand Down
4 changes: 2 additions & 2 deletions docs/middleware.rst
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ Proof of Authority
It's important to inject the middleware at the 0th layer of the middleware onion:
`w3.middleware_onion.inject(geth_poa_middleware, layer=0)`

The ``geth_poa_middleware`` is required to connect to ``geth --dev`` or the Rinkeby
The ``geth_poa_middleware`` is required to connect to ``geth --dev`` or the Goerli
public network. It may also be needed for other EVM compatible blockchains like Polygon
or BNB Chain (Binance Smart Chain).

Expand Down Expand Up @@ -421,7 +421,7 @@ Why is ``geth_poa_middleware`` necessary?

There is no strong community consensus on a single Proof-of-Authority (PoA) standard yet.
Some nodes have successful experiments running, though. One is go-ethereum (geth),
which uses a prototype PoA for it's development mode and the Rinkeby test network.
which uses a prototype PoA for it's development mode and the Goerli test network.

Unfortunately, it does deviate from the yellow paper specification, which constrains the
``extraData`` field in each block to a maximum of 32-bytes. Geth's PoA uses more than
Expand Down
1 change: 0 additions & 1 deletion docs/troubleshooting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ Faucet mechanisms tend to come and go, so if any information here is
out of date, try the `Ethereum Stackexchange <https://ethereum.stackexchange.com/>`_.
Here are some links to testnet ether instructions (in no particular order):

- `Rinkeby <https://www.rinkeby.io/#faucet>`_
- `Goerli <https://goerli.net>`_ (different faucet links on top menu bar)
- `Sepolia <https://faucet.sepolia.dev>`_

Expand Down
1 change: 0 additions & 1 deletion ethpm/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

SUPPORTED_CHAIN_IDS = {
1: "mainnet",
4: "rinkeby",
5: "goerli",
11155111: "sepolia",
}
2 changes: 1 addition & 1 deletion ethpm/validation/uri.py
Original file line number Diff line number Diff line change
Expand Up @@ -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), 4 (rinkeby), 5 (goerli), and 11155111 (sepolia)."
"1 (mainnet), 5 (goerli), and 11155111 (sepolia)."
"Please try again with a valid registry URI."
)

Expand Down
1 change: 1 addition & 0 deletions newsfragments/2815.breaking.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
removed Rinkeby from list of allowed chains in EthPM
1 change: 1 addition & 0 deletions newsfragments/2815.doc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
remove references to Rinkeby or replace with Goerli
2 changes: 1 addition & 1 deletion tests/ethpm/_utils/test_chain_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ def test_parse_BIP122_uri(value, expected_resource_type):
"chain_id,expected",
(
(1, True),
(4, True),
(5, True),
(11155111, True),
(2, False),
(4, False),
("1", False),
({}, False),
(None, False),
Expand Down