From 51eb86a5ea81eece4441d11745cb0ae8d9e40a79 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Wed, 12 Jun 2019 13:36:56 +0200 Subject: [PATCH 1/3] Change instances of 'the ocean (protocol) network' --- content/concepts/components.md | 4 ++-- content/concepts/contributing.md | 2 +- content/concepts/ocean-tokens.md | 3 --- content/concepts/production-network.md | 4 ++-- content/concepts/resources.md | 2 +- content/concepts/terminology.md | 14 +++++++++++--- src/components/Repositories/index.jsx | 2 +- 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/content/concepts/components.md b/content/concepts/components.md index ea4a73a7..3d325e9e 100644 --- a/content/concepts/components.md +++ b/content/concepts/components.md @@ -1,13 +1,13 @@ --- title: Software Components -description: The Ocean Protocol network is brought to life by many interacting symbiotic software components. +description: Every Ocean network is brought to life by many interacting symbiotic software components. --- Before reading this page, you should understand some [Ocean-specific terminology](/concepts/terminology/). ## Keeper -A computer running a blockchain client +A computer running an EVM-compatible blockchain client (such as [Parity Ethereum](https://www.parity.io/ethereum/)) where the associated blockchain network is running the Ocean Protocol [keeper-contracts](https://github.com/oceanprotocol/keeper-contracts) diff --git a/content/concepts/contributing.md b/content/concepts/contributing.md index 6f9adea6..dc96a413 100644 --- a/content/concepts/contributing.md +++ b/content/concepts/contributing.md @@ -29,7 +29,7 @@ To suggest a change to the Ocean Protocol itself (which is actually a set of pro You could write articles or blog posts related to Ocean Protocol. Possible topics include: -- a story about how you used Ocean Protocol or the Ocean network +- a story about how you used Ocean Protocol or an Ocean network - news from a recent event - tutorials for beginners - a deep dive into some specific aspect of Ocean Protocol diff --git a/content/concepts/ocean-tokens.md b/content/concepts/ocean-tokens.md index a7615910..89bc540c 100644 --- a/content/concepts/ocean-tokens.md +++ b/content/concepts/ocean-tokens.md @@ -67,8 +67,6 @@ At the time of writing, you could use Ethereum Mainnet Ocean Tokens to do variou - buy other cryptocurrencies. See the next subsection for more details. - stake in [dxDAO](https://dxdao.daostack.io/). -Moreover, in the near future, there are plans to make it possible to use Ethereum Mainnet Ocean Tokens for Ocean Protocol tasks in the Ethereum Mainnet. That includes asset and service acquisition, via Ocean Protocol marketplaces attached to the Ethereum Mainnet. - ### How to Buy or Sell Ethereum Mainnet Ocean Tokens You can buy or sell Ethereum Mainnet Ocean Tokens via any exchange that lists them. See the official list of exchanges below. @@ -92,7 +90,6 @@ At some point after the Ocean Production Network is launched, it will become pos ## 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 Protocol Technical Whitepaper](https://oceanprotocol.com/tech-whitepaper.pdf) diff --git a/content/concepts/production-network.md b/content/concepts/production-network.md index 52422bc1..c299a349 100644 --- a/content/concepts/production-network.md +++ b/content/concepts/production-network.md @@ -5,7 +5,7 @@ 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: +Ocean Protocol makes use of several EVM-compatible networks, including: - the Ethereum Mainnet (also called the Main Ethereum Network), - various [testnets](/concepts/testnets/), and @@ -21,4 +21,4 @@ The Ocean Production Network will be an EVM network of nodes ("keepers") running "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/). +[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/resources.md b/content/concepts/resources.md index de0ff793..9f27d908 100644 --- a/content/concepts/resources.md +++ b/content/concepts/resources.md @@ -13,7 +13,7 @@ All papers can be retrieved from the [Papers section](https://oceanprotocol.com/ ## Roadmap -[Ocean Protocol roadmap](https://oceanprotocol.com/protocol/#roadmap) outlining our plans and achievements in creating the Ocean Protocol network and building a community and ecosystem around it. +[Ocean Protocol roadmap](https://oceanprotocol.com/protocol/#roadmap) outlining our plans and achievements in creating Ocean Protocol and building a community and ecosystem around it. ## Blog diff --git a/content/concepts/terminology.md b/content/concepts/terminology.md index 1a9fd33c..f7899a83 100644 --- a/content/concepts/terminology.md +++ b/content/concepts/terminology.md @@ -3,9 +3,17 @@ title: Terminology description: Terminology specific to Ocean Protocol. --- +## Ocean Network + +Any EVM-compatible network where all* 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/). + +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. + +\* The "Dispenser" smart contract should only be deployed to testnets. + ## Asset or Data Asset -Anything that can be registered with and made available via the Ocean Network. Examples include data sets, trained model parameters, pipelines, and data-cleaning services. +Anything that can be registered with and made available via an Ocean Network. Examples include data sets, trained model parameters, pipelines, and data-cleaning services. ## Data Owner or Data Service Provider @@ -25,7 +33,7 @@ Someone who wants assets. An example is a data scientist working at an economic ## Marketplace -A service where publishers can list what assets they have, and consumers can see what's available then buy it (or get it for free). Every marketplace has a database where they store metadata about the assets they know about (but not the assets themselves). The Ocean network supports many marketplaces. +A service where publishers can list what assets they have, and consumers can see what's available then buy it (or get it for free). Every marketplace has a database where they store metadata about the assets they know about (but not the assets themselves). An Ocean network can support many marketplaces. ## Verifier @@ -35,7 +43,7 @@ A person or a software service that checks some steps in transactions. For examp A contract-like agreement between a publisher, a consumer, and a verifier, specifying what assets are to be delivered (from publisher to consumer), the conditions that must be met, and the rewards for fulfilling the conditions. -We published an [Ocean Protocol blog post that explains SEAs in more detail](https://blog.oceanprotocol.com/exploring-the-sea-service-execution-agreements-65f7523d85e2). [OEP-11](https://github.com/oceanprotocol/OEPs/tree/master/11) is a technical specification of how SEAs mediate access control. +We published an [Ocean Protocol blog post that explains SEAs in more detail](https://blog.oceanprotocol.com/exploring-the-sea-service-execution-agreements-65f7523d85e2). ## More Terminology diff --git a/src/components/Repositories/index.jsx b/src/components/Repositories/index.jsx index d52881d5..8bba2f6b 100644 --- a/src/components/Repositories/index.jsx +++ b/src/components/Repositories/index.jsx @@ -46,7 +46,7 @@ const Repositories = () => ( software components {' '} document for an introduction to the components - creating the Ocean network. + found in a typical Ocean network.

From 3fd0ec57d509ca6c0800ae23a2c13a13524f699f Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Wed, 12 Jun 2019 13:38:58 +0200 Subject: [PATCH 2/3] npm run format --- content/concepts/terminology.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/concepts/terminology.md b/content/concepts/terminology.md index f7899a83..48444433 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* 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\* 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/). 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. From 5600315eb0c56d5cd150f40ede2aea1e2b51bffb Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Wed, 12 Jun 2019 14:42:38 +0200 Subject: [PATCH 3/3] Use Markdown footnote syntax instead --- content/concepts/terminology.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/concepts/terminology.md b/content/concepts/terminology.md index 48444433..e03e42d6 100644 --- a/content/concepts/terminology.md +++ b/content/concepts/terminology.md @@ -5,12 +5,10 @@ description: Terminology specific to Ocean Protocol. ## Ocean Network -Any EVM-compatible network where all\* 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 Ocean Production Network](/concepts/production-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. -\* The "Dispenser" smart contract should only be deployed to testnets. - ## Asset or Data Asset Anything that can be registered with and made available via an Ocean Network. Examples include data sets, trained model parameters, pipelines, and data-cleaning services. @@ -49,3 +47,5 @@ We published an [Ocean Protocol blog post that explains SEAs in more detail](htt - See [the page about Ocean's Software Components](/concepts/components/). - See [the page about wallets (and other Ethereum terminology)](/concepts/wallets/). + +[^1]: The "Dispenser" smart contract should only be deployed to testnets.