From a8ce812c1bf0ddb81bd8a899727841449b6156d3 Mon Sep 17 00:00:00 2001 From: trentmc Date: Fri, 22 Dec 2023 14:46:08 +0100 Subject: [PATCH] Fixes from #1407 --- discover/benefits.md | 2 +- discover/networks/README.md | 24 +++---- discover/ocean-token.md | 80 +----------------------- user-guides/wallets/wallets-and-ocean.md | 2 +- 4 files changed, 17 insertions(+), 91 deletions(-) diff --git a/discover/benefits.md b/discover/benefits.md index b0c34ee3..ee376504 100644 --- a/discover/benefits.md +++ b/discover/benefits.md @@ -75,7 +75,7 @@ With [Ocean Predictoor](../predictoor/README.md), you submit predictions for the Compete in a Data Challenge -Ocean regularly offer [data science challenges](../data-scientists/join-a-data-challenge) on real-world problems. Showcase your skills, and earn $ prizes. +Ocean regularly offer [data science challenges](../data-scientists/join-a-data-challenge.md) on real-world problems. Showcase your skills, and earn $ prizes. diff --git a/discover/networks/README.md b/discover/networks/README.md index cb80f387..7357df2f 100644 --- a/discover/networks/README.md +++ b/discover/networks/README.md @@ -39,7 +39,7 @@ The rest of this doc gives details for each network. You can skip it until you n ## Production Networks -### Production: Ethereum Mainnet +### Ethereum Mainnet @@ -53,7 +53,7 @@ The rest of this doc gives details for each network. You can skip it until you n **Wallet.** To connect to Ethereum mainnet with e.g. MetaMask, click on the network name dropdown and select "Ethereum mainnet" from the list. -### Production: Polygon Mainnet +### Polygon Mainnet
@@ -68,7 +68,7 @@ The rest of this doc gives details for each network. You can skip it until you n **Bridge.** Check out the Polygon Bridge [guide](bridges.md) to learn how you can deposit, withdraw and send tokens. -### Production: Oasis Sapphire Mainnet +### Oasis Sapphire Mainnet [Ocean Predictoor](../predictoor/README.md) is deployed on Oasis Sapphire mainnet for its ability to keep EVM transactions private. This deployment does do not currently support ocean.js, ocean.py, or Ocean Market. @@ -84,7 +84,7 @@ The rest of this doc gives details for each network. You can skip it until you n **Bridge.** Use [Celer](https://cbridge.celer.network/1/23294/OCEAN) to bridge OCEAN from Ethereum mainnet to Oasis Sapphire mainnet. -### Production: BNB Smart Chain +### BNB Smart Chain
@@ -100,7 +100,7 @@ This is one of the [Binance](https://binance.com)-spawned chains. BNB is the tok **Bridge.** Our [BNB Smart Chain Bridge Guide](bridges.md#bnb-smart-chain-bridge) describes how to get OCEAN to BNB Smart Chain. -### Production: Energy Web Chain (EWC) +### Energy Web Chain (EWC)
@@ -116,7 +116,7 @@ This is the chain for [Energy Web Foundation](https://www.energyweb.org/). **Bridge.** To bridge assets between Ethereum Mainnet and Energy Web Chain and Ethereum mainnet, you can use [Carbonswap bridge](https://bridge.carbonswap.exchange/). -### Production: Optimism (OP) Mainnet +### Optimism (OP) Mainnet
@@ -130,7 +130,7 @@ This is the chain for [Energy Web Foundation](https://www.energyweb.org/). **Bridge.** Follow the [OP Bridge guide](https://https://app.optimism.io/bridge/deposit) to deposit, withdraw and send tokens. -### Production: Moonriver +### Moonriver
@@ -152,7 +152,7 @@ This is the chain for [Energy Web Foundation](https://www.energyweb.org/). Unlike production networks, tokens on test networks do not hold real economic value. -### Testnet: Görli +### Görli
@@ -166,7 +166,7 @@ Unlike production networks, tokens on test networks do not hold real economic va **Wallet.** To connect with e.g. MetaMask, click on the network name dropdown and select _Goerli_ from the list of available networks. -### Testnet: Sepolia +### Sepolia
@@ -181,7 +181,7 @@ Unlike production networks, tokens on test networks do not hold real economic va **Wallet.** To connect with e.g. MetaMask, select "Sepolia" from the network dropdown list(enable "Show test networks"). -### Testnet: Mumbai +### Mumbai
@@ -196,7 +196,7 @@ Unlike production networks, tokens on test networks do not hold real economic va **Wallet.** To connect with e.g. MetaMask, select "Görli" from the network dropdown list. If it's not listed as a predefined network, follow [Polygon's guide](https://wiki.polygon.technology/docs/develop/metamask/config-polygon-on-metamask/). -### Testnet: Oasis Sapphire Testnet +### Oasis Sapphire Testnet [Ocean Predictoor](../predictoor/README.md) is deployed on Oasis Sapphire testnet. This deployment does do not currently support ocean.js, ocean.py, or Ocean Market. @@ -214,7 +214,7 @@ Unlike production networks, tokens on test networks do not hold real economic va **Wallet.** If you cannot find Oasis Sapphire Testnet as a predefined network, you can manually connect to it by entering the following during import: Network Name: `Oasis Sapphire Testnet`, RPC URL: `https://testnet.sapphire.oasis.dev`, Chain ID: `23295`, Token: `ROSE`. For further info, see [Oasis tokens docs](https://docs.oasis.io/general/manage-tokens/). -### Testnet: Optimism (OP) Sepolia +### Optimism (OP) Sepolia
diff --git a/discover/ocean-token.md b/discover/ocean-token.md index 8e71bae6..04ec3fcc 100644 --- a/discover/ocean-token.md +++ b/discover/ocean-token.md @@ -32,7 +32,7 @@ Total # tokens: 1.41B. All tokens are minted; all control is [revoked](https://b OCEAN supply is divided as follows: -- 51% (719.1M OCEAN) - to Data Farming and incentives programs. Distributed via vesting: burn-in period then 4-year half-life. For details, see section 5.1 "OCEAN Emissions Schedule" of [Data Farming Main](https://blog.oceanprotocol.com/ocean-data-farming-main-is-here-49c99602419e#5a8f). +- 51% (719.1M OCEAN) - to Data Farming and incentives programs. Distributed via vesting: burn-in period then 4-year half-life. For [Data Farming: Reward Schedule](../data-farming/reward-schedule.md) docs. - 15% (211.5M OCEAN) - to Ocean community (grants, more) and foundation operations. - 10% (141.0M OCEAN) - to the founding company, and in turn to its investors, employees & operations - 24% (338.4M OCEAN) - to token acquirors. This completed in early 2019. All acquiror vesting is complete as well. @@ -47,85 +47,11 @@ In the design, a % of revenue is used to buy back & burn OCEAN. The remaining %
- -## OCEAN addresses +## OCEAN on Networks The "root" OCEAN token is deployed on Ethereum mainnet with address [`0x967da4048cd07ab37855c090aaf366e4ce1b9f48`](https://etherscan.io/token/0x967da4048cd07ab37855c090aaf366e4ce1b9f48). -The OCEAN token has bridges to several [other chains](networks/README.md). It has a unique address on each chain. - -
- -OCEAN address per chain: (expand me) - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Network nameContract AddressSymbolDecimals
Mainnet0x967da4048cD07aB37855c090aAF366e4ce1b9F48OCEAN18
Polygon
(ex Matic)		0x282d8efCe846A88B159800bd4130ad77443Fa1A1mOCEAN18
BNB
BNB Smart Chain		0xdce07662ca8ebc241316a15b611c89711414dd1aOCEAN18
Oasis Sapphire0x39d22B78A7651A76Ffbde2aaAB5FD92666Aca520OCEAN18
Optimism0xf26c6c93f9f1d725e149d95f8e7b2334a406ad10OCEAN18
Görli0xCfDdA22C9837aE76E0faA845354f33C62E03653aOCEAN18
Mumbai0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8OCEAN18
Sepolia0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985OCEAN18
Oasis Sapphire Testnet0x973e69303259B0c2543a38665122b773D28405fBOCEAN18
- - +The OCEAN token has bridges to several other chains. The [Networks docs](networks/README.md) give the address of OCEAN on each network, and how to get OCEAN on each of those networks. ---- diff --git a/user-guides/wallets/wallets-and-ocean.md b/user-guides/wallets/wallets-and-ocean.md index b082399b..1d035e75 100644 --- a/user-guides/wallets/wallets-and-ocean.md +++ b/user-guides/wallets/wallets-and-ocean.md @@ -9,7 +9,7 @@ description: >- If you don't see any OCEAN in your crypto wallet software 🔎 (e.g. MetaMask or MyEtherWallet), don't worry! It might not know how to manage OCEAN yet. For an ERC-20 wallet to see OCEAN, the wallet typically needs to have OCEAN's address added as a custom token. -- The [OCEAN docs page](../discover/ocean-token.md) has the OCEAN address for each network. +- The [Networks docs](../discover/networks/README.md) give the address of OCEAN on each network, and how to get OCEAN on each of those networks. - Then, use that information for the wallet instructions below.