From e69b300b2f75faf4f9aac44a4d890d2d5d58432e Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Wed, 28 Sep 2022 09:45:54 +0300 Subject: [PATCH 01/12] Added Goerli Test Network --- core-concepts/networks.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/core-concepts/networks.md b/core-concepts/networks.md index bb5eafbe..6c97a601 100644 --- a/core-concepts/networks.md +++ b/core-concepts/networks.md @@ -183,6 +183,30 @@ In MetaMask and other ERC20 wallets, click on the network name dropdown, then se | Provider | `https://v4.provider.rinkeby.oceanprotocol.com` | | Subgraph | `https://v4.subgraph.rinkeby.oceanprotocol.com` | +### Goerli + +Goerli is a test network. + +In MetaMask and other ERC20 wallets, click on the network name dropdown, then select _Görli_. + +**Tokens** + +* Goerli ETH: + * Native token to pay transaction fees + * [Faucet](https://goerlifaucet.com/). You may find others by [searching](https://www.google.com/search?q=goerli+ether+faucet%5C&oq=goerli+ether+faucet). +* Goerli OCEAN: + * Address: [0xCfDdA22C9837aE76E0faA845354f33C62E03653a](https://goerli.etherscan.io/address/0xcfdda22c9837ae76e0faa845354f33c62e03653a) + * [Faucet](https://faucet.goerli.oceanprotocol.com) + +**Additional Components** + +| What | URL | +| ------------ | -------------------------------------------------------------------- | +| Explorer | https://goerli.etherscan.io/ | +| Ocean Market | Point wallet to Görli network, at https://market.oceanprotocol.com | +| Provider | `https://v4.provider.goerli.oceanprotocol.com` | +| Subgraph | `https://v4.subgraph.goerli.oceanprotocol.com` | + ### Mumbai Mumbai is a test network tuned for Matic / Polygon. From 8e0918f5913b17e9ff32882ea288f6465823dcfd Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Wed, 28 Sep 2022 09:49:36 +0300 Subject: [PATCH 02/12] Minor change on the name --- core-concepts/networks.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core-concepts/networks.md b/core-concepts/networks.md index 6c97a601..0fcd0eba 100644 --- a/core-concepts/networks.md +++ b/core-concepts/networks.md @@ -183,15 +183,15 @@ In MetaMask and other ERC20 wallets, click on the network name dropdown, then se | Provider | `https://v4.provider.rinkeby.oceanprotocol.com` | | Subgraph | `https://v4.subgraph.rinkeby.oceanprotocol.com` | -### Goerli +### Görli -Goerli is a test network. +Görli is a test network. In MetaMask and other ERC20 wallets, click on the network name dropdown, then select _Görli_. **Tokens** -* Goerli ETH: +* Görli ETH: * Native token to pay transaction fees * [Faucet](https://goerlifaucet.com/). You may find others by [searching](https://www.google.com/search?q=goerli+ether+faucet%5C&oq=goerli+ether+faucet). * Goerli OCEAN: From 7c19bdf75690a92a7dac924e58aff593b43355e7 Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Wed, 28 Sep 2022 09:53:22 +0300 Subject: [PATCH 03/12] Added goerli inside the tokens list --- building-with-ocean/wallets-and-ocean-tokens.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/building-with-ocean/wallets-and-ocean-tokens.md b/building-with-ocean/wallets-and-ocean-tokens.md index d64e1e61..1c7db689 100644 --- a/building-with-ocean/wallets-and-ocean-tokens.md +++ b/building-with-ocean/wallets-and-ocean-tokens.md @@ -42,6 +42,12 @@ Almost all ERC-20 wallets require these values for adding a custom token: * Symbol: `OCEAN` * Decimals: `18` +**Görli** + +* Contract Address: `0xCfDdA22C9837aE76E0faA845354f33C62E03653a` +* Symbol: `OCEAN` +* Decimals: `18` + **Mumbai** * Contract Address: `0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8` From d60f0b7fbe01fa8fd017b6b053d9d4f338340117 Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Wed, 28 Sep 2022 10:17:35 +0300 Subject: [PATCH 04/12] Changed 'Gorli' label name shown in metamask --- core-concepts/networks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-concepts/networks.md b/core-concepts/networks.md index 0fcd0eba..3239dbd4 100644 --- a/core-concepts/networks.md +++ b/core-concepts/networks.md @@ -187,7 +187,7 @@ In MetaMask and other ERC20 wallets, click on the network name dropdown, then se Görli is a test network. -In MetaMask and other ERC20 wallets, click on the network name dropdown, then select _Görli_. +In MetaMask and other ERC20 wallets, click on the network name dropdown, then select _Goerli_. **Tokens** From 211eb66033f4634145052219fb36b0289098a497 Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Wed, 28 Sep 2022 12:03:46 +0300 Subject: [PATCH 05/12] Added Goerli subgraph --- building-with-ocean/using-ocean-subgraph/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/building-with-ocean/using-ocean-subgraph/README.md b/building-with-ocean/using-ocean-subgraph/README.md index 80541fb4..95f93d1a 100644 --- a/building-with-ocean/using-ocean-subgraph/README.md +++ b/building-with-ocean/using-ocean-subgraph/README.md @@ -20,4 +20,5 @@ The below table provides the link to GraphiQL for the support networks. The Grap | [Mumbai](https://v4.subgraph.mumbai.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql) | | [Rinkeby](https://v4.subgraph.rinkeby.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql) | | [Ropsten](https://v4.subgraph.ropsten.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql) | +| [Görli](https://v4.subgraph.goerli.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql) | | [Moonbase](https://v4.subgraph.moonbase.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql) | From bcab2570fa5c0fc2c7c92048752a3f734de01a68 Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Thu, 29 Sep 2022 11:31:42 +0300 Subject: [PATCH 06/12] Fixed Polygon & BSC bridges broken links --- core-concepts/networks.md | 4 ++-- core-concepts/networks/bridges.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core-concepts/networks.md b/core-concepts/networks.md index bb5eafbe..423b82a1 100644 --- a/core-concepts/networks.md +++ b/core-concepts/networks.md @@ -55,7 +55,7 @@ Ocean is deployed to Polygon Mainnet, another production network. Polygon’s na **Bridge** -Check our Polygon Bridge [guide](broken-reference) to learn how you can deposit, withdraw and send tokens. +Check our Polygon Bridge [guide](networks/bridges/#polygon-ex-matic-bridge) to learn how you can deposit, withdraw and send tokens. ### Binance Smart Chain @@ -81,7 +81,7 @@ If you don’t find BSC as a predefined network in your wallet, you can connect **Bridge** -Check our BSC Bridge [guide](broken-reference) to learn how you can deposit, withdraw and send tokens. +Check our BSC Bridge [guide](networks/bridges/#binance-smart-chain-bsc-bridge) to learn how you can deposit, withdraw and send tokens. ### Energy Web Chain diff --git a/core-concepts/networks/bridges.md b/core-concepts/networks/bridges.md index e14c469c..eea33173 100644 --- a/core-concepts/networks/bridges.md +++ b/core-concepts/networks/bridges.md @@ -23,13 +23,13 @@ The article [How to Get Started with BSC](https://academy.binance.com/en/article ### Links -* [Matic Wallet](https://wallet.matic.network) -* [Matic Bridge](https://wallet.matic.network/bridge) +* [Matic Wallet](https://wallet.polygon.technology/) +* [Matic Bridge](https://wallet.polygon.technology/bridge/) * [How to set up a custom network in MetaMask](../orientation/metamask-setup.md#set-up-custom-network) ### Intro to Polygon's Bridge -The Polygon Network (ex Matic) provide us with a bridge (connecting Ethereum & Polygon blockchains), and a dedicated [wallet](https://wallet.matic.network) that simplify the steps of transferring digital assets between the two networks. The wallet connects to your account via Metamask (or any of the other supported wallets). +The Polygon Network (ex Matic) provide us with a bridge (connecting Ethereum & Polygon blockchains), and a dedicated [wallet](https://wallet.polygon.technology/) that simplify the steps of transferring digital assets between the two networks. The wallet connects to your account via Metamask (or any of the other supported wallets). When you open the wallet link, the wallet will ask to log in. Select your preferred way of connecting and confirm the action. In our guide we'll use Metamask. From 2a51f9777b0e7af50f3883a1f935aa0a792e37b6 Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Thu, 29 Sep 2022 11:36:23 +0300 Subject: [PATCH 07/12] Fixed other broken links --- building-with-ocean/build-a-marketplace/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/building-with-ocean/build-a-marketplace/README.md b/building-with-ocean/build-a-marketplace/README.md index 82697e50..62af90a7 100644 --- a/building-with-ocean/build-a-marketplace/README.md +++ b/building-with-ocean/build-a-marketplace/README.md @@ -30,10 +30,10 @@ The tutorial covers: If you’re completely unfamiliar with Ocean Market or web3 applications in general, you will benefit from reading these guides first: -* To use your clone of Ocean Market, you’ll need a [wallet](https://docs.oceanprotocol.com/tutorials/wallets/). We recommend [getting set up with metamask](https://docs.oceanprotocol.com/tutorials/metamask-setup/). -* You’ll also need some [Ocean tokens on a testnet](https://docs.oceanprotocol.com/tutorials/wallets-and-ocean-tokens/) to use your marketplace. -* When you have the testnet tokens, have a go at [publishing a data asset](https://docs.oceanprotocol.com/tutorials/marketplace-publish-data-asset/) on Ocean Market. -* Run through the process of [consuming a data asset](https://docs.oceanprotocol.com/tutorials/marketplace-consume-data-asset/) on Ocean Market. +* To use your clone of Ocean Market, you’ll need a [wallet](../wallets.md). We recommend [getting set up with metamask](../../orientation/metamask-setup.md). +* You’ll also need some [Ocean tokens on a testnet](../wallets-and-ocean-tokens.md) to use your marketplace. +* When you have the testnet tokens, have a go at [publishing a data asset](../../using-ocean-market/marketplace-publish-data-asset.md) on Ocean Market. +* Run through the process of [consuming a data asset](../../using-ocean-market/marketplace-download-data-asset.md) on Ocean Market. **Required Prerequisites** From c3c5ab40b6e5c524b96a098ef49639b072abdc28 Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Thu, 29 Sep 2022 11:47:58 +0300 Subject: [PATCH 08/12] Fixed more broken links --- using-ocean-market/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/using-ocean-market/README.md b/using-ocean-market/README.md index b7e87b33..95ad46fd 100644 --- a/using-ocean-market/README.md +++ b/using-ocean-market/README.md @@ -9,15 +9,15 @@ The following guides will help you get started with buying and selling data: -* [Publish a data asset](using-ocean-market/marketplace-publish-data-asset.md) -* [Download a data asset](using-ocean-market/marketplace-download-data-asset.md) -* [Publishing with hosting services](building-with-ocean/asset-hosting.md) +* [Publish a data asset](marketplace-publish-data-asset.md) +* [Download a data asset](marketplace-download-data-asset.md) +* [Publishing with hosting services](../building-with-ocean/asset-hosting.md) If you are new to web3 and blockchain technologies then we suggest you first read these introductory guides: -* [Wallet Basics](building-with-ocean/wallets.md) -* [Set Up MetaMask Wallet](orientation/metamask-setup.md) -* [Manage Your OCEAN Tokens](building-with-ocean/wallets-and-ocean-tokens.md) +* [Wallet Basics](../building-with-ocean/wallets.md) +* [Set Up MetaMask Wallet](../orientation/metamask-setup.md) +* [Manage Your OCEAN Tokens](../building-with-ocean/wallets-and-ocean-tokens.md) ### Removing Liquidity From 45a5ebdac254893df1e40218d9f4c800cbc65e9f Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Thu, 29 Sep 2022 12:06:43 +0300 Subject: [PATCH 09/12] Fix the bridges broken links --- core-concepts/networks.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-concepts/networks.md b/core-concepts/networks.md index 423b82a1..1b468b4d 100644 --- a/core-concepts/networks.md +++ b/core-concepts/networks.md @@ -55,7 +55,7 @@ Ocean is deployed to Polygon Mainnet, another production network. Polygon’s na **Bridge** -Check our Polygon Bridge [guide](networks/bridges/#polygon-ex-matic-bridge) to learn how you can deposit, withdraw and send tokens. +Check our Polygon Bridge [guide](networks/bridges) to learn how you can deposit, withdraw and send tokens. ### Binance Smart Chain @@ -81,7 +81,7 @@ If you don’t find BSC as a predefined network in your wallet, you can connect **Bridge** -Check our BSC Bridge [guide](networks/bridges/#binance-smart-chain-bsc-bridge) to learn how you can deposit, withdraw and send tokens. +Check our BSC Bridge [guide](networks/bridges) to learn how you can deposit, withdraw and send tokens. ### Energy Web Chain From b1f2656d5943e9ced53c1dc6aa5f37d2c51aff7b Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Thu, 29 Sep 2022 12:11:12 +0300 Subject: [PATCH 10/12] Fix links --- core-concepts/networks.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-concepts/networks.md b/core-concepts/networks.md index 1b468b4d..85155e64 100644 --- a/core-concepts/networks.md +++ b/core-concepts/networks.md @@ -55,7 +55,7 @@ Ocean is deployed to Polygon Mainnet, another production network. Polygon’s na **Bridge** -Check our Polygon Bridge [guide](networks/bridges) to learn how you can deposit, withdraw and send tokens. +Check our Polygon Bridge [guide](../core-concepts/networks/bridges.md) to learn how you can deposit, withdraw and send tokens. ### Binance Smart Chain @@ -81,7 +81,7 @@ If you don’t find BSC as a predefined network in your wallet, you can connect **Bridge** -Check our BSC Bridge [guide](networks/bridges) to learn how you can deposit, withdraw and send tokens. +Check our BSC Bridge [guide](../core-concepts/networks/bridges.md) to learn how you can deposit, withdraw and send tokens. ### Energy Web Chain From 4d63d0b79f6837114ab1b01a22dea910c5947ec6 Mon Sep 17 00:00:00 2001 From: Anamaria Loznianu Date: Thu, 29 Sep 2022 12:17:18 +0300 Subject: [PATCH 11/12] Fix more broken links --- core-concepts/networks.md | 4 ++-- core-concepts/networks/bridges.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core-concepts/networks.md b/core-concepts/networks.md index 85155e64..f09459c6 100644 --- a/core-concepts/networks.md +++ b/core-concepts/networks.md @@ -55,7 +55,7 @@ Ocean is deployed to Polygon Mainnet, another production network. Polygon’s na **Bridge** -Check our Polygon Bridge [guide](../core-concepts/networks/bridges.md) to learn how you can deposit, withdraw and send tokens. +Check our Polygon Bridge [guide](../core-concepts/networks/bridges.md#polygon-ex-matic-bridge) to learn how you can deposit, withdraw and send tokens. ### Binance Smart Chain @@ -81,7 +81,7 @@ If you don’t find BSC as a predefined network in your wallet, you can connect **Bridge** -Check our BSC Bridge [guide](../core-concepts/networks/bridges.md) to learn how you can deposit, withdraw and send tokens. +Check our BSC Bridge [guide](../core-concepts/networks/bridges.md#binance-smart-chain-bsc-bridge) to learn how you can deposit, withdraw and send tokens. ### Energy Web Chain diff --git a/core-concepts/networks/bridges.md b/core-concepts/networks/bridges.md index eea33173..ab391857 100644 --- a/core-concepts/networks/bridges.md +++ b/core-concepts/networks/bridges.md @@ -17,7 +17,7 @@ The article [How to Get Started with BSC](https://academy.binance.com/en/article * [BSC Wallet Support](https://docs.binance.org/wallets/bsc-wallets.html). Includes MetaMask and Trust Wallet. * [BSC Bridge](https://www.bnbchain.org/en/bridge) -* [How to set up a custom network in MetaMask](../orientation/metamask-setup.md#set-up-custom-network) +* [How to set up a custom network in MetaMask](../../orientation/metamask-setup.md#set-up-custom-network) # Polygon (ex Matic) Bridge @@ -25,7 +25,7 @@ The article [How to Get Started with BSC](https://academy.binance.com/en/article * [Matic Wallet](https://wallet.polygon.technology/) * [Matic Bridge](https://wallet.polygon.technology/bridge/) -* [How to set up a custom network in MetaMask](../orientation/metamask-setup.md#set-up-custom-network) +* [How to set up a custom network in MetaMask](../../orientation/metamask-setup.md#set-up-custom-network) ### Intro to Polygon's Bridge From 736b28169704014fa2251a414d7d8479df8d5677 Mon Sep 17 00:00:00 2001 From: Jamie Hewitt Date: Thu, 29 Sep 2022 13:52:29 +0300 Subject: [PATCH 12/12] Mentioning Goerli instead of Ropsten in ./building-with-ocean/wallets.md --- building-with-ocean/wallets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/building-with-ocean/wallets.md b/building-with-ocean/wallets.md index 846cc370..3a2367d8 100644 --- a/building-with-ocean/wallets.md +++ b/building-with-ocean/wallets.md @@ -24,7 +24,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 Ropsten testnet. You can move ETH from one network to another only with a specially setup exchange or bridge. Also, you can't transfer tokens from networks holding value such as Ethereum mainnet to networks not holding value, i.e., testnets like Ropsten. 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 Görli testnet. You can move ETH from one network to another only with a specially setup exchange or bridge. Also, you can't transfer tokens from networks holding value such as Ethereum mainnet to networks not holding value, i.e., testnets like Görli. The same is true of OCEAN token balances. Each account has one **private key** and one **address**. The address can be calculated from the private key. You must keep the private key secret because it's what's needed to spend/transfer ETH and OCEAN (or to sign transactions of any kind). You can share the address with others. In fact, if you want someone to send some ETH or OCEAN to an account, you give them the account's address.