From 569c81b8ee3d7364e8498cc49e03d5836f33e764 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Wed, 13 Mar 2019 13:44:30 +0100 Subject: [PATCH 1/5] New page re/ Ocean Tokens + edit related pages --- content/concepts/ocean-tokens.md | 41 +++++++++++++++++++ content/concepts/wallets.md | 2 +- .../tutorials/get-ether-and-ocean-tokens.md | 18 +++++++- data/sidebars/concepts.yml | 2 + 4 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 content/concepts/ocean-tokens.md diff --git a/content/concepts/ocean-tokens.md b/content/concepts/ocean-tokens.md new file mode 100644 index 00000000..cc6af01a --- /dev/null +++ b/content/concepts/ocean-tokens.md @@ -0,0 +1,41 @@ +--- +title: Ocean Tokens +description: The technical basics of Ocean Tokens. +--- + +## Basics + +**Ocean Tokens** are the [cryptocurrency](https://en.wikipedia.org/wiki/Cryptocurrency) associated with Ocean Protocol. They are standards-compliant [ERC-20 tokens](https://en.wikipedia.org/wiki/ERC-20). + +Property | Value +-----------------------|--------- +Token Contract Address | See below +Token Symbol | OCEAN +Decimals of Precision | 18 +Total Token Supply | 1,410,000,000 (not counting testnet 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 (including token contract addresses), see the the [page about Testnets](/concepts/testnets/). + +## Mainnet Ocean Tokens + +The initial circulating supply of Mainnet Ocean Tokens will become available on the Ethereum mainnet in April 2019. + +**Ethereum Mainnet Token Contract Address:** To be determined + +If you acquired Ocean Tokens before the Ocean mainnet launch (e.g. in the seed round, in the pre-sale, in the token sale, or some other way), then your Ocean Tokens will be sent to the address you provided (in the Ethereum mainnet). + +In the future, the Ocean mainnet will be launched and it will become possible to move Ocean Tokens from the Ethereum mainnet to the Ocean mainnet. The details are to be determined. + +Also in the future (but not necessarily at the same time), it will become possible to earn new Mainnet Ocean Tokens as network rewards. The [Ocean Protocol Technical Whitepaper](https://oceanprotocol.com/tech-whitepaper.pdf) explains that in more detail. + +Note: It won't be possible to _use_ Mainnet Ocean Tokens for Ocean Protocol tasks (such as consuming an asset) in the Ethereum mainnet. In fact, most of the Ocean Protocol keeper contracts (smart contracts) won't be deployed to the Ethereum mainnet. Mainnet Ocean Tokens will only be usable for doing Ocean Protocol tasks in the Ocean mainnet. + +## Further Reading about Ocean Tokens + +- [Get Ether and Ocean Tokens](/tutorials/get-ether-and-ocean-tokens/) +- “[Ocean Tokenomics](https://blog.oceanprotocol.com/ocean-tokenomics-d34f28c480a8)” +- “[Ocean Tokenomics II](https://blog.oceanprotocol.com/https-blog-oceanprotocol-com-ocean-tokenomics-ii-faf05854314b)” +- “[Ocean Token is 0.22€ for the Network Launch](https://blog.oceanprotocol.com/ocean-token-is-0-22-for-the-network-launch-52a8bd6c9379)” +- [Ocean Protocol Technical Whitepaper](https://oceanprotocol.com/tech-whitepaper.pdf) diff --git a/content/concepts/wallets.md b/content/concepts/wallets.md index 80f9b1af..d83976b7 100644 --- a/content/concepts/wallets.md +++ b/content/concepts/wallets.md @@ -5,7 +5,7 @@ description: Ocean users need a wallet to manage their Ocean Tokens and Ether. T ## Introduction -If you want to use the Ocean Network, then you need Ocean Tokens ([ERC-20 tokens](https://en.wikipedia.org/wiki/ERC-20)) and Ether. To get and manage Ocean Tokens and Ether, you need a _cryptocurrency wallet_ or _crypto wallet_. +If you want to use the Ocean Network, then you need [Ocean Tokens](/concepts/ocean-tokens/) and Ether. To get and manage Ocean Tokens and Ether, you need a _cryptocurrency wallet_ or _crypto wallet_. ## What Crypto Wallets Can Be Used with Ocean? diff --git a/content/tutorials/get-ether-and-ocean-tokens.md b/content/tutorials/get-ether-and-ocean-tokens.md index e97359ef..6f3f3ec7 100644 --- a/content/tutorials/get-ether-and-ocean-tokens.md +++ b/content/tutorials/get-ether-and-ocean-tokens.md @@ -3,11 +3,11 @@ title: Get Ether and Ocean Tokens description: A tutorial about how to get Ether and Ocean Tokens. --- -If you want to interact with an Ethereum-based network that supports Ocean Protocol, then you'll eventually need Ether or Ocean Tokens _for that network_. (Every Ethereum-based network has its own Ether and its own Ocean Tokens, and you can't use those in other networks.) +If you want to interact with an Ethereum-based network that supports Ocean Protocol, then you'll eventually need Ether or [Ocean Tokens](/concepts/ocean-tokens/) _for that network_. (Every Ethereum-based network has its own Ether and maybe its own Ocean Tokens, and you can't use those in other networks.) At the time of writing, there were some public testnets you could use to test an Ocean Protocol application. For more information about those, see the page about [testnets](/concepts/testnets/). -Note: This page _doesn't_ explain how to get Ether or Ocean Tokens for use in the Ocean Mainnet. We'll add that in the future. +Note: This page _doesn't_ explain how to get Ether or Ocean Tokens for use in the Ocean mainnet. ## Get a Compatible Wallet @@ -47,4 +47,18 @@ That command uses [Ethereum's JSON RPC API](https://wiki.parity.io/JSONRPC.html) ## Get Ocean Tokens +### Get Testnet Ocean Tokens + It used to be possible to get Ocean Tokens by clicking Pleuston's "Make it rain" button, but that used an Ocean Protocol keeper function that has been removed for security reasons. The "Make it rain" button might be made to work again in the future, but only in testnets. + +### Get Mainnet Ocean Tokens + +There are several ways that one can (or could) acquire some of the Ocean Tokens in the initial circulating supply (which initially will only be in the Ethereum Mainnet), including: + +- participation in the seed round +- participation in the pre-sale +- participation in the token sale +- completion of a [bounty](/concepts/bounties/) +- assorted other ways + +In the future, there will be other ways to get Mainnet Ocean Tokens. See the page about [Ocean Tokens](/concepts/ocean-tokens/). diff --git a/data/sidebars/concepts.yml b/data/sidebars/concepts.yml index 6605220c..608a26b6 100644 --- a/data/sidebars/concepts.yml +++ b/data/sidebars/concepts.yml @@ -10,6 +10,8 @@ link: /concepts/tools/ - title: Testnets link: /concepts/testnets/ + - title: Ocean Tokens + link: /concepts/ocean-tokens/ - title: Wallet Basics link: /concepts/wallets/ From 9e2bed6dc3782fb4246557cb74d9be010be787bf Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Wed, 13 Mar 2019 16:12:54 +0100 Subject: [PATCH 2/5] Revisions --- content/concepts/ocean-tokens.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/content/concepts/ocean-tokens.md b/content/concepts/ocean-tokens.md index cc6af01a..5e79cd94 100644 --- a/content/concepts/ocean-tokens.md +++ b/content/concepts/ocean-tokens.md @@ -12,7 +12,6 @@ Property | Value Token Contract Address | See below Token Symbol | OCEAN Decimals of Precision | 18 -Total Token Supply | 1,410,000,000 (not counting testnet tokens) ## Testnet Ocean Tokens @@ -20,17 +19,17 @@ There are Ocean Tokens in several testnets, including the Kovan testnet and Nile ## Mainnet Ocean Tokens -The initial circulating supply of Mainnet Ocean Tokens will become available on the Ethereum mainnet in April 2019. +The initial circulating supply of Mainnet Ocean Tokens will first become available on the Ethereum mainnet, i.e. before the Ocean mainnet. **Ethereum Mainnet Token Contract Address:** To be determined If you acquired Ocean Tokens before the Ocean mainnet launch (e.g. in the seed round, in the pre-sale, in the token sale, or some other way), then your Ocean Tokens will be sent to the address you provided (in the Ethereum mainnet). -In the future, the Ocean mainnet will be launched and it will become possible to move Ocean Tokens from the Ethereum mainnet to the Ocean mainnet. The details are to be determined. +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. The details are to be determined. Also in the future (but not necessarily at the same time), it will become possible to earn new Mainnet Ocean Tokens as network rewards. The [Ocean Protocol Technical Whitepaper](https://oceanprotocol.com/tech-whitepaper.pdf) explains that in more detail. -Note: It won't be possible to _use_ Mainnet Ocean Tokens for Ocean Protocol tasks (such as consuming an asset) in the Ethereum mainnet. In fact, most of the Ocean Protocol keeper contracts (smart contracts) won't be deployed to the Ethereum mainnet. Mainnet Ocean Tokens will only be usable for doing Ocean Protocol tasks in the Ocean mainnet. +Note: It won't be possible to _use_ Mainnet Ocean Tokens for Ocean Protocol tasks (such as consuming assets) in the Ethereum mainnet. In fact, most of the Ocean Protocol keeper contracts (smart contracts) won't be deployed to the Ethereum mainnet. Mainnet Ocean Tokens will only be usable for doing Ocean Protocol tasks in the Ocean mainnet. ## Further Reading about Ocean Tokens From 84312cbb0767b482f604c484d0772f695b4ccad3 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Thu, 14 Mar 2019 11:42:17 +0100 Subject: [PATCH 3/5] More revisions --- content/concepts/ocean-tokens.md | 10 ++++------ content/tutorials/get-ether-and-ocean-tokens.md | 6 ++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/content/concepts/ocean-tokens.md b/content/concepts/ocean-tokens.md index 5e79cd94..9c164fb1 100644 --- a/content/concepts/ocean-tokens.md +++ b/content/concepts/ocean-tokens.md @@ -19,17 +19,15 @@ There are Ocean Tokens in several testnets, including the Kovan testnet and Nile ## Mainnet Ocean Tokens -The initial circulating supply of Mainnet Ocean Tokens will first become available on the Ethereum mainnet, i.e. before the Ocean mainnet. +The initial circulating supply of Mainnet Ocean Tokens will first become available on the Ethereum mainnet (_not_ the Ocean mainnet). **Ethereum Mainnet Token Contract Address:** To be determined -If you acquired Ocean Tokens before the Ocean mainnet launch (e.g. in the seed round, in the pre-sale, in the token sale, or some other way), then your Ocean Tokens will be sent to the address you provided (in the Ethereum mainnet). +If you acquired Ocean Tokens in the initial circulating supply, they will be sent to the address you provided. We will write about the timing and other details elsewhere. -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. The details are to be determined. +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. We will write about the timing and other details elsewhere. -Also in the future (but not necessarily at the same time), it will become possible to earn new Mainnet Ocean Tokens as network rewards. The [Ocean Protocol Technical Whitepaper](https://oceanprotocol.com/tech-whitepaper.pdf) explains that in more detail. - -Note: It won't be possible to _use_ Mainnet Ocean Tokens for Ocean Protocol tasks (such as consuming assets) in the Ethereum mainnet. In fact, most of the Ocean Protocol keeper contracts (smart contracts) won't be deployed to the Ethereum mainnet. Mainnet Ocean Tokens will only be usable for doing Ocean Protocol tasks in the Ocean mainnet. +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. ## Further Reading about Ocean Tokens diff --git a/content/tutorials/get-ether-and-ocean-tokens.md b/content/tutorials/get-ether-and-ocean-tokens.md index 6f3f3ec7..1044edef 100644 --- a/content/tutorials/get-ether-and-ocean-tokens.md +++ b/content/tutorials/get-ether-and-ocean-tokens.md @@ -47,13 +47,15 @@ That command uses [Ethereum's JSON RPC API](https://wiki.parity.io/JSONRPC.html) ## Get Ocean Tokens +See the page about [Ocean Tokens](/concepts/ocean-tokens/). + ### Get Testnet Ocean Tokens It used to be possible to get Ocean Tokens by clicking Pleuston's "Make it rain" button, but that used an Ocean Protocol keeper function that has been removed for security reasons. The "Make it rain" button might be made to work again in the future, but only in testnets. ### Get Mainnet Ocean Tokens -There are several ways that one can (or could) acquire some of the Ocean Tokens in the initial circulating supply (which initially will only be in the Ethereum Mainnet), including: +There are several ways that one can (or could) acquire some of the Ocean Tokens in the initial circulating supply, including: - participation in the seed round - participation in the pre-sale @@ -61,4 +63,4 @@ There are several ways that one can (or could) acquire some of the Ocean Tokens - completion of a [bounty](/concepts/bounties/) - assorted other ways -In the future, there will be other ways to get Mainnet Ocean Tokens. See the page about [Ocean Tokens](/concepts/ocean-tokens/). +In the future, it will become possible to earn Mainnet Ocean Tokens as network rewards and in other ways. The [Ocean Protocol Technical Whitepaper](https://oceanprotocol.com/tech-whitepaper.pdf) explains that in more detail. From 88cb3019b4ba74d119dafc6044700857dc49647e Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Mon, 18 Mar 2019 15:20:17 +0100 Subject: [PATCH 4/5] Add more cautionary language re/ Ocean Tokens --- content/concepts/ocean-tokens.md | 16 ++++++++-------- content/tutorials/get-ether-and-ocean-tokens.md | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/content/concepts/ocean-tokens.md b/content/concepts/ocean-tokens.md index 9c164fb1..7d1c1680 100644 --- a/content/concepts/ocean-tokens.md +++ b/content/concepts/ocean-tokens.md @@ -9,30 +9,30 @@ description: The technical basics of Ocean Tokens. Property | Value -----------------------|--------- -Token Contract Address | See below +Token Contract Address | [See the tutorial](/tutorials/wallets-and-ocean-tokens/) Token Symbol | OCEAN Decimals of Precision | 18 ## 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 (including token contract addresses), see the the [page about Testnets](/concepts/testnets/). +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/). ## Mainnet Ocean Tokens -The initial circulating supply of Mainnet Ocean Tokens will first become available on the Ethereum mainnet (_not_ the Ocean mainnet). +**NOTICE: Below we outline the plans for Mainnet Ocean Tokens at the time of writing. Those plans might change. We try to keep this page up-to-date but there may be some delay.** -**Ethereum Mainnet Token Contract Address:** To be determined +The initial circulating supply of Mainnet Ocean Tokens will first become available on the Ethereum Mainnet (_not_ the Ocean Mainnet). -If you acquired Ocean Tokens in the initial circulating supply, they will be sent to the address you provided. We will write about the timing and other details elsewhere. +If you acquired Ocean Tokens in the initial circulating supply, they will be sent to the address you provided. -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. We will write about the timing and other details elsewhere. +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. -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. +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. ## Further Reading about Ocean Tokens +- [Teach Your Wallet to Track Ocean Tokens](/tutorials/wallets-and-ocean-tokens/) - [Get Ether and Ocean Tokens](/tutorials/get-ether-and-ocean-tokens/) - “[Ocean Tokenomics](https://blog.oceanprotocol.com/ocean-tokenomics-d34f28c480a8)” - “[Ocean Tokenomics II](https://blog.oceanprotocol.com/https-blog-oceanprotocol-com-ocean-tokenomics-ii-faf05854314b)” -- “[Ocean Token is 0.22€ for the Network Launch](https://blog.oceanprotocol.com/ocean-token-is-0-22-for-the-network-launch-52a8bd6c9379)” - [Ocean Protocol Technical Whitepaper](https://oceanprotocol.com/tech-whitepaper.pdf) diff --git a/content/tutorials/get-ether-and-ocean-tokens.md b/content/tutorials/get-ether-and-ocean-tokens.md index 81bc74f6..10d3aa60 100644 --- a/content/tutorials/get-ether-and-ocean-tokens.md +++ b/content/tutorials/get-ether-and-ocean-tokens.md @@ -7,8 +7,6 @@ If you want to interact with an Ethereum-based network that supports Ocean Proto At the time of writing, there were some public testnets you could use to test an Ocean Protocol application. For more information about those, see the page about [testnets](/concepts/testnets/). -Note: This page _doesn't_ explain how to get Ether or Ocean Tokens for use in the Ocean mainnet. - ## Get a Compatible Wallet You will need a [wallet that can hold Ether (for any Ethereum network) and Ocean Tokens (for any Ethereum network)](/concepts/wallets/). For the purpose of this tutorial, you can use MetaMask. See [our tutorial about how to set up MetaMask](/tutorials/metamask-setup/). From 6cda4900236eb0e914af32672534c0c7704ab929 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Wed, 20 Mar 2019 14:32:57 +0100 Subject: [PATCH 5/5] Make changes suggested by Patty --- content/concepts/ocean-tokens.md | 2 +- content/tutorials/get-ether-and-ocean-tokens.md | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/content/concepts/ocean-tokens.md b/content/concepts/ocean-tokens.md index 7d1c1680..1389470d 100644 --- a/content/concepts/ocean-tokens.md +++ b/content/concepts/ocean-tokens.md @@ -19,7 +19,7 @@ There are Ocean Tokens in several testnets, including the Kovan testnet and Nile ## Mainnet Ocean Tokens -**NOTICE: Below we outline the plans for Mainnet Ocean Tokens at the time of writing. Those plans might change. We try to keep this page up-to-date but there may be some delay.** +**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.** The initial circulating supply of Mainnet Ocean Tokens will first become available on the Ethereum Mainnet (_not_ the Ocean Mainnet). diff --git a/content/tutorials/get-ether-and-ocean-tokens.md b/content/tutorials/get-ether-and-ocean-tokens.md index 10d3aa60..e4ce72cc 100644 --- a/content/tutorials/get-ether-and-ocean-tokens.md +++ b/content/tutorials/get-ether-and-ocean-tokens.md @@ -57,18 +57,13 @@ Details about the bootstrapped accounts can be found here: [Barge](https://githu See the page about [Ocean Tokens](/concepts/ocean-tokens/). -### Get Testnet Ocean Tokens - -It used to be possible to get Ocean Tokens by clicking Pleuston's "Make it rain" button, but that used an Ocean Protocol keeper function that has been removed for security reasons. The "Make it rain" button might be made to work again in the future, but only in testnets. - ### Get Mainnet Ocean Tokens -There are several ways that one can (or could) acquire some of the Ocean Tokens in the initial circulating supply, including: +There are several ways to acquire some of the Ocean Tokens in the initial circulating supply, including: - participation in the seed round - participation in the pre-sale - participation in the token sale - completion of a [bounty](/concepts/bounties/) -- assorted other ways -In the future, it will become possible to earn Mainnet Ocean Tokens as network rewards and in other ways. The [Ocean Protocol Technical Whitepaper](https://oceanprotocol.com/tech-whitepaper.pdf) explains that in more detail. +In the future, it will become possible to earn Mainnet Ocean Tokens as network rewards. The [Ocean Protocol Technical Whitepaper](https://oceanprotocol.com/tech-whitepaper.pdf) explains that in more detail.