From c86548b3de5807e59524f5d940df4678b764f4cc Mon Sep 17 00:00:00 2001 From: trentmc <5305452+trentmc@users.noreply.github.com> Date: Tue, 27 Oct 2020 11:21:18 +0100 Subject: [PATCH] Clarified that Barge can go with Local/Ganache or Rinkeby. Added links to deployed smart contracts --- content/concepts/network-ethmainnet.md | 2 +- content/concepts/network-local.md | 8 +++++--- content/concepts/network-rinkeby.md | 12 ++++++++++-- data/sidebars/concepts.yml | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/content/concepts/network-ethmainnet.md b/content/concepts/network-ethmainnet.md index aa938789..f5798e5d 100644 --- a/content/concepts/network-ethmainnet.md +++ b/content/concepts/network-ethmainnet.md @@ -3,7 +3,7 @@ title: Network - Ethereum Mainnet description: Tools for development on Ethereum Mainnet --- -Ocean is deployed to Ethereum mainnet. This network is for your app's production deployment. Here are tools related to this deployment. +Ocean is deployed to Ethereum mainnet. This network is for your app's production deployment. Here are tools related to this deployment. [Here](https://github.com/oceanprotocol/contracts/blob/master/docs/deployments/mainnet.md) are the addresses of the deployed contracts. | What | URL | | ----------------------- | ---------------------- | diff --git a/content/concepts/network-local.md b/content/concepts/network-local.md index dd00e497..6cb10d2c 100644 --- a/content/concepts/network-local.md +++ b/content/concepts/network-local.md @@ -3,10 +3,12 @@ title: Network - Local / Barge description: Tools for development on a local Ethereum network --- -You can deploy Ocean onto Ganache - a local Ethereum "network" that you run on your machine for fast iterations while developing your app. +You can deploy Ocean onto [Ganache](https://www.trufflesuite.com/ganache) - a local Ethereum "network" that you run on your machine for fast iterations while developing your app. -Barge is a shell script to help with Ocean Ganache deployments. It launches Docker and Docker Compose, to run Ganache with Ocean smart contracts on top, along with Provider and Aquarius metadata cache. It's used extensively by the Ocean core devs. +The [Connect-to-Networks](/tutorials/connect-to-networks/) tutorial has more information about connecting your wallet / app to Ganache. -The [Connect-to-Networks](/tutorials/connect-to-networks/) tutorial has more information about connecting your wallet or app to Ganache / Barge. +**Barge** is a shell script to help run Ocean components (Provider, Aquarius), and. It can run Ganache optionally too (or connect to another network). + +Barge launches Docker and Docker Compose, to run Ganache with Ocean smart contracts on top, along with Provider and Aquarius metadata cache. It's used extensively by the Ocean core devs (with Ganache or Rinkeby). diff --git a/content/concepts/network-rinkeby.md b/content/concepts/network-rinkeby.md index 349bdf63..b23cb7e4 100644 --- a/content/concepts/network-rinkeby.md +++ b/content/concepts/network-rinkeby.md @@ -1,9 +1,15 @@ --- -title: Network - Rinkeby Testnet +title: Network - Rinkeby / Barge 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. +Ocean is deployed to Rinkeby network. Rinkeby is useful for testing your app's deployment before final production deployment. [Here](https://github.com/oceanprotocol/contracts/blob/master/docs/deployments/rinkeby.md) are the addresses of the deployed contracts. + +**Barge** can be run with Rinkeby as well. This is a useful configuration for development flows. + + + +Here are tools related to Rinkeby deployment. | What | URL | | ----------------------- | ----------------------------- | @@ -11,3 +17,5 @@ Ocean is deployed to Rinkeby network. This network is for testing your app's dep | 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 | + + \ No newline at end of file diff --git a/data/sidebars/concepts.yml b/data/sidebars/concepts.yml index 792b6b2c..66cde6bf 100644 --- a/data/sidebars/concepts.yml +++ b/data/sidebars/concepts.yml @@ -11,7 +11,7 @@ items: - title: Network - Local / Barge link: /concepts/network-local/ - - title: Network - Rinkeby Testnet + - title: Network - Rinkeby / Barge link: /concepts/network-rinkeby/ - title: Network - Ethereum Mainnet link: /concepts/network-ethmainnet/