From 7fd612d2b7bdebf631688b476b8a1c2f93f354cb Mon Sep 17 00:00:00 2001 From: trentmc <5305452+trentmc@users.noreply.github.com> Date: Sat, 24 Oct 2020 12:52:17 +0200 Subject: [PATCH] ropsten -> rinkeby. And, fill in urls for network services. --- content/concepts/network-ethmainnet.md | 5 ++--- content/concepts/network-rinkeby.md | 13 +++++++++++++ content/concepts/network-ropsten.md | 16 ---------------- content/tutorials/connect-to-networks.md | 6 +++--- content/tutorials/get-ether-and-ocean-tokens.md | 10 +++++----- content/tutorials/react-setup.md | 2 +- data/sidebars/concepts.yml | 4 ++-- 7 files changed, 26 insertions(+), 30 deletions(-) create mode 100644 content/concepts/network-rinkeby.md delete mode 100644 content/concepts/network-ropsten.md diff --git a/content/concepts/network-ethmainnet.md b/content/concepts/network-ethmainnet.md index 445328a3..aa938789 100644 --- a/content/concepts/network-ethmainnet.md +++ b/content/concepts/network-ethmainnet.md @@ -9,7 +9,6 @@ Ocean is deployed to Ethereum mainnet. This network is for your app's production | ----------------------- | ---------------------- | | Etherscan explorer | https://etherscan.io/ | | Ocean Market main | https://oceanmarket.io | -| Ocean Market - Provider | https://FIXME | -| Ocean Market - Aquarius | https://FIXME | +| Ocean Market - Provider | https://provider.mainnet.oceanprotocol.com | +| Ocean Market - Aquarius | https://aquarius.mainnet.oceanprotocol.com | -The [Connect-to-Networks](/tutorials/connect-to-networks/) tutorial has more information about connecting your wallet or app to Ganache / Barge. \ No newline at end of file diff --git a/content/concepts/network-rinkeby.md b/content/concepts/network-rinkeby.md new file mode 100644 index 00000000..349bdf63 --- /dev/null +++ b/content/concepts/network-rinkeby.md @@ -0,0 +1,13 @@ +--- +title: Network - Rinkeby Testnet +description: Tools for development on Ethereum Rinkeby testnet +--- + +Ocean is deployed to Rinkeby network. This network is for testing your app's deployment before final production deployment. Here are tools related to this deployment. + +| What | URL | +| ----------------------- | ----------------------------- | +| Etherscan explorer | https://rinkeby.etherscan.io/ | +| Ocean Market | Point wallet to Rinkeby network, at usual Ocean Market url https://market.oceanprotocol.com | +| Ocean Market - Provider | https://provider.rinkeby.oceanprotocol.com | +| Ocean Market - Aquarius | https://aquarius.rinkeby.oceanprotocol.com | diff --git a/content/concepts/network-ropsten.md b/content/concepts/network-ropsten.md deleted file mode 100644 index 82c6b533..00000000 --- a/content/concepts/network-ropsten.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Network - Ropsten Testnet -description: Tools for development on Ethereum Ropsten testnet ---- - -Ocean is deployed to Ropsten network. This network is for testing your app's deployment before final production deployment. Here are tools related to this deployment. - -| What | URL | -| ----------------------- | ----------------------------- | -| Etherscan explorer | https://ropsten.etherscan.io/ | -| Ocean Market on Ropsten | https://FIXME | -| Ocean Market - Provider | https://FIXME | -| Ocean Market - Aquarius | https://FIXME | -| OCEAN Faucet Server | https://FIXME | - -The [Connect-to-Networks](/tutorials/connect-to-networks/) tutorial has more information about connecting your wallet or app to Ganache / Barge. \ No newline at end of file diff --git a/content/tutorials/connect-to-networks.md b/content/tutorials/connect-to-networks.md index ad93c41f..f189576d 100644 --- a/content/tutorials/connect-to-networks.md +++ b/content/tutorials/connect-to-networks.md @@ -1,6 +1,6 @@ --- title: Connect to Ocean-Related Networks -description: On connecting to Ethereum, Ropsten and Your Local Network. +description: On connecting to Ethereum, Rinkeby and Your Local Network. --- ##Connect to Ethereum mainnet @@ -9,9 +9,9 @@ Metamask and other ERC20 wallets default to Ethereum mainnet. Therefore your wal Some apps may need `network_id` and `chain_id`. The values are both `1` for Ethereum mainnet. `Symbol` and `nickname` can be whatever value you like. -##Connect to Ropsten testnet +##Connect to Rinkeby testnet -In MetaMask, click on the network name dropdown, then select `Ropsten`. +In MetaMask, click on the network name dropdown, then select `Rinkeby`. Its `network_id` is 3 and `chain_id` is 3. diff --git a/content/tutorials/get-ether-and-ocean-tokens.md b/content/tutorials/get-ether-and-ocean-tokens.md index 3abfde9b..7a217c7e 100644 --- a/content/tutorials/get-ether-and-ocean-tokens.md +++ b/content/tutorials/get-ether-and-ocean-tokens.md @@ -7,7 +7,7 @@ description: How to get tokens for each network deployment In each network, you'll need ETH to pay for gas. Certain Ocean actions will need OCEAN tokens. -The ETH and OCEAN in Ropsten and local networks are not "real" ETH or OCEAN tokens of any value. They're simply stand-ins to be able to test. +The ETH and OCEAN in Rinkeby and local networks are not "real" ETH or OCEAN tokens of any value. They're simply stand-ins to be able to test. ### Ethereum mainnet @@ -16,13 +16,13 @@ The ETH and OCEAN in Ropsten and local networks are not "real" ETH or OCEAN toke - **OCEAN.** [Here are exchanges](https://www.coingecko.com/en/coins/ocean-protocol#markets) to purchase OCEAN. -### Ropsten testnet +### Rinkeby testnet -Testnets like Ropsten have faucets to dole out ETH and OCEAN. +Testnets like Rinkeby have faucets to dole out ETH and OCEAN. -- **ETH.** [Here's an ETH faucet](https://faucet.ropsten.be/) for Ropsten. You may find others by [searching](https://www.google.com/search?q=ropsten+ether+faucet&oq=ropsten+ether+faucet). +- **ETH.** [Here's an ETH faucet](https://faucet.rinkeby.be/) for Rinkeby. You may find others by [searching](https://www.google.com/search?q=rinkeby+ether+faucet&oq=rinkeby+ether+faucet). -- **OCEAN.** [Here's an OCEAN faucet](fixme) for Ropsten (FIXME!!). +- **OCEAN.** [Here's an OCEAN faucet](fixme) for Rinkeby (FIXME!!). ### Local network diff --git a/content/tutorials/react-setup.md b/content/tutorials/react-setup.md index 79dd27e1..3d6d34e8 100644 --- a/content/tutorials/react-setup.md +++ b/content/tutorials/react-setup.md @@ -119,7 +119,7 @@ GITHUB-EMBED https://github.com/oceanprotocol/react-tutorial/blob/2765a7e6ae9a94 ## Bonus: Connect against local network -Instead of remotely connecting to Ropsten, you can connect to your own [local network](concepts/network-local). It uses Ethereum Ganache plus Ocean Barge. +Instead of remotely connecting to Rinkeby, you can connect to your own [local network](concepts/network-local). It uses Ethereum Ganache plus Ocean Barge. ```bash git clone https://github.com/oceanprotocol/barge.git diff --git a/data/sidebars/concepts.yml b/data/sidebars/concepts.yml index 0d8473ac..8039ac59 100644 --- a/data/sidebars/concepts.yml +++ b/data/sidebars/concepts.yml @@ -9,8 +9,8 @@ items: - title: Network - Local / Barge link: /concepts/network-local/ - - title: Network - Ropsten Testnet - link: /concepts/network-ropsten/ + - title: Network - Rinkeby Testnet + link: /concepts/network-rinkeby/ - title: Network - Ethereum Mainnet link: /concepts/network-ethmainnet/