diff --git a/config.js b/config.js index 9eba76ad..d8293e8f 100644 --- a/config.js +++ b/config.js @@ -40,6 +40,10 @@ module.exports = { from: '/tutorials/wallets/', to: '/concepts/wallets/' }, + { + from: '/concepts/production-network/', + to: '/concepts/pacific-network/' + }, { from: '/references/squid-py/', to: 'https://squid-py.readthedocs.io/en/latest/' diff --git a/content/concepts/ocean-tokens.md b/content/concepts/ocean-tokens.md index 89bc540c..99b6aa05 100644 --- a/content/concepts/ocean-tokens.md +++ b/content/concepts/ocean-tokens.md @@ -47,7 +47,7 @@ There were several ways to acquire some of the Ethereum Mainnet Ocean Tokens in - participation in the initial exchange offering - completion of a [bounty](/concepts/bounties/) -After [the initial exchange offering on Bittrex International](https://blog.oceanprotocol.com/initial-exchange-offering-of-ocean-protocol-on-bittrex-international-a454688f466a), Ethereum Mainnet Ocean Tokens became available in the Ethereum Mainnet (_not_ the Ocean Production Network; there was no Ocean Production Network at the time). +After [the initial exchange offering on Bittrex International](https://blog.oceanprotocol.com/initial-exchange-offering-of-ocean-protocol-on-bittrex-international-a454688f466a), Ethereum Mainnet Ocean Tokens became available in the Ethereum Mainnet (and not in any other network). The initial circulating supply of Ethereum Mainnet Ocean Tokens became available on the Ethereum Mainnet in May 2019. 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. @@ -81,11 +81,9 @@ Below is the _official list_ of exchanges which listed Ethereum Mainnet Ocean To - [KuCoin](https://www.kucoin.com/) - [DutchX](https://dutchx.readthedocs.io/en/latest/) -## Ocean Production Network Ocean Tokens +## Pacific Network Ocean Tokens -At the time of writing, the [Ocean Production Network](/concepts/production-network/) wasn't deployed yet, so there were no Ocean Production Network Ocean Tokens. - -At some point after the Ocean Production Network is launched, it will become possible to move Ocean Tokens from the Ethereum Mainnet to the Ocean Production Network. The details of exactly how that will work are still to be determined. +At the time of writing, the [Pacific Network](/concepts/pacific-network/) wasn't publicly-usable yet. Once it is, there will be a token bridge from the Ethereum Mainnet to the Pacific Network, allowing you to move Ocean Tokens from the Ethereum Mainnet to the Pacific Network. ## Further Reading about Ocean Tokens diff --git a/content/concepts/pacific-network.md b/content/concepts/pacific-network.md new file mode 100644 index 00000000..ecb818c5 --- /dev/null +++ b/content/concepts/pacific-network.md @@ -0,0 +1,33 @@ +--- +title: The Pacific Network +description: An introduction to the Pacific Network. +--- + +**At the time of writing, there was no live, running, publicly-available Pacific Network.** + +You can use the Ocean Protocol in several EVM-compatible networks, including: + +- the Ethereum Mainnet (also called the Main Ethereum Network), +- various [testnets](/concepts/testnets/), and +- in the future, the Pacific Network. + +The Pacific Network will be an EVM-compatible 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. + +The Pacific Network is (or was) also known by other names, including: + +- Pacific +- The Main Ocean Network +- The Ocean Mainnet +- The Ocean Live Network + +"Network" is sometimes shortened to just "Net." + +Initially, all the nodes in the Pacific Network will be operated solely by BigchainDB GmbH (i.e. one company), but the goal is for the nodes to be operated by many independent operators in the future. + +Initially, the Pacific Network will not be production-ready, that is, it will not be suitable for production use cases. +We expect vulnerabilities to be discovered and will conduct security audits over time, but the Ocean Protocol smart contracts will be in the wild for all intents and purposes. +Over time, the Pacific Network will be upgraded and improved. +There is no intent to shut it down. +Eventually, the goal is for it to become production-ready. + +[Ocean Tokens](/concepts/ocean-tokens/) can, in principle, live in any EVM-compatible network. The ones sold in the Ocean Protocol token sale were in the Ethereum Mainnet. There will be a token bridge between the Ethereum Mainnet and the Pacific Network, allowing anyone with Ocean Tokens to move them from the Ethereum Mainnet to the Pacific Network. However, please be aware that doing so would put those Ocean Tokens at risk. For more information, see [the page about Ocean Tokens](/concepts/ocean-tokens/). diff --git a/content/concepts/production-network.md b/content/concepts/production-network.md deleted file mode 100644 index c299a349..00000000 --- a/content/concepts/production-network.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -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-compatible 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 Production-Ready Ocean Network -- 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-compatible 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/). diff --git a/content/concepts/terminology.md b/content/concepts/terminology.md index e03e42d6..af557f7b 100644 --- a/content/concepts/terminology.md +++ b/content/concepts/terminology.md @@ -5,7 +5,7 @@ description: Terminology specific to Ocean Protocol. ## Ocean Network -Any EVM-compatible network where all[^1] the Ocean Protocol smart contracts ([keeper contracts](https://github.com/oceanprotocol/keeper-contracts)) are deployed. There can be many Ocean networks. Examples include the [testnets](/concepts/testnets/) and [the Ocean Production Network](/concepts/production-network/). +Any EVM-compatible network where all[^1] the Ocean Protocol smart contracts ([keeper contracts](https://github.com/oceanprotocol/keeper-contracts)) are deployed. There can be many Ocean networks. Examples include the [testnets](/concepts/testnets/) and [the Pacific Network](/concepts/pacific-network/). Note: Some old documentation refers to "the Ocean Network" or "the Ocean Protocol Network." You will have to guess which network was meant, based on the context. diff --git a/content/concepts/testnets.md b/content/concepts/testnets.md index 068a210c..539f5514 100644 --- a/content/concepts/testnets.md +++ b/content/concepts/testnets.md @@ -46,7 +46,6 @@ There are several Ocean Protocol software components that are live, connected to - Aquarius at [https://nginx-aquarius.dev-ocean.com](https://nginx-aquarius.dev-ocean.com) - Brizo at [https://nginx-brizo.dev-ocean.com](https://nginx-brizo.dev-ocean.com) - Jupyter Hub at [https://mantaray.dev-ocean.com](https://mantaray.dev-ocean.com) -- [Token Bridge Frontend](https://github.com/oceanprotocol/bridge-ui) (for a token bridge between Nile and Kovan) at [https://token-bridge.dev-ocean.com](https://token-bridge.dev-ocean.com) - Commons Marketplace at [https://commons.oceanprotocol.com](https://commons.oceanprotocol.com) - Aquarius for Commons Marketplace at [https://aquarius.marketplace.dev-ocean.com](https://aquarius.marketplace.dev-ocean.com) - Brizo for Commons Marketplace at [https://brizo.marketplace.dev-ocean.com](https://brizo.marketplace.dev-ocean.com) diff --git a/content/setup/keeper.md b/content/setup/keeper.md index 2d614503..559494dd 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 Production Network +## Running a Keeper in the Nile Testnet or the Pacific Network -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. +If you're interested in running a keeper node (as a voting _authority node_) in the [Nile Testnet](/concepts/testnets/#the-nile-testnet) or the [Pacific Network](/concepts/pacific-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/keeper-setup.md) (if you have permission). diff --git a/content/setup/marketplace.md b/content/setup/marketplace.md index 71246954..feb47d37 100644 --- a/content/setup/marketplace.md +++ b/content/setup/marketplace.md @@ -50,6 +50,8 @@ Of course, you could always write your own Squid library in the language of your ## Run Everything You Need to Run in Production +**At the time of writing, there was no production-ready Ocean Protocol network, but once one _does_ exist, the following must be done to run your marketplace/publisher app in production.** + When developing your marketplace/publisher app, you will probably use Barge to run all the Ocean Protocol components on your local machine. When it comes time to go to production, you will have to run some of those components in production: - Your marketplace/publisher app @@ -59,7 +61,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 Production Network](/concepts/production-network/), you will want to test it with an [Ocean testnet](/concepts/testnets/). +Before running all of that in production, you will want to test it with an [Ocean Protocol 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 86841e04..5e6cbdaa 100644 --- a/data/sidebars/concepts.yml +++ b/data/sidebars/concepts.yml @@ -10,8 +10,8 @@ link: /concepts/tools/ - title: Testnets link: /concepts/testnets/ - - title: Production Network - link: /concepts/production-network/ + - title: Pacific Network + link: /concepts/pacific-network/ - title: Ocean Tokens link: /concepts/ocean-tokens/ - title: Wallet Basics