diff --git a/content/concepts/ocean-tokens.md b/content/concepts/ocean-tokens.md index 1152bfa5..1d5bf2f0 100644 --- a/content/concepts/ocean-tokens.md +++ b/content/concepts/ocean-tokens.md @@ -15,19 +15,19 @@ description: The technical basics of Ocean Tokens. ## Testnet Ocean Tokens -There are Ocean Tokens in several testnets, including the Kovan testnet and Nile testnet. They are just testnet Ocean Tokens (i.e. for testing purposes only) and they aren't interchangeable with Mainnet Ocean Tokens. For more details, see the the [page about Testnets](/concepts/testnets/) and the [tutorials](/tutorials/introduction/). +There are Ocean Tokens in several testnets, including the Kovan testnet and Nile testnet. They are just testnet Ocean Tokens (i.e. for testing purposes only) and they aren't interchangeable with Ethereum Mainnet Ocean Tokens. For more details, see the the [page about Testnets](/concepts/testnets/) and the [tutorials](/tutorials/introduction/). -## Mainnet Ocean Tokens +## Ocean Tokens in the Ethereum Mainnet and the Ocean Production Network -**NOTICE: Below we outline the plans for Mainnet Ocean Tokens at the time of writing. Those plans might change. We will update this page on a regular basis.** +**NOTICE: Below we outline plans at the time of writing. Those plans might change. We will update this page on a regular basis.** -The initial circulating supply of Mainnet Ocean Tokens became available on the Ethereum Mainnet (_not_ the Ocean Mainnet) in May 2019. +The initial circulating supply of Ethereum Mainnet Ocean Tokens became available on the Ethereum Mainnet (_not_ the [Ocean Production Network](/concepts/production-network/)) in May 2019. -If you acquired Ocean Tokens in the initial circulating supply, they will be sent to the address you provided. +If you acquired Ocean Tokens in the initial circulating supply, they should have been, or will be, sent to the address you provided, in the Ethereum Mainnet. -In the future, the Ocean Mainnet will be launched and later it will become possible to move Ocean Tokens from the Ethereum Mainnet to the Ocean Mainnet. +In the future, the [Ocean Production Network](/concepts/production-network/) will be launched and later it will become possible to move Ocean Tokens from the Ethereum Mainnet to the Ocean Production Network. -It _won't_ be possible to use Mainnet Ocean Tokens for Ocean Protocol tasks (such as consuming assets) in the Ethereum Mainnet. It _will_ be possible to use Mainnet Ocean Tokens for Ocean Protocol tasks in the Ocean Mainnet. +At the time of writing, Ethereum Mainnet Ocean Tokens could not be used for Ocean Protocol tasks (such as purchasing a data set) in the Ethereum Mainnet. ## Further Reading about Ocean Tokens diff --git a/content/concepts/production-network.md b/content/concepts/production-network.md new file mode 100644 index 00000000..981f54fe --- /dev/null +++ b/content/concepts/production-network.md @@ -0,0 +1,28 @@ +--- +title: The Ocean Production Network +description: An introduction to the Ocean Production Network. +--- + +**At the time of writing, there was no live, running, publicly-available Ocean Production Network.** + +Ocean Protocol makes use of several EVM networks, including: + +- the Ethereum Mainnet (also called the Main Ethereum Network), +- various [testnets](/concepts/testnets/), and +- in the future, the Ocean Production Network. + +The Ocean Production Network will be an EVM network of nodes ("keepers") running [Parity Ethereum](https://www.parity.io/ethereum/) software. Various Ocean Protocol smart contracts ("keeper contracts") will be deployed to it. It will be used for production use cases. It is also known by other names, including: + +- The Main Ocean Network +- The Ocean Mainnet +- The Ocean Live Network +- (among the internal dev team) The Ocean Pacific Network, or just Pacific + +"Network" is sometimes shortened to just "Net." + +[Ocean Tokens](/concepts/ocean-tokens/) can, in principle, live in any EVM network. The ones sold in the Ocean Protocol token sale were in the Ethereum Mainnet (and still were, at the time of writing). For more information, see [the page about Ocean Tokens](/concepts/ocean-tokens/). + + + + +TODO: search in files for all references to the Ocean Mainnet etc. diff --git a/content/concepts/wallets.md b/content/concepts/wallets.md index 24b60687..cf2213d2 100644 --- a/content/concepts/wallets.md +++ b/content/concepts/wallets.md @@ -28,7 +28,7 @@ Once your wallet is set up, it will have one or more **accounts**. Each account has several **balances**, e.g. an Ether balance, an Ocean Token balance, and maybe other balances. All balances start at zero. -An account's Ether balance might be 7.1 ETH in the Ethereum mainnet, 2.39 ETH in the Kovan testnet, and 0.1 ETH in the Nile testnet. You can't move ETH from one network to another (unless there is a special exchange or bridge set up). The same is true of Ocean Token balances. +An account's Ether balance might be 7.1 ETH in the Ethereum Mainnet, 2.39 ETH in the Kovan testnet, and 0.1 ETH in the Nile testnet. You can't move ETH from one network to another (unless there is a special exchange or bridge set up). The same is true of Ocean Token balances. Each account has one **private key**, one **public key** and one **address**. The public key and address can be calculated from the private key. You must keep the private key secret because it's what's needed to spend/transfer Ether and Ocean Tokens (or to sign transactions of any kind). You can share the address with others. In fact, if you want someone to send some Ether or Ocean Tokens to an account, you give them the account's address. diff --git a/content/setup/keeper.md b/content/setup/keeper.md index cf97d359..2d614503 100644 --- a/content/setup/keeper.md +++ b/content/setup/keeper.md @@ -14,8 +14,8 @@ If you want to run a [keeper node (keeper)](/concepts/components#keeper), you ha Barge deploys the keeper contracts to whatever keeper nodes are deployed locally. -## Running a Keeper in the Nile Testnet or Ocean Mainnet +## Running a Keeper in the Nile Testnet or Ocean Production Network -If you're interested in running a keeper node (as a voting _authority node_) in the Nile Testnet or Ocean Mainnet, then email info@oceanprotocol.com. +If you're interested in running a keeper node (as a voting _authority node_) in the [Nile Testnet](/concepts/testnets/#the-nile-testnet) or [Ocean Production Network](http://localhost:8000/concepts/production-network/), then email info@oceanprotocol.com. -Note: The dev-ocean repository contains [a guide for running a keeper node in the Nile Testnet](https://github.com/oceanprotocol/dev-ocean/blob/master/doc/devops/nile-keeper-setup.md) (if you have permission). +Note: The dev-ocean repository contains [a guide for running a keeper node in the Nile Testnet](https://github.com/oceanprotocol/dev-ocean/blob/master/doc/devops/keeper-setup.md) (if you have permission). diff --git a/content/setup/marketplace.md b/content/setup/marketplace.md index 0b1196e6..6950563e 100644 --- a/content/setup/marketplace.md +++ b/content/setup/marketplace.md @@ -59,7 +59,7 @@ When developing your marketplace/publisher app, you will probably use Barge to r - Recommended: a [keeper](/concepts/components/#keeper) node with the keeper contracts deployed to it, connected to an Ocean network - Optional: your own [Secret Store](/concepts/components/#secret-store) nodes (for a more advanced setup) -Before running all of that in production with the Ocean Mainnet, you will want to test it with an [Ocean testnet](/concepts/testnets/). +Before running all of that in production with the [Ocean Production Network](/concepts/production-network/), you will want to test it with an [Ocean testnet](/concepts/testnets/). Of course, there are many other things that must be handled in production: diff --git a/data/sidebars/concepts.yml b/data/sidebars/concepts.yml index 2a6cb25f..86841e04 100644 --- a/data/sidebars/concepts.yml +++ b/data/sidebars/concepts.yml @@ -10,6 +10,8 @@ link: /concepts/tools/ - title: Testnets link: /concepts/testnets/ + - title: Production Network + link: /concepts/production-network/ - title: Ocean Tokens link: /concepts/ocean-tokens/ - title: Wallet Basics