Fix #1356: DF: simplify structure (PR #1361)

Also fixes #1353 Puts in placeholder for #1289
2024-11-26 19:49:26 +01:00 · 2023-11-06 13:21:40 +01:00 · 2023-11-06 13:21:40 +01:00 · 86aa975634
commit 86aa975634
parent b630737460 3e5a0ff54a
31 changed files with 724 additions and 793 deletions
--- a/.gitbook/assets/data-farming/df-reward-streams.png
+++ b/.gitbook/assets/data-farming/df-reward-streams.png
--- a/.gitbook/assets/gif/passive-income.gif
+++ b/.gitbook/assets/gif/passive-income.gif
--- a/.gitbook/assets/gif/school-of-fish.gif
+++ b/.gitbook/assets/gif/school-of-fish.gif
--- a/.gitbook/assets/gif/school-of-fish2.gif
+++ b/.gitbook/assets/gif/school-of-fish2.gif
--- a/.gitbook/assets/gif/swimming-pool.gif
+++ b/.gitbook/assets/gif/swimming-pool.gif
--- a/SUMMARY.md
+++ b/SUMMARY.md
@ -114,19 +114,22 @@
  * [How to Earn](predictoor/pdr-earn.md)  
  * [Predictoor FAQ](predictoor/pdr-faq.md)
 * [💰 Data Farming](data-farming/README.md)
-  * [Data Farming 101](data-farming/df-intro.md)
+  * [Passive DF (and veOCEAN)](data-farming/passivedf.md)
-  * [veOCEAN](data-farming/df-veocean.md)
+    * [Guide to Passive DF](data-farming/passivedf-guide.md)
-  * [Curate with Volume DF](data-farming/df-volumedf.md)
+    * [Liquid Staking](data-farming/liquid-staking.md)
-  * [Predict with Challenge DF](data-farming/df-challengedf.md)
+  * [Volume DF](data-farming/volumedf.md)
-  * [Emissions & APYs](data-farming/df-emissions-apys.md)
+    * [Guide to Volume DF](data-farming/volumedf-guide.md)
-  * [📖 DF User Guides](data-farming/user-guides/README.md)
+    * [Delegation in Volume DF](data-farming/delegate.md)
-    * [Guide: Passive DF](data-farming/user-guides/how-to-veocean.md)
+  * [Challenge DF](data-farming/challengedf.md)
-    * [Guide: Volume DF](data-farming/user-guides/how-to-volumedf.md)
+    * [Guide to Challenge DF](data-farming/challengedf-guide.md)
-    * [Guide: Volume DF Delegation](data-farming/user-guides/how-to-delegate.md)
+  * [Predictoor DF](data-farming/predictoordf.md)
-    * [Guide: Challenge DF](data-farming/user-guides/how-to-challengedf.md)
+    * [Guide to Predictoor DF](data-farming/predictoordf-guide.md)
-    * [Guide: Claim Rewards](data-farming/user-guides/how-to-claim-rewards.md)
+  * [Claim Rewards](data-farming/claim-rewards.md)
-    * [Guide: Estimate APYs](data-farming/user-guides/how-to-estimate-apy.md)
+  * [Reward Schedule](data-farming/reward-schedule.md)
-  * [veOCEAN & DF FAQ](data-farming/df-faq.md)
+  * [APYs](data-farming/apys.md)
    * [Estimated APY vs Time](data-farming/apys-plot.md)
    * [Guide to Estimating APY](data-farming/apys-guide.md)
  * [FAQ](data-farming/faq.md)
 * [🔨 Infrastructure](infrastructure/README.md)
  * [Set Up a Server](infrastructure/setup-server.md)
  * [Deploy a Marketplace](infrastructure/deploying-marketplace.md)
--- a/data-farming/README.md
+++ b/data-farming/README.md
@ -1,95 +1,56 @@
 ---
-description: Learn how to earn OCEAN rewards via Data Farming
+description: Earn OCEAN rewards by locking OCEAN, curating data, and making predictions.
 cover: ../.gitbook/assets/cover/data_farming_banner.png
 coverY: 0
 ---
-## What is Data Farming?
+# What is Data Farming?
-Data Farming is Ocean Protocol's core incentive program that rewards participants to onboard the protocol and create value by using tools that help grow it further.  
+**Data Farming (DF) is Ocean's incentive program.** It rewards OCEAN to participants who lock OCEAN into veOCEAN, curate data, or make predictions -- all in the name of driving **data consume volume** (DCV). DF is a bit like DeFi liquidity mining, but tuned for DCV.
-Data Farming participants earn OCEAN rewards across 2 main streams **Passive Rewards** and **Active Rewards**. Participants are able to **receive rewards passively, actively, or both** by engaging in a variety of activities.  
+**[The DF webapp](https://df.oceandao.org)** is where users perform most DF actions.
-Passive Rewards provides a way for all contributors to participate.  
+There is currently 150,000 OCEAN / week available for DF rewards. 
-Active Rewards focuses on incentivizing the curation and publishing of high-quality data assets and DataNFTs within the Ocean Ecosystem.  
+## DF Streams & Budgets
-We have used battle-tested contracts that safeguard billions (veCRV). With this model there is no liquidity risk. You can’t lose your OCEAN through Impermanent-Loss (IL). It is merely locked.  
+DF is organized into two streams: Passive DF and Active DF. Each has 50% of the DF budget. Passive DF allows for passive earning potential. Active DF requires more engagement; it has several substreams, each with its own activity.
-## Introduction
+Here are all streams & substreams. The links lead to dedicated pages.
-[Farming 101](df-intro.md) introduces Data Farming, the various reward systems, how they work, and how to access them. By the end of the document, you should feel more familiar with Data Farming concepts and having a better idea of what subject you might want to learn about next.  
+1. **[Passive DF](passivedf.md).** 75,000 OCEAN per week. Lock OCEAN for **veOCEAN**; rewards are pro-rata to veOCEAN holdings.
 1. **Active DF.** 75,000 OCEAN per week. It has these substreams:
   1. **[Volume DF](volumedf.md).** Allocate veOCEAN towards data assets with high DCV, ie "curate data". Rewards are a function of DCV and veOCEAN stake.
   1. **[Challenge DF](challengedf.md).** Predict future ETH price, one-time weekly. Rewards are a function of accuracy. Runs from DF48 — DF65.
   1. **[Predictoor DF](predictoordf.md).** Run prediction bots to earn continuously. Starts on DF62.
-## User Guides
+All streams and substreams repeat **weekly** that start on Thursdays 00:00 at UTC and end on Wed at 23:59 UTC.
-If you are looking for step-by-step tutorials on how to access the Data Farming program and complete different actions, head over to the [Data Farming User Guides page](user-guides/README.md).  
+**[Claiming rewards](claim-rewards.md)**. You can claim rewards each Thursday, or wait and claim many weeks' of rewards at once.
-## veOCEAN
+Active DF's substreams can -- and do -- evolve over time. It's chronicled [here](https://blog.oceanprotocol.com/ocean-data-farming-series-c7922f1d0e45).
-Learning about [veOCEAN](df-veocean.md) will help you answer the question "What is the purpose of veOCEAN?" and give insights on how veOCEAN (vote-escrowed OCEAN) is used inside of Ocean Protocol to help advance the protocol.  
+## Reward Schedule & APYs
-It may help for you to review the user guide on [how to estimate APY](user-guides/how-to-estimate-apy.md) to get a better idea for how long you'll want to lock your funds.  
+**[Reward Schedule](reward-schedule.md)**. The 150,000 OCEAN / week currently available for DF rewards will increase over time to over 1.1M OCEAN / week.
-### Passive Rewards
+**[Yields](apys.md)**. Historically, APYs are 5-15%. APYs vary week to week. APY depends on total OCEAN staked, duration of OCEAN lock, DCV, what DF streams you participate in, and other factors.
-Passive Rewards is the first reward stream within Data Farming.  
+## Networks
-It's a fixed stream that focuses on incentivizing participants to easily onboard and help the protocol grow.
+OCEAN rewards for all DF streams & substreams are on Ethereum mainnet. One exception: rewards for Predictoor DF are on Oasis Sapphire.
-At a minimum, Data Farmers earn [Passive Rewards](df-intro.md#what-are-passive-rewards) for locking their OCEAN.  
+Users engage in different networks, depending on the DF stream:
 - Passive DF: veOCEAN is deployed on Ethereum mainet. Users lock OCEAN for veOCEAN on Ethereum mainnet
 - Volume DF: users can allocate veOCEAN to data assets on Etherum mainnet, Polygon, BSC, Moonriver, Energy Web Chain, or Sapphire.
 - Challenge DF: users submit predictions on Mumbai (Polygon testnet).
 - Predictoor DF: users submit predictions on Sapphire. 
-It is by-design, without the need for anyone to put in any significant effort. You simply need to lock your tokens for a period of time.
+The [networks docs](../discover/networks/README.md) have more info about networks.
-Passive Rewards offers a defined amount of rewards for each round that is divided amongst veOCEAN holders based on how much they hold.
+## Further resources
-Once your tokens are locked up, you can then learn [how to claim rewards](user-guides/how-to-claim-rewards.md).
+- The **[DF FAQ](faq.md)** answers more questions.
 - Main DF github repos: [df-py (backend)](https://github.com/oceanprotocol/df-py), [df-web (frontend)](https://github.com/oceanprotocol/df-web)
 - The [Ocean Data Farming Series](https://blog.oceanprotocol.com/ocean-data-farming-series-c7922f1d0e45) blog has a chronological account of all Data Farming activities since its inception. It links to related blog posts.
 ### Active Rewards
 Active Rewards is the second reward stream within Data Farming.  
 It's an evolving stream that focuses on driving fundamental traction and growth of the protocol.  
 For participants that are more engaged and want to increase their yield, the [Active Rewards](df-intro.md#what-are-active-rewards) stream is broken down into multiple substreams.  
 This offers contributors a variety of ways to help Ocean Protocol grow and increase your Data Farming rewards:
 1. Volume DF
 1. Challenge DF
 #### Curate Data with Volume DF
 If you have locked your OCEAN in exchange for veOCEAN, this is the ideal opportunity for you to utilize those veOCEAN to earn higher yield.
 You can learn about [the design of Volume DF](df-volumedf.md) to learn about it's substreams. Here, curators earn rewards for curating datasets that are driving sales and helping Ocean Protocol achieve traction.
 Once you're familiar with the concepts there, you can then read the following user guide on [how to participate in Volume DF](user-guides/how-to-volumedf.md).
 ## Delegate Curation
 The [Delegation](df-volumedf.md#delegating-voting-power) docs will teach you about the concepts of delegating your veOCEAN allocation power to another wallet that will manage Volume DF for you.
 You can then use the [how to delegate](user-guides/how-to-delegate.md) user guide to follow the steps needed to successfully delegate.
 Please note, once delegated, rewards will be sent to the wallet address you delegated to. The delegation receiver is in charge of managing your Allocation Power and cut from the rewards. 
 #### Predict with Challenge DF
 In this substream, Data Scientists can win competitions by participating in [Challenge DF](df-challengedf.md). You will obtain overview of what it is, how it works, the rules, and other details.
 Challenge DF requires participants to submit predictions as close to the price of ETH as possible in order to be in the top 3 participants to win rewards.
 The user guide on [how to Challenge DF](user-guides/how-to-challengedf.md) will take you step-by-step through the process of submitting your algorithm into the competition.
 ## Further Reading
 Finally, if you want to continue expanding your knowledge on OCEAN emissions, APY estimates, and get useful answers to some of the most common questions, you can read the following:
 [Emissions & APYs](df-emissions-apys.md) will provide you will information about how OCEAN will be released over time through the Data Farming program and provide you with APY studies.
 [Data Farming Background](df-emissions-apys.md#a-brief-history-of-data-farming) will provide you with a lot more information about Data Farming, how the program evolved, and explain detailed mechanisms of the program such as the Reward Function.
 The [FAQ](df-faq.md) answers many different questions about staking, chains, deployments, and other details that may be valuable to you.
 ## Reference
 All content within has been assembled via reference of the [Ocean Data Farming Series](https://blog.oceanprotocol.com/ocean-data-farming-series-c7922f1d0e45), official [Ocean Protocol github repositories](https://github.com/oceanprotocol/), and [Whitepapers](https://oceanprotocol.com/tech-whitepaper.pdf).
--- a/data-farming/apys-guide.md
+++ b/data-farming/apys-guide.md
@ -0,0 +1,75 @@
 ---
 description: >-
  From emissions, estimate APYs
 ---
 <figure><img src="../../.gitbook/assets/gif/mafs.gif" alt=""><figcaption><p>K.I.S.S.</p></figcaption></figure>
 # Guide to Estimating APYs
 This page provides guidance to estimate APYs.
 ### Estimating APY from WPYs
 Here are a couple ways to estimate APY: _with_ compounding, and without.
 **APY with compounding.** 
 - If you were to take OCEAN rewards for given week and immediately put them back into Data Farming, then your rewards will **compound** every week.
 - Then, `APY = (1.0 + WPY for week 1) * (1.0 + WPY for week 2) * ... * (1.0 WPY for week 52) - 1.0.
 - Assuming equal WPY per week, `APY = (1.0 + WPY)^52 - 1.0`. Use 52.25 not 52.0 if you wish.
 - For WPY of 0.005, then `APY = (1.0 + 0.005)^52 - 1.0 = 0.296 = 29.6%`.
 - This assumes zero gas fees. That's reasonable given that staking & claiming are one-time transactions.
 **APY without compounding.**
 - If you don't do compounding, then `APY = (WPY for week 1) + (WPY for week 2) + ... + (WPY for week 52)`.
 - Assuming equal WPY per week, `APY = WPY * 52`.
 - For WPY of 0.05, then `APY = 0.005 * 52 = 0.260 = 26.0%`.
 - This assumes zero gas fees. This works if you have a large amount of veOCEAN, and therefore large weekly OCEAN rewards, compared to gas fees. If that's not the case, so that gas fees don't destroy your profits, then you should (a) compound less often (b) use gas when it's cheapest, [see here](https://www.useweb3.xyz/gas).
 ### Estimating Passive DF APYs
 To make it easier to estimate your APY, [we have created a simple spreadsheet](https://docs.google.com/spreadsheets/d/1zzuW5pBbX6j6hZL_XtJDtSR2-rDHa_LGOEwgoQ4D8lk/edit?usp=sharing) that let's you easily estimate your Passive APY.
 We have provided 2 sheets as an example of locking-up 10,000 OCEAN for:
 1. A 4-year investment period
 2. A 6-mo investment period
 The above are simplified examples meant for everyone to understand. They are naive investment strategies and are meant to provide you, the reader, with some examples to build upon. You can use these as a reference to create your own plan, so feel free to make a copy of this spreadsheet and customize it to your needs and wants.
 ### Estimating Volume DF APYs
 APY from Volume DF is a bit more complicated and depend on many factors that are currently hard to predict accurately. It is unlikely for the user to get a practical result, which is why we don't offer a tool to estimate this value right now.
 You can easily expand the spreadsheet above to support a basic, naive calculations for Volume DF Rewards such as adding a fixed-rate.
 To help solve this challenge, [we built a dashboard](https://df.oceandao.org/volume-df) that shows historical and ongoing summaries of APY, Data Consume Volume, and veOCEAN allocations per-round.
 <figure><img src="../../.gitbook/assets/data-farming/curate-datasets.png" alt=""><figcaption><p>Curate like a Pro.</p></figcaption></figure>
 Finally, you can [review df-web code](https://github.com/oceanprotocol/df-web/blob/main/src/utils/rewards.js) to understand how the APYs on the UI are calculated.
 ### Estimating Challenge DF APYs
 Challenge DF requires no OCEAN locked or staked, yet provides rewards if you win the prediction game. Therefore theoretically APY is infinity. We ignore Challenge DF for APY discussion.
 ### Estimating Predictoor DF APYs
 **Predictoor and staking.** Staking is a fundamental component of Predictoor: when someone makes a prediction, they must have an OCEAN stake amount accompanying that prediction.
 Amount of stake increases potential gain and potential loss. For a given prediction, the more one stakes, the more they earn if they're right; and the more they lose if wrong. Earnings if right are also a function of Predictoor data feed sales revenue.
 Predictoor has staking independent of Data Farming. Therefore, yield comes even without DF. Then, _Predictoor DF_ acts as _extra_ sales revenue for Predictoor data feeds; and yield with Predictoor DF is even higher.
 **Yield for predictoors.** We can apply the yield formula for each prediction:
 `yield = (start amount + gained amount) / (start amount) - 1.0`
 Where in Predictoor and Predictoor DF, values are:
 - `start amount` = OCEAN staked in prediction
 - `gained amount` = `revenue * stake / (all users stake) - fee` if correct, `stake` if incorrect
 **Be careful!** Yield can be negative if one's stake far exceeds revenue, even with a highly accurate model. But, if one has right-sized stakes and an accurate model, then yield can be quite healthy.
 **Rapid compounding.** In other DF streams, rewards come weekly; so compounding is weekly. In Predictoor and Predictoor DF, a predictoor's revenue (rewards) come every epoch (every 5min or 1h). Therefore compounding in Predictoor could be _very_ fast, for much healthier yields yet.
 **Estimation fidelity.** Since Predictoor is so young, we don't have detailed estimates of Predictoor APYs yet. We're excited to see where this takes us:)
--- a/data-farming/apys-plot.md
+++ b/data-farming/apys-plot.md
@ -0,0 +1,33 @@
 ---
 description: >-
  Estimated APY vs time
 ---
 # Estimated APY vs Time
 The plot below shows estimated APY over time. It brings together data from the [OCEAN reward schedule](reward-schedule) and estimates of **amount staked (yellow line** in plot).
 **Green is total APY** from passive and active rewards.  **Passive rewards (black)** provides a great baseline with upside in **active rewards (green)**. For example, in DF29 wash consume became unprofitable and led to a drop in DCV and therefore active rewards.
 <figure><img src="../.gitbook/assets/data-farming/example_apys.png" alt="" width="563"><figcaption><p><em>Green: estimated APYs (passive + active). Black: estimated APYs (just passive). Yellow: estimated staking</em> </p></figcaption></figure>
 **It's an estimate.**
 - That's ok! As the great statistician G.E. Box said, "All models are wrong, some are useful".
 - APYs are an estimate because they depend on both DF rewards and OCEAN locked. Both of those are estimates, as follows.
 - For simplicity, the model assumes that Active DF rewards are solely composed of Volume DF using the whole Active DF budget [1].
 - OCEAN locked and lock time is not known for future weeks; it must be estimated [2].
 **OCEAN lock time greatly affects APY.**
 - The numbers above assume that all locked OCEAN is **locked for 4 years**, so that 1 OCEAN → 1 veOCEAN.
 - But APY could be much worse or more if you lock for shorter durations. Divide by 4 if you lock for 1 year. [3] elaborates.
 **Raw model.** All the plots are calculated from [this Google Sheet](https://docs.google.com/spreadsheets/d/1F4o7PbV45yW1aPWOJ2rwZEKkgJXbIk5Yq7tj8749drc/edit#gid=1051477754).
 # Notes
 [1] For better accuracy, one would need to account for Challenge DF and Predictoor DF. However, this gets more complex because Predictoor DF is highly dependent on prediction accuracy.
 [2] We modeled OCEAN locked by observing linear growth from DF week 5 (when OCEAN locking was introduced) to week 28: OCEAN locked grew from 7.89M OCEAN to 34.98M OCEAN respectively, or 1.177M more OCEAN locked per week. The true values of OCEAN locked was last updated on DF week 29. For more accuracy, that could be updated to the values since then.
 [3] Here are approximate bounds: If you lock for 4 years, and everyone else locks for 2, then multiply expected APY by 2. If you lock for 4 years and others for 1, then multiply by 4. Conversely, if you lock for 2 years and everyone else for 4, then divide your expected APY by 2. If you lock for 1 year and others for 4, then divide by 4. The numbers assume that you’re actively allocating veOCEAN allocation towards high-DCV data assets. For passive locking or low-DCV data assets, divide APY by 2 (approximate).
--- a/data-farming/apys.md
+++ b/data-farming/apys.md
@ -0,0 +1,39 @@
 ---
 description: >-
  From emissions, estimate APYs
 ---
 # APYs
 <figure><img src="../.gitbook/assets/gif/many-penguins.gif" alt=""><figcaption><p>Multiply, and multiply again. And again.</p></figcaption></figure>
 **Contents:**
 **This page** is about APYs. There's also [estimates of APY vs time](apys-plot.md) and [a guide to estimating APYs](apys-guide.md).
 # About APYs
 ### Source of Rewards
 Rewards are earned by users that participate in one or more Data Farming streams. Passive DF allows passive holding of veOCEAN; Active DF streams require more work from the user.
 Historically, annual percentage yields (APYs) are 5-15%. See for yourself: in [DF app](https://df.oceandao.org/activerewards) and scroll down to "Data Farming History".
 You can do your own APY estimations. In Passive DF, APY is highly dependent on the locked amount *and* duration of lock. In other DF streams, there are other factors.
 ### Definition of Yield, WPY, APY
 A **yield** is the relative gain in value compared to the amount you started with. Specifically:
 `yield = (start amount + gained amount) / (start amount) - 1.0`
 For example, if you start with 1000 OCEAN and earn 5 OCEAN:
 `yield = (1000 + 5) / (1000) - 1.0 = 0.005`
 We can express yield as a percentage simply by multiplying by 100 (%). For example, yield of `0.005` in percentage is `0.005 * 100% = 0.5%`.
 The yield for one week is **Weekly Percentage Yield**, or **WPY**. For example, if you started with 1000 OCEAN and earned 5 OCEAN from DF, in one week, then your WPY = 0.005 = 0.5%.
 The yield for one year is **Annual Percentage Yield**, or **APY**. APY can be estimated from WPYs. Assuming no compounding, `APY = WPY*52`. We drill deeper below.
--- a/data-farming/user-guides/how-to-challengedf.md
+++ b/data-farming/user-guides/how-to-challengedf.md
@ -1,15 +1,14 @@
 ---
-description: Be competive, make great predictions, earn $
+description: >-
  Be competive, make great predictions, earn $
 ---
-# Guide: Challenge DF
+# User Guide to Challenge DF
-<figure><img src="../../.gitbook/assets/gif/underwater-you-want-some-of-this.gif" alt=""></figure>
+<figure><img src="../.gitbook/assets/gif/swimming-pool.gif" alt=""><figcaption><p></p></figcaption></figure>
 ## Predict to earn
 If you're eager to begin extracting value from data but aren't sure how to get started, then [Challenge DF is here to help](../df-challengedf.md)!
 By participating in the weekly data challenges of predicting the price of Ethereum, you will become familiar with the Ocean Protocol stack and with building predictions that can be sold for money.
 These are the steps to get involved:
@ -55,6 +54,3 @@ To view and claim your rewards:
 3. To claim all Active Rewards including your Challenge DF rewards, simply click on the "Claim Rewards" button.
 <figure><img src="../../.gitbook/assets/data-farming/challenge-substream.png" alt=""><figcaption><p>Click the Claim Rewards button</p></figcaption></figure>
--- a/data-farming/df-challengedf.md
+++ b/data-farming/df-challengedf.md
@ -3,34 +3,37 @@ description: >-
  Be the champ 🏆
 ---
-# Win Competitions in Challenge DF
+# Challenge Data Farming
-<figure><img src="../.gitbook/assets/gif/underwater-you-want-some-of-this.gif" alt=""><figcaption><p>It's a competition. Let's gooo!</p></figcaption></figure>
+<figure><img src="../../.gitbook/assets/gif/underwater-you-want-some-of-this.gif" alt=""></figure>
 **This page** is about Challenge DF, and [this page](challengedf-guide.md) is a guide.
 ## About Challenge DF
 Challenge DF rewards data scientists for making predictions for future ETH price. It's a weekly challenge.
 ## Publish prediction models and earn rewards
 If you're eager to consume data and create valuable assets for publishing but unsure of where to begin, fear not! We've got you covered.
 Data Farming offers rewards to data scientists who participate in weekly challenges. We provide the rules and rewards, allowing you to focus on delivering high-quality results.  
 **Prizes:**
 - 1st Place - 2500 OCEAN
 - 2nd Place - 1500 OCEAN
 - 3rd Place - 1000 OCEAN
-_Total - 5000 OCEAN_
+Prize Pool: 1,000 OCEAN (as of Nov 2, 2022)
 - 1st Place - 500 OCEAN
 - 2nd Place - 300 OCEAN
 - 3rd Place - 200 OCEAN
 ### What are the base rules?
- A fresh challenge [begins and concludes every Thursday](df-intro.md#weekly-rounds).
+- A fresh challenge begins and concludes every Thursday
 - You have to submit your entry before the deadline.
 - At the beginning of each week, a predetermined amount of OCEAN is allocated as rewards.
 - Competitors need to submit 12 predictions by using a DataNFT to share data.
 - The rewards are divided into specific amounts for the top three positions.
 - The individuals who submit the top three entries will receive rewards, and their wallet addresses will be showcased within the Data Farming dapp.
 For the full details on how to submit, please read the [Where to start](#where-to-start) section.
 ### What do I gain from this?
 - Earn OCEAN rewards, [claimable inside the app](https://df.oceandao.org/rewards)
@ -43,10 +46,11 @@ For the full details on how to submit, please read the [Where to start](#where-t
 Head over to the [Challenges Page](https://df.oceandao.org/challenge-df) to learn more about Challenge DF, see historical results, and find out where you go to submit.
-If you're looking for a step-by-step guide on what a challenge entails and how to claiming your well-deserved rewards, check out the [Challenge DF  user guide](user-guides/how-to-challengedf.md). It will provide you with all the necessary information you need to make the most out of the challenges.
+If you're looking for a step-by-step guide on what a challenge entails and how to claiming your well-deserved rewards, check out the [Challenge DF user guide](challengedf-guide.md). It will provide you with all the necessary information you need to make the most out of the challenges.
 You can find a direct link to the [Challenge DF README](https://github.com/oceanprotocol/predict-eth/blob/main/challenges/challenge-df.md) which you'll be using to submit your predictions.
 ### Good lock and happy coding!
 <figure><img src="../.gitbook/assets/data-farming/gif/winner.gif" alt=""><figcaption></figcaption></figure>
--- a/data-farming/user-guides/how-to-claim-rewards.md
+++ b/data-farming/user-guides/how-to-claim-rewards.md
@ -2,13 +2,13 @@
 description: Unbox your OCEAN rewards
 ---
-# Claim Rewards Data Farming
+# Claim Rewards in DF
 <figure><img src="../../.gitbook/assets/gif/underwater-treasure.gif" alt=""><figcaption></figcaption></figure>
-Ocean Protocol's Data Farming dapp dispenses rewards **every Thursday** to its participants. 💰 To claim your OCEAN rewards for data farming, simply navigate to the Data Farming [Rewards page](https://df.oceandao.org/rewards) and click the Claim OCEAN rewards buttons that will appear pink and clickable each Thursday. Yeehaw!
+To claim OCEAN rewards, go to [DF Rewards page](https://df.oceandao.org/rewards) and click the "Claim OCEAN rewards" buttons.
-You can visit this dApp to [begin Data Farming](https://df.oceandao.org)? Or [follow this user guide](how-to-veocean.md) to get started. 🤠
+A detailed guide is below.
 ### Step 1 - Navigate to the Data Farming Rewards page
@ -24,10 +24,10 @@ This is where you click to claim your rewards! Easy peasy. You will need to appr
 <figure><img src="../../.gitbook/assets/data-farming/claim-rewards.png" alt=""><figcaption><p>Click the pink Claim # Ocean buttons</p></figcaption></figure>
-### FIRST TIME CLAIMING?
+### First time claiming?
 You will need to wait at least one week, but not more than two weeks to claim your rewards for the first time. Check back on Thursday!
-### FORGOT TO CLAIM?
+### Forgot to claim?
-If you forget to claim your OCEAN rewards, then do not worry because they continue to accumulate! You can claim them anytime after Thursday. 😃
+If you forget to claim your OCEAN rewards, then do not worry because they continue to accumulate! It's all fine. You can claim them anytime after Thursday. 😃
--- a/data-farming/user-guides/how-to-delegate.md
+++ b/data-farming/user-guides/how-to-delegate.md
@ -1,20 +1,25 @@
 ---
-description: Give another wallet power to allocate veOCEAN
+description: >-
  Give another wallet power to allocate veOCEAN
 ---
-# Guide: Volume DF Delegation
+# Delegation in Volume DF
 <figure><img src="../../.gitbook/assets/gif/underwater-buddy-peewee.gif" alt=""><figcaption></figcaption></figure>
-## Why Delegate?
+## About Delegation
 Delegation is a tool for Volume DF.
 **[Here's the delegation page](https://df.oceandao.org/delegate) in the DF webapp.**
 ## Why Delegate?
 Consider these challenges:
 - Your veOCEAN is on a hardware wallet and you want a "hot" software wallet to auto-delegate based on data consume volume, to increase APY
 - You have >1 wallets and it's a pain to switch among them for delegating
-[Delegation](https://df.oceandao.org/delegate) solves that. "To delegate" means "to transfer veOCEAN Allocation Power to another wallet address" for a limited period.
+Delegation solves that. "To delegate" means "to transfer veOCEAN Allocation Power to another wallet address" for a limited period.
 When you delegate, you delegate 100% of your veOCEAN Allocation power.
--- a/data-farming/df-emissions-apys.md
+++ b/data-farming/df-emissions-apys.md
@ -1,84 +0,0 @@
 ---
 description: >-
  Know reward emissions, to know daily yields, multiply for annual yields
 ---
 # Emissions & APYs
 <figure><img src="../.gitbook/assets/gif/many-penguins.gif" alt=""><figcaption><p>Multiply, and multiply again. And again.</p></figcaption></figure>
 ## Understand emissions to know APYs
 To really know APYs, you should understand emissions and how they play a role in the funds disributed inside Ocean Protocol.  
 If you are looking to get an overview of APYs, please read the [basics of estimating APY](df-intro.md#estimating-apy) first.  
 If you want to see some examples of how to calculate it, you can find out more in the [Estimate APY user guides](user-guides/how-to-estimate-apy.md).  
 ### Why veOCEAN is important to OceanDAO
 veOCEAN enables OceanDAO to be more user-focused, community-driven, and futuristic revenue-sharing like CurveDAO:
 * ve (vote escrowed) is at the heart with v = voting (in asset curation) and e = escrowed (locked) OCEAN. The longer that Data Farmers lockup their OCEAN, the more voting and rewards, which reconciles near and long-term DAO incentives.
 * OceanDAO has an increased bias to automation and to minimizing the governance attack (hack) surface via veOCEAN.
 The baseline emissions schedule determines the weekly OCEAN budget for this phase. The schedule mimics Bitcoin when including a half-life of 4 years. Unlike Bitcoin, there is a burn-in period to ratchet up value-at-risk versus time:
 * The curve initially gets a multiplier of 10% for 12 months (DF Main 1)
 * Then, it transitions to multiplier of 25% for 6 months (DF Main 2)
 * Further, a multiplier of 50% for 6 months (DF Main 3)
 * Finally, a multiplier of 100%. (DF Main 4)
 We implement the first three phases as constants, because they are relatively short in duration. We implement the fourth phase as a Bitcoin-style exponential: constant, with the constant dividing by two (“halvening”) every four years.
 Let’s visualize!
 ## Emissions — first 5 years.
 The image below shows the first 5 years. The y-axis is OCEAN released each week. It’s log-scaled to easily see the differences. The x-axis is time, measured in weeks. In weeks 0–29, we can see the distinct phases for DF Alpha (DF1 // week 0), DF/VE Alpha (DF5 // week 4), DF Beta (DF9 // week 8), DF Main 1 (DF29 // week 28), DF Main 2 (DF80 // week 79), DF Main 3 (DF106 // week 105), and DF Main 4 (DF132 // week 131).
 <figure><img src="../.gitbook/assets/data-farming/emissions_first_5years.png" alt="" width="540"><figcaption><p><em>OCEAN released to DF per week — first 5 years</em></p></figcaption></figure>
 ## Emissions — first 20 years.
 The image below is like the previous one: OCEAN released per week, but now for the first 20 years. Week 131 onwards is DF Main 4. We can see that the y-value divides by two (“halvens”) every four years.
 <figure><img src="../.gitbook/assets/data-farming/emissions_first_20years.png" alt="" width="563"><figcaption><p><em>OCEAN released to DF per week — first 20 years</em></p></figcaption></figure>
 ## Total OCEAN released.
 The image below shows the total OCEAN released by DF for the first 20 years. The y-axis is log-scaled to capture both the small initial rewards and exponentially larger values later on. The x-axis is also log-scaled so that we can more readily see how the curve converges over time.
 <figure><img src="../.gitbook/assets/data-farming/emissions_lifetime.png" alt="" width="563"><figcaption><p><em>Total OCEAN released to DF — first 20 years</em></p></figcaption></figure>
 ## Example APYs
 The plot below shows estimated APY over time. Green includes both passive and active rewards; black is just passive rewards. As of DF29, wash consume is no longer profitable, so we should expect a large drop in DCV and therefore in active rewards. So passive rewards (black) provides a great baseline with upside in active rewards (green).
 APYs are an estimate because APY depends on OCEAN locked. OCEAN locked for future weeks is not known precisely; it must be estimated. The yellow line is the model for OCEAN locked. We modeled OCEAN locked by observing linear growth from week 5 (when OCEAN locking was introduced) to week 28 (now): OCEAN locked grew from 7.89M OCEAN to 34.98M OCEAN respectively, or 1.177M more OCEAN locked per week.
 <figure><img src="../.gitbook/assets/data-farming/example_apys.png" alt="" width="563"><figcaption><p><em>Green: estimated APYs (passive + active). Black: estimated APYs (just passive). Yellow: estimated staking</em> </p></figcaption></figure>
 All the plots are calculated from [this Google Sheet](https://docs.google.com/spreadsheets/d/1F4o7PbV45yW1aPWOJ2rwZEKkgJXbIk5Yq7tj8749drc/edit#gid=1051477754).
 OCEAN lock time affects APY. The numbers above assume that all locked OCEAN is locked for 4 years, so that 1 OCEAN → 1 veOCEAN. But APY could be much worse or more if you lock for shorter durations. Here are approximate bounds.
 If you lock for 4 years, and everyone else locks for 2, then multiply expected APY by 2. If you lock for 4 years and others for 1, then multiply by 4. Conversely, if you lock for 2 years and everyone else for 4, then divide your expected APY by 2. If you lock for 1 year and others for 4, then divide by 4. The numbers assume that you’re actively allocating veOCEAN allocation towards high-DCV data assets. For passive locking or low-DCV data assets, divide APY by 2 (approximate).
 ## A Brief History of Data Farming
 Data Farming has evolved over time and will continue to do so as the Emission Curve progresses. Below are the phases and parameters incurred during the evolution of the Data Farming program. We are now in the DF Main phase.
 **DF Alpha - Rounds 1-4 (4 wks)**\
 10K OCEAN rewards were budgeted per week. Counting started Thu June 16, 2022 and ended July 13, 2022. Rewards were distributed at the end of every week, for the activity of the previous week. It ran for 4 weeks. The aim was to test technology, learn, and onboard data publishers.
 **DF/VE Alpha - Rounds 5-8 (4 wks)**\
 10K OCEAN rewards were budgeted per week. Counting started Thu Sep 29, 2022 and ended Oct 27, 2022. Rewards were distributed at the end of every week, for the activity of the previous week. It ran for 4 weeks. The aim was to resume Data Farming along with veOCEAN, test the technology, onboard data publishers, and keep learning.
 **DF Beta - Rounds 9-28 (20 wks)**\
 Up to 100K OCEAN rewards were budgeted per week. Counting started Thu Oct 27, 2022, and ended on March 15, 2023. It ran for 20 weeks. The aim was to test the effect of larger incentives, and support ecosystem participation, while continually refining the underlying technology.
 **DF Main - Rounds 29-1000+**\
 We are now in DF Main which immediately followed the release of DF Beta on Thu Mar 16, 2023. Rewards begin at 150k per week and goes up to 1.1M OCEAN per week. DF Main emits 503.4M OCEAN worth of rewards and lasts for decades.
 The amount of OCEAN released is determined by the emission schedule as defined by the [Emission Curve](df-emissions-apys.md#emissions--first-5-years), and perhaps more easily understood in the [Reward Schedule](df-intro.md#reward-schedule).
--- a/data-farming/df-faq.md
+++ b/data-farming/df-faq.md
@ -1,336 +0,0 @@
 ---
 title: veOCEAN & Data Farming FAQ
 description: Frequently Asked Questions about Data Farming
 ---
 ## veOCEAN FAQ
 ### Guides
 <details>
 <summary>I'm new to Ocean and I want to stake my OCEAN. Can you show me how? Where can I learn about APY and locks?</summary>
 Absolutely, we've adopted the voting escrowed system from Curve Finance (veCRV) and created veOCEAN.
 veOCEAN lets you lock OCEAN to receive veOCEAN. You then automatically access Passive Rewards via Data Farming while learning more about Active Rewards. Here are some handy resources to help you get started:
 1. [Tutorial](user-guides/how-to-volumedf.md)
 2. [Estimate your APY](user-guides/how-to-estimate-apy.md)
 By exploring these links, you'll get step-by-step guidance and insights into maximizing your rewards with veOCEAN.
 We cannot offer guidance as how to allocate your voting power, that's your decision.
 </details>
 ### Basics
 <details>
 <summary>Are veOCEAN tradeable or have a market price?</summary>
 No. They cannot be traded, transferred, or sold. ⁣
 ⁣
 You can delegate veOCEAN to others in order to facilitate farming, however, you need to understand how this works. ⁣To learn more [please read the docs](user-guides/how-to-delegate.md). ⁣
 </details>
 <details>
 <summary>Which chain is veOCEAN be deployed on?</summary>
 [veOCEAN & DF](https://github.com/oceanprotocol/contracts/tree/main/contracts/ve) core contracts are deployed on Ethereum mainnet.
 </details>
 <details>
 <summary>Which networks are eligible for Data Farming?</summary>
 You participate by default in Passive Rewards when you lock OCEAN on Ethereum Mainnet.
 Data assets for Volume DF may be published in any network where Ocean’s deployed in production: Eth Mainnet, Polygon, BSC, and more.
 You can find a list of [all supported chains here](../discover/networks/README.md).
 </details>
 ### Staking
 <details>
 <summary>What is veOCEAN and staking in context of Ocean Protocol? </summary>
 [veOCEAN](df-veocean.md) (vote-escrowed OCEAN) is a special token in the Ocean Protocol ecosystem. Users can obtain veOCEAN by Locking their OCEAN for a specific period of time. Their OCEAN cannot be accessed during this time as a sign of conviction that lets them engage with the network. Longer lock periods for veOCEAN typically yield higher rewards.
 You can lock your OCEAN at - [df.oceandao.org](https://df.oceandao.org)
 </details>
 <details>
 <summary>How much Ocean do I need to stake to earn interest?</summary>
 There is no minimum amount. The rewards will depend on the amount you lock.
 You will get passive rewards by default when you lock tokens. On top of that, you can get active rewards if you actively participate in the program. Here are some [resources](user-guides/how-to-veocean.md).
 </details>
 <details>
 <Summary>I locked my OCEAN for veOCEAN but can't see the rewards. What am I missing?</Summary>
 Please hang in there and stay patient, as it can take almost two weeks to receive your first reward. 😊
 </details>
 <details>
 <summary>If I stake my Ocean for 6 months and the price of Ocean goes up during that time, will my staked tokens increase in value as well?</summary>
 Yes. When you lock OCEAN, you'll receive them back at the end of the lock-up period. If the value increases during this time, your OCEAN will appreciate in worth. The same principle applies in reverse if the value decreases
 </details>
 <details>
 <summary>Is it possible to only participate in Passive Rewards? Or should I participate in Active Rewards?</summary>
 You participate by default in Passive Rewards when you lock OCEAN.  
 But to maximize your rewards, you will also need to engage in Active Rewards.  
 It's worth noting that active staking does come with associated costs, such as gas fees which you will need to cover.  
 More information about [APYs](user-guides/how-to-estimate-apy).  
 </details>
 ### Liquid Staking
 <details>
 <summary>Are there any liquid staking wrappers for veOCEAN?</summary>
 You can also earn active staking rewards by assigning your veOCEAN directly on datasets or through a proxy ([psdnOCEAN](https://docs.h2odata.xyz/protocol-overview/psdnocean-veocean-liquid-staking)), which deploys your veOCEAN at no risk, in order to gain a share of active rewards.
 </details>
 <details>
 <summary>Why the ratio between psdnOCEAN and OCEAN is not close to 1:1?</summary>
 The ratio stands at 80% to 20%, creating an imbalanced pool that minimizes price fluctuations. You might find this [resource](https://blog.oceanprotocol.com/psdnocean-the-first-liquid-staking-wrapper-by-the-h2o-team-is-now-live-a3330e15fa5c) valuable.
 </details>
 <details>
 <Summary> How to convert PsdnOcean back to OCEAN ?</Summary>
 You can convert psdnOCEAN back to OCEAN using the Balancer AMM liquidity [pool](https://app.balancer.fi/#/ethereum/pool/0xf8c4cd95c7496cb7c8d97202cf7e5b8da2204c2b00020000000000000000039e).
 [Price information](https://www.geckoterminal.com/eth/pools/0xf8c4cd95c7496cb7c8d97202cf7e5b8da2204c2b) for psdnOCEAN.
 </details>
 ### Locking & Withdrawing
 <details>
 <summary>What's the amount of veOCEAN one can get for locking 1 OCEAN?</summary>
 1 veOCEAN if you lock for 4 years. Learn more about VeOCEAN [here](df-veocean.md).
 </details>
 <details>
 <summary>If I withdraw before the unlock date, what happens to my veOCEAN and rewards?</summary>
 You can't withdraw before the [unlock date](df-veocean.md).
 </details>
 <details>
 <summary>Is there a way to transform veOCEAN to OCEAN gradually over the lock period?</summary>
 No, you can't convert your veOCEAN to OCEAN during the lock period. When the lock period concludes, you gain access to all your locked OCEAN.  
 To learn more about veOCEAN, check out this [resource](df-veocean).
 </details>
 <details>
 <summary>What is the best time to lock OCEAN to avoid high gas fees?</summary>
 When [gas](https://www.useweb3.xyz/gas) is cheap. 
 </details>
 ### Claiming Rewards
 <details>
 <summary>When I claim my OCEAN, do I need to restake them manually, or are they auto-compounded?</summary>
 They are not auto-compounded.
 They can be claimed/redeposited whenever you want. If you don't claim, they just stack up. There is no loss.
 </details>
 ### APY
 <details>
 <summary>Are rewards paid out in veOCEAN or OCEAN?</summary>
 All rewards in Data Farming are paid out in OCEAN and can be claimed at the every epoch.
 </details>
 <details>
 <summary>I locked 10k OCEAN but only received 0.1 OCEAN as a reward. What gives? </summary>
 If you've locked 10,000 OCEAN for a short period, it's possible to see a near-0% APY. 
 To boost your APY, consider locking your OCEAN for a more extended period. It's not only about the amount you lock but also **the duration of the lock that matters most**. Longer lock periods yield more significant results. You can find further insights in this [document](user-guides/how-to-estimate-apy).
 </details>
 <details>
 <summary>Could you explain the benefits of staking OCEAN and how the APY is calculated?</summary>
 Yes, You can find the details in these resources.⁣
 1. [Benefits](df-veocean).
 2. [Passive Rewards](df-intro).
 3. [Emissions & APYs](df-emissions-apys).
 </details>
 <details>
 <summary>What is the current APY (Annual Percentage Yield) for staking?</summary>
 The APY is highly dependent on the locked amount and more importantly on the locking period. Please see the [Estimate your APY](user-guides/how-to-estimate-apy) guide.
 </details>
 <details>
 <summary>Where can I see the history for Data Farming APY to get an idea of what to expect?</summary>
 Just, visit the Data Farming website and scroll down to the [Data Farming History](https://df.oceandao.org/activerewards) section.
 </details>
 ### Volume DF
 <details>
 <summary>What assets are eligible for Data Farming?</summary>
 The data asset may be of any type — dataset (for static URIs), algorithm for Compute-to-Data, or any other Datatoken token-gated system. The data asset may be fixed price or free price. You can find more details in the [DF Background page](df-volumedf.md#assets-that-qualify-for-data-farming)
 </details>
 <details>
 <summary>Do I only receive Active Rewards from Volume DF if the datasets I staked on receive DCV?</summary>
 Yes, you will receive [Active Rewards from Volume DF](df-intro#what-are-active-rewards) if the assets you've curated have Data consume Volume(DCV). ⁣
 </details>
 <details>
 <summary>Is there a dashboard to view the volume of DF-main?</summary>
 Yes
 [DF Dashboard](https://df.oceandao.org/datafarming) (per round).
 [Autobot](https://autobotocean.com/volumes) (historical).
 </details>
 <details>
 <summary>How do I analyze projects and decide where to allocate? Do I look at current and past APYs, or is there more to consider? </summary>
 Curators can select datasets to stake on based on several factors such as publisher reputation, number of previous consumes of the dataset, ratings, and comments of others.
 We provide an overview into many of these stats inside the [Volume DF page](https://df.oceandao.org/volume-df) in the Data Farming dApp.
 </details>
 <details>
 <summary>The datatoken price may change throughout the week. What price is taken in the DCV calculation?</summary>
 The price is taken at the same time as each consume. E.g. if a data asset has three consumes, where the price was 1 OCEAN when the first consume happened, and the price was 10 OCEAN when the other consumes happened, then the total DCV for the asset is 1 + 10 + 10 = 21.
 </details>
 <details>
 <summary>How long does it take for the system to update round allocations for veOCEAN?</summary>
 Allocations happen instantly.
 However, your voting power is counted progressively throughout the week and requires you to keep your veOCEAn allocated on datasets for it to work.
 </details>
 <details>
 <summary>Are there any risks associated with Active Rewards?</summary>
 When it comes to active staking, you aren't exposed to additional risks. Your veOCEAN remain securely locked, and your role is to curate datasets by allocating them.
 As with any system, inherent risks exist. In terms of the liquidity you provide, rest assured that we have implemented battle-tested contracts, protecting assets worth billions, including veCRV. With this model, there is no liquidity risk, and you are shielded from losing your OCEAN due to Impermanent Loss (IL); your OCEAN are held securely in lock.
 More info [here](user-guides/how-to-volumedf.md).
 </details>
 ### Parameters & Stats
 <details>
 <summary>What is the official veOCEAN epoch start_time?</summary>
 veFeeDistributor has a start\_time of 1663804800 (Thu Sep 22 2022 00:00:00).
 </details>
 <details>
 <summary>Where can I find the veOCEAN and DF contracts?</summary>
 They are deployed on the Ethereum mainnet, alongside other Ocean contract deployments. You can find the [full list of contracts here](https://github.com/oceanprotocol/contracts/blob/main/addresses/address.json).
 </details>
 <details>
 <summary>Can the reward function change during a given week?</summary>
 No. At the beginning of a new DF round (DF1, DF2, etc.), rules are laid out, either implicitly if no change from the previous round, or explicitly in a blog post if there are new rules. This is: reward function, bounds, etc. Then teams stake, buy data, consume, etc. LPs are given DF rewards based on staking, DCV, etc. at the end of the week. Overall cycle time is one week.
 Caveat: it’s no at least in theory! Sometimes there may be tweaks if there is community consensus or a bug.
 </details>
 <details>
 <summary>What is the percentage of tokens currently staked?</summary>
 You can find the statistics for the number of locked tokens [here](https://autobotocean.com/veOcean). As of September 2023, there are approximately 700 million OCEAN in circulation, out of which approximately 30 million have been locked. ⁣
 </details>
 <details>
 <summary>Is there a way to check the duration and amounts of veOCEAN locked on-chain for all wallets?</summary>
 Yes, this information is available. Indeed, there is a technical aspect involved. You'll need to have some technical knowledge because you'll be required to query the subgraph. You can find a working example of how to get the list of holders [in the subgraph documentation](../developers/subgraph/get-veocean-stats#get-the-veocean-holders-list). Feel free to run the script by clicking on the "run" button.
 </details>
--- a/data-farming/df-intro.md
+++ b/data-farming/df-intro.md
@ -1,114 +0,0 @@
 ---
 description: Learn how to earn passively, and with active work 🧑‍🏫
 ---
 # Data Farming 101
 <figure><img src="../.gitbook/assets/gif/school-of-fish.gif" alt=""><figcaption><p>School (of fish) time.</p></figcaption></figure>
 ## Weekly Rounds
 All streams and substreams repeat on a weekly basis that start on Thursdays 00:00 at UTC and end on Wed at 23:59 UTC.  
 ### Passive and Active Reward streams
 OCEAN rewards are paid out at the end of each week to Data Farmers through two different reward streams. **Passive Rewards** and **Active Rewards**.  
 These two reward streams produce different variable APYs.  
 Rewards are paid out at the end of each round.
 #### Splitting the Pie
 Each Data Farming round has a pool of OCEAN rewards, where 50% of the pool is paid out in the form of passive rewards & 50% in the form of active rewards that [can be viewed here](https://df.oceandao.org/rewards).
 | Passive Rewards | Active Rewards |
 | --------------- | -------------- |
 | 50%             | 50%            |
 <figure><img src="../.gitbook/assets/data-farming/df-reward-streams.png" alt=""><figcaption><p>Rewards Page overview for each stream.</p></figcaption></figure>
 ### What are Passive Rewards?
 Passive rewards are the OCEAN rewards paid to Data Farmers just for locking their OCEAN.  
 veOCEAN holders can generate yield completely passively if they wish, though they are incentivized with larger real yield if they **actively participate** in farming yield from assets, or completing prediction challenges.  
 <figure><img src="../.gitbook/assets/gif/passive-income.gif" alt=""><figcaption></figcaption></figure>
 [To start getting passive rewards, go here.](user-guides/how-to-veocean.md)
 ### What are Active Rewards?
 Active Rewards is an evolving program that focuses on providing incentives to key areas of the protocol that support traction and growth.
 Rewards are paid in OCEAN to contributors actively working to improve Ocean Protocol.  
 **Active Rewards** is then composed of two sub-streams:
 1. 5,000 OCEAN is paid out to Challenge DF.
 2. 70,000 OCEAN is paid out to Volume DF.  
 | Challenge DF | Volume DF |
 | --------------- | -------------- |
 | 5,000 OCEAN     | 70,000 OCEAN    |
 **November 9** will then change when Predictoor DF is launched:
 1. 1,000 OCEAN is paid out to Challenge DF.
 2. 37,000 OCEAN is paid out to Volume DF.
 3. 37,000 OCEAN is paid out to PredictoorDF.
 | Challenge DF | Volume DF | Predictoor DF |
 | --------------- | -------------- | -------------- |
 | 1,000 OCEAN     | 37,000 OCEAN    | 37,000 OCEAN    
 ### What is Volume DF
 [Volume DF](df-volumedf.md#curate-data-in-volume-df) rewards Data Farmers that allocate their veOCEAN to Ocean datasets. It's called Volume DF because the amount of rewards relies on assets that are actively generating Data Consume Volume.  
 You can visit the follow tutorial learn how to [access Volume DF](user-guides/how-to-volumedf.md).  
 Volume DF rewards are governed and defined by the [Reward Function](df-intro.md#reward-schedule).  
 #### Estimating APY
 To get a good sense for how much APY you'll make, we recommend you understand the details of [how veOCEAN works](df-veocean.md). This will give you a basis for the calculations and provide you with an outline for what to expect in terms of rewards over time.  
 You can find the [how to estimate APY](user-guides/how-to-estimate-apy.md) user guide, calculate a reward schedule, and compare your lock up period with others.  
 #### Publisher Rewards
 <figure><img src="../.gitbook/assets/gif/just-publish.gif" alt=""><figcaption><p>Publishing lets you earn *more* OCEAN rewards</p></figcaption></figure>
 Publishers are strongly incentivized to launch assets in the Ocean Ecosystem. When publishers curate and support their own assets, they [receive double the allocation power](df-volumedf.md#what-are-publisher-rewards).  
 You can learn how to curate datasets and access [Publisher Rewards](user-guides/how-to-volumedf.md#) here.  
 ### What is Challenge DF
 Challenge DF rewards Data Scientists that produce prediction models that consistently improve the prediction of the price of Ethereum. It's called Challenge DF because weekly rewards are dispensed towards participants that are competing to improve the accuracy of how well we can predict price movements of Ethereum. Therefore, **Challenge DF yields depend on participants accurately outcompeting each other.** Only the top 3 predictions on the leaderboard win.  
 You can visit the follow tutorial learn how to [access Challenge DF](user-guides/how-to-challengedf.md).  
 ### What is Predictoor DF
 Predictoor DF rewards Data Scientists (as a predictoor) that submit continuous predictions for future price movements of different assets. It's called Predictoor DF because weekly rewards are dispensed towards predictoors that are competing to accurately predict asset prices. Therefore **Predictoor DF yields depend on participants being accurate and outcompeting each other**.
 ### What's the difference between Data Farming and Yield Farming?
 If you are familiar with 'liquidity mining' then you will find Data Farming similar, but instead, tuned for the curation of high quality assets in the Ocean ecosystem.
 Unlike yield farming in DeFi, data farming has real intrinsic utility for Ocean Protocol stakeholders as Data Farmers determine which are the highest quality assets in the Ocean ecosystem to purchase, and as these assets sell, they are rewarded in OCEAN . It's this **curation of the "best" assets in the Ocean ecosystem** that shortens the search times for those looking to shop for assets in the Ocean ecosystem.  
 To deepen this incentive, Publishers are boosted further and **gain 2x the allocation power** when pointing to their own assets.
 ## Reward Schedule
 The table below shows the total amount of OCEAN rewards that will be distributed among Passive and Active rewards each week. The table cross-references DF Round Number, Start Date, Phase & Week, Sub-Phase & Week, and OCEAN Rewards/Week.
 <figure><img src="../.gitbook/assets/data-farming/reward_schedule.png" alt=""><figcaption><p><em>Ocean Reward Schedule for the next 20+ years</em></p></figcaption></figure>
 <figure><img src="../.gitbook/assets/gif/cash-flow.gif" alt=""><figcaption></figcaption></figure>
 ## [GET STARTED DATA FARMING HERE.](https://df.oceandao.org)
 ### Unsure how? These [guides](../user-guides/README.md) will show you how to do the basics.
--- a/data-farming/faq.md
+++ b/data-farming/faq.md
@ -0,0 +1,295 @@
 ---
 title: Data Farming FAQ
 description: Frequently Asked Questions about Data Farming
 ---
 ## Data Farming FAQ
 ### Staking and Risk
 <details>
 <summary>What does "staking" mean in an Ocean context?</summary>
 Its precise meaning depends on the DF stream.
 - Passive DF: stake OCEAN = lock OCEAN into veOCEAN
 - Volume DF: stake OCEAN on asset = allocate veOCEAN towards an asset
 - Challenge DF: (there is no staking)
 - Predictoor DF: put OCEAN into a prediction transaction
 </details>
 <details>
 <summary>Are there any risks associated with DF?</summary>
 As with any system, inherent risks exist. We try to minimize them, as follows.
 - Passive DF: uses veCRV contracts which have been battle-tested in high volume since 2020.
 - Volume DF: doesn't change veOCEAN behavior. Rather, separate contracts "see" the veOCEAN staked to compute amount of rewards.
 - Challenge DF: no funds at risk
 - Predictoor DF: you stake a small amount of OCEAN in each epoch (eg every 5min). If issues arise, you can get out quickly. 
 </details>
 <details>
 <summary>Is there any impermanent loss (IL) in my staking?</summary>
 No. IL is typically associated with providing liquidity to decentralized exchange or pools. There are no pools involved in any of the DF streams [1].
 </details>
 ### Rewards Payout
 <details>
 <summary>What APYs can I expect?</summary>
 Historically, annual percentage yields (APYs) are 5-15%. See [APY docs](apys.md) for details.
 </details>
 <details>
 <summary>When I claim my OCEAN, do I need to restake them manually, or are they auto-compounded?</summary>
 They are not auto-compounded.
 They can be claimed/redeposited whenever you want. If you don't claim, they just stack up. There is no loss.
 The [APY docs](apys.md) provide formulae on compounding vs. not.  
 </details>
 <details>
 <summary>Are rewards paid out in veOCEAN or OCEAN?</summary>
 All rewards in Data Farming are paid out in OCEAN and can be claimed at the every epoch.
 </details>
 <details>
 <summary>Can the DF rewards change during a given week?</summary>
 No. At the beginning of a new DF round, rules are laid out, either implicitly if no change from the previous round, or explicitly in a blog post if there are new rules.
 Caveat: it’s "no" at least in theory! Sometimes there may be tweaks if there is community consensus or a bug.
 </details>
 <details>
 <summary>I locked 10,000 OCEAN but only received 0.1 OCEAN as a reward. What gives? </summary>
 If you've locked 10,000 OCEAN for a short period, it's possible to see a near-0% APY. 
 To boost your APY, consider locking your OCEAN for a more extended period. It's not only about the amount you lock but also **the duration of the lock that matters most**. Longer lock periods yield more significant results. 
 </details>
 <details>
 <Summary>I locked my OCEAN for veOCEAN but can't see the rewards. What am I missing?</Summary>
 Please hang in there and stay patient, as it can take almost two weeks to receive your first reward. 😊
 </details>
 <details>
 <summary>High gas fields hurt my yield! What is the best time to avoid high gas fees?</summary>
 When gas is cheap. [Here](https://www.useweb3.xyz/gas) is data on gas prices.
 Also, remember that you don't need to claim rewards and re-stake every week. You could do it less frequently to avoid gas fees. (Balance this with the benefits of compounding.)
 </details>
 <details>
 <summary>Where do I learn more about the OCEAN reward schedule?</summary>
 In its [docs page](reward-schedule.md).
 </details>
 ### Passive DF (and veOCEAN)
 <details>
 <summary>How much OCEAN do I need to lock to earn yield?</summary>
 There is no minimum amount. The rewards will depend on the amount you lock.
 You will get passive rewards by default when you lock OCEAN. And you can get Volume DF rewards if you allocate veOCEAN to data assets.
 </details>
 <details>
 <summary>If I lock my OCEAN for 6 months and the price of OCEAN goes up during that time, will my staked tokens increase in value as well?</summary>
 Yes. When you stake OCEAN, you'll receive them back at the end of the lock-up period. If the value increases during this time, your OCEAN will appreciate in worth. The same principle applies in reverse if the value decreases
 </details>
 <details>
 <summary>What's the amount of veOCEAN one can get for locking 1 OCEAN?</summary>
 1 veOCEAN if you lock for 4 years.
 </details>
 <details>
 <summary>If I withdraw before the unlock date, what happens to my veOCEAN and rewards?</summary>
 You can't withdraw before the unlock date.
 </details>
 <details>
 <summary>Is there a way to transform veOCEAN to OCEAN gradually over the lock period?</summary>
 No, you can't convert your veOCEAN to OCEAN during the lock period. When the lock period concludes, you gain access to all your locked OCEAN.  
 </details>
 <details>
 <summary>Is it possible to only participate in Passive Rewards?</summary>
 Yes.
 And, you participate by default in Passive Rewards when you lock OCEAN.  
 But to maximize your rewards, you will also need to engage in the other streams.
 </details>
 <details>
 <summary>Where do I learn more about veOCEAN & Passive DF?</summary>
 In its [docs page](passivedf.md).
 </details>
 ### Volume DF
 <details>
 <summary>What data assets are eligible for Volume DF?</summary>
 The data asset may be of any type — data feed, API, file, etc. dataset (for static URIs), algorithm for Compute-to-Data, or any other Datatoken token-gated system. The data asset may be fixed price or free price. 
 </details>
 <details>
 <summary>Do I only receive Volume DF rewards if the datasets I've staked on have DCV?</summary>
 Yes, correct.
 </details>
 <details>
 <summary>How do I analyze projects and decide where to allocate? Do I look at current and past APYs, or is there more to consider? </summary>
 Curators can select datasets to stake on based on previous DCV, publisher reputation, and more.
 You can see DCV stats in the DF webapp's [Volume DF page](https://df.oceandao.org/volume-df).
 Finally, Predictoor data feeds are promising, since they have good baseline volume due to Predictoor DF.
 </details>
 <details>
 <summary>The datatoken price may change throughout the week. What price is taken in the DCV calculation?</summary>
 The price is taken at the same time as each consume. E.g. if a data asset has three consumes, where the price was 1 OCEAN when the first consume happened, and the price was 10 OCEAN when the other consumes happened, then the total DCV for the asset is 1 + 10 + 10 = 21.
 </details>
 <details>
 <summary>How long does it take for the system to update round allocations for veOCEAN?</summary>
 Allocations happen instantly.
 However, your voting power is counted progressively throughout the week and requires you to keep your veOCEAn allocated on datasets for it to work.
 </details>
 <details>
 <summary>Where do I learn more about Volume DF?</summary>
 In its [docs page](volumedf.md).
 </details>
 ### Challenge DF
 <details>
 <summary>Where do I learn more about Challenge DF?</summary>
 In its [docs page](challengedf.md).
 </details>
 ### Predictoor DF
 <details>
 <summary>Where do I learn more about Predictoor DF?</summary>
 In its [docs page](predictoordf.md).
 </details>
 ### Parameters & Stats
 <details>
 <summary>Where can I find the veOCEAN and DF contracts?</summary>
 They are deployed on the Ethereum mainnet, alongside other Ocean contract deployments. [Here](https://github.com/oceanprotocol/contracts/blob/main/addresses/address.json) is the full list of contract deployments.
 </details>
 <details>
 <summary>What % of OCEAN is currently locked?</summary>
 [autobotocean.com](https://autobotocean.com/veOcean) has those stats, and more.
 </details>
 <details>
 <summary>Is there a way to check the duration and amounts of OCEAN locked on-chain for all wallets?</summary>
 Yes, this information is available. Indeed, there is a technical aspect involved. You'll need to have some technical knowledge because you'll be required to query the subgraph. You can find a working example of how to get the list of holders [in the subgraph documentation](../developers/subgraph/get-veocean-stats#get-the-veocean-holders-list). Feel free to run the script by clicking on the "run" button.
 </details>
 <details>
 <summary>What is the official veOCEAN epoch start_time?</summary>
 veFeeDistributor has a start\_time of 1663804800 (Thu Sep 22 2022 00:00:00).
 </details>
 ## Notes
 [1] The initial version of Data Farming - in DF Alpha phase (DF1-DF4) - _did_ involve providing liquidity to datatoken pools, and therefore did incur risk of Impermanent Loss (IL). For this reason and others, we moved away from pools, to veOCEAN for the DF/VE Alpha phase and beyond (>=DF5). Therefore there has been no IL risk since then. [Here are details](https://blog.oceanprotocol.com/veocean-is-launching-data-farming-is-resuming-abed779211e3).
--- a/data-farming/liquid-staking.md
+++ b/data-farming/liquid-staking.md
@ -0,0 +1,56 @@
 ---
 description: 
 ---
 # Liquid Staking
 This page is about liquid staking of veOCEAN using psdnOCEAN.
 ### veOCEAN Limitation: not Tradeable
 Once you lock OCEAN, you get veOCEAN.
 Unlike OCEAN, veOCEAN cannot be traded or transferred. This is by design, to reconcile near-term and long-term incentives.
 Interestingly, there is a way to get the best of both: locked OCEAN yet tradeability. The idea is "liquid staking".
 ### psdnOCEAN Liquid Staking
 **psdnOCEAN is a "liquid staking wrapper" for veOCEAN:**
 - It holds veOCEAN
 - And it allows transfers (using ERC20 interface)
 psdnOCEAN is a product by [H2O](https://www.h2odata.xyz//), a team separate from - and collaborating with - the Ocean core team.
 While you can't trade veOCEAN, **you can trade psdnOCEAN.**
 ### How to get OCEAN -> psdnOCEAN
 You can lock OCEAN for psdnOCEAN via [the H2O "convert" dapp](https://liquid-staking.h2odata.xyz/convert/ocean).
 ### How to get psdnOCEAN -> OCEAN
 psdnOCEAN can be traded in exchanges, for both psdnOCEAN -> OCEAN, and vice versa.
 The main exchange option is the [OCEAN-psdnOCEAN Balancer pool](https://app.balancer.fi/#/ethereum/swap?outputCurrency=0x51Fa2efd62ee56a493f24AE963eAce7D0051929E).
 - [Here are pool details.](https://app.balancer.fi/#/ethereum/pool/0xf8c4cd95c7496cb7c8d97202cf7e5b8da2204c2b00020000000000000000039e).
 ⚠️Be careful - if liquidity is low you will experience high slippage.
 ### Rewards to psdnOCEAN holders
 Since psdnOCEAN holds veOCEAN, then Passive DF rewards go to that psdnOCEAN-held veOCEAN according to the usual Passive DF rules.
 Over time, psdnOCEAN may also get rewards from other DF streams or protocols too.
 ### psdnOCEAN Resources
 [Here's](https://blog.oceanprotocol.com/psdnocean-the-first-liquid-staking-wrapper-by-the-h2o-team-is-now-live-a3330e15fa5c) the original psdnOCEAN announcement.
 psdnOCEAN contract & token info can be found at:
  - [Etherscan](https://etherscan.io/token/0x51fa2efd62ee56a493f24ae963eace7d0051929e)
  - [CoinGecko](https://www.coingecko.com/en/coins/poseidon-ocean)
  - [GeckoTerminal](https://www.geckoterminal.com/eth/pools/0xf8c4cd95c7496cb7c8d97202cf7e5b8da2204c2b)
--- a/data-farming/user-guides/how-to-veocean.md
+++ b/data-farming/user-guides/how-to-veocean.md
@ -1,12 +1,13 @@
 ---
-description: Get veOCEAN to use the Data Farming dApp and make yield! 🧑‍🌾🥕
+description: >-
  Get veOCEAN to use the Data Farming dApp and make yield!
 ---
 # Guide to Passive DF
 <figure><img src="../../.gitbook/assets/gif/aquaman-gold.gif" alt="" width="250"><figcaption><p>Get your gold. Get your veOCEAN.</p></figcaption></figure>
-# What is veOCEAN and Passive Rewards
+In order to **get yield in DF**, you will need to lock your OCEAN first! When you lock your OCEAN, you get **veOCEAN** and **weekly passive OCEAN rewards** in return. veOCEAN is a token used in Ocean Protocol's Data Farming dApp to **generate even more yield,** called **Volume DF rewards**, for allocating your veOCEAN to your favorite assets and get a portion of their sales!
 In order to **gain yield Data Farming**, you will need to lock your OCEAN first! When you lock your OCEAN, you get **veOCEAN** and **weekly passive OCEAN rewards** in return. veOCEAN is a token used in Ocean Protocol's Data Farming dApp to **generate even more yield,** called **Volume DF rewards**, for allocating your veOCEAN to your favorite assets and get a portion of their sales!
 ### Don't have OCEAN yet? Get those first!
@ -47,4 +48,4 @@ In this step you will:
 - Click the “Create Lock” button.
 - Accept the transaction in your wallet.
-Congratulations! You have now locked your OCEAN for veOCEAN and are generating passive yield automatically. You can [claim your passive OCEAN rewards](how-to-claim-rewards.md) every Thursday - note that your first time claiming rewards will require at least one week, but not more than 2 weeks of wait!
+Congratulations! You have now locked your OCEAN for veOCEAN and are generating passive yield automatically. You can [claim your passive OCEAN rewards](claim-rewards.md) every Thursday - note that your first time claiming rewards will require at least one week, but not more than 2 weeks of wait!
--- a/data-farming/df-veocean.md
+++ b/data-farming/df-veocean.md
@ -3,30 +3,17 @@ description: >-
  Earn passively by locking veOCEAN for OCEAN
 ---
-# Passive Farming with veOCEAN
+# Passive Data Farming (and veOCEAN)
 <figure><img src="../.gitbook/assets/gif/aquaman-fade.gif" alt=""><figcaption><p>I've got veOCEAN, my work is done.</p></figcaption></figure>
-### What does the "ve" in veOCEAN stand for?
+**This page** is about Passive DF, and veOCEAN. There's also a [user guide page](passivedf-guide.md), and a [page for liquid staking](liquid-staking.md)
-"ve" stands for <mark style="color:orange;">**vote escrowed**</mark>. And the "vote" part of "ve" and veOCEAN is what you really need to pay attention to in order to truly understand the function of this token.
+# About veOCEAN and Passive DF
-You see, when you acquire veOCEAN via locking your OCEAN in the Data Farming dApp, the intended use is to **vote on your favorite assets** in the Ocean ecosystem!
+Here, Data Farmers earn OCEAN rewards by locking their OCEAN for veOCEAN for a period of time. That's it! It's low effort, ie passive.
-When you allocate to assets that sell, then **you get a portion of the sales**!
+The amount of rewards you get is pro-rata to the amount of veOCEAN you hold, cmopared to other veOCEAN holders.
 You can do this all from the Data Farming dApp [Farms page](https://df.oceandao.org/volume-df).
 ### The Superpowers of veOCEAN
 veOCEAN allows you to engage with different Ocean Protocol mechanisms and benefit from the reward programs available.
 4 key utility functionalities of veOCEAN:
 1. **Holding it** veOCEAN pays **Passive OCEAN Rewards** every week.
 2. **Allocating it** veOCEAN pays **Active OCEAN Rewards** every week to the top selling assets in the Ocean ecosystem.
 3. **Delegating it** You can delegate veOCEAN to other Data Farmers who can curate Datasets for you. In return for their services, these farmers may charge you a fee for helping you receive APY on **Active Rewards**. The Delegate feature has just been recently released and enables veOCEAN holders to more easily manage Active Rewards.
 4. **2x Publisher Stake** If you are a publisher in the Ocean ecosystem, then allocating your veOCEAN to your own asset gives your veOCEAN **a 2x Bonus**. This is an incentive for publishers to engage with their assets and benefit the assets in the Ocean ecosystem further.
 ### veOCEAN Time Locking
@ -66,7 +53,7 @@ If you lock 1.0 OCEAN for 4 years, you get 1.0 veOCEAN at the start.
 At the end of your 4 years, your OCEAN is unlocked.
-The veOCEAN code is a fork of Curve's battle tested [veCRV](https://curve.readthedocs.io/dao-vecrv.html) token code.
+veOCEAN code is a fork of Curve's battle-tested [veCRV](https://curve.readthedocs.io/dao-vecrv.html) contracts that safeguard billions (veCRV). With this model there is no liquidity risk. You can’t lose your OCEAN through Impermanent Loss (IL). It is merely locked.  
 # veOCEAN and your APY
@ -114,16 +101,17 @@ The veOCEAN design is in accordance with the Web3 Sustainability Loop, which Oce
 The veOCEAN code was forked from the veCRV code. veCRV parameters will be the starting point. To minimize risk, tweaks will be circumspect.
-### Where the heck did we get this idea from?
+### Background of veOCEAN Idea
-The "veTokenomics" model of veOCEAN (vote-escrowed token economics) is inspired by Curve Finance's [veCRV](https://curve.readthedocs.io/dao-fees.html) token code. We took this inspiration to enable our users to participate in on-chain governance and earn rewards within the Ocean Protocol ecosystem.
+It's been a long-held goal to reconcile near-term and long-term incentives. This is not an easy task.
-[Here is Ocean Protocol's open-source code](https://github.com/oceanprotocol/contracts/blob/main/contracts/ve/veFeeDistributor.vy#L240-L256) for veOCEAN, and if you're a developer, then you'll notice the strong similarities to [veCRV's](https://curve.readthedocs.io/dao-fees.html) code.
+Curve Finance's [veCRV](https://curve.readthedocs.io/dao-fees.html) was one of the first to do a great job at this, and have high usage and liquidity. So, [veOCEAN contracts](https://github.com/oceanprotocol/contracts/tree/main/contracts/ve) use veCRV code.
-### veOCEAN's Smart Contracts Security
+### veOCEAN Contract Security
-[veOCEAN core contracts](https://github.com/oceanprotocol/contracts/tree/main/contracts/ve) use [veCRV contracts](https://curve.readthedocs.io/dao-vecrv.html) with zero changes, on purpose: the veCRV contracts have been battle-tested since inception and have not had security issues. Nearly 500 million USD is locked across all forks of veCRV, with the leading DeFi protocols adopting this standard. veCRV contracts [have been audited by Trail of Bits and Quantstamp](https://github.com/curvefi/curve-dao-contracts#audits-and-security).
+veOCEAN core contracts have zero changes to veCRV code, on purpose: the veCRV contracts have been battle-tested since inception (2020). Nearly 500 million USD is locked across all forks of veCRV, with the leading DeFi protocols adopting this standard. veCRV contracts [have been audited by Trail of Bits and Quantstamp](https://github.com/curvefi/curve-dao-contracts#audits-and-security).
-We have built [a new contract](https://github.com/oceanprotocol/contracts/blob/main/contracts/ve/veAllocate.sol) for users to point their veOCEAN towards given data assets (“allocate veOCEAN”). These new contracts do not control the veOCEAN core contracts at all. In the event of a breach, the only funds at risk would be the rewards distributed for a single week; and we would be able to redirect future funds to a different contract.
+We have built [a new contract](https://github.com/oceanprotocol/contracts/blob/main/contracts/ve/veAllocate.sol) for users to allocate their veOCEAN towards data assets. These new contracts do not control the veOCEAN core contracts at all. In the event of a breach, the only funds at risk would be the rewards distributed for a single week; and we would be able to redirect future funds to a different contract.
 We have an [ongoing bug bounty via Immunefi](https://immunefi.com/bounty/oceanprotocol/) for Ocean software, including veOCEAN and DF components. If you identify an issue, please report it there and get rewarded.
--- a/data-farming/predictoordf-guide.md
+++ b/data-farming/predictoordf-guide.md
@ -0,0 +1,10 @@
 ---
 description: >-
  Guide to run prediction bots to earn continuously.
 ---
 # Guide to Predictoor DF
 In Predictoor DF, you run prediction bots to earn continuously. Starts on DF62.
 (Note: this doc will get fleshed out soon.)
--- a/data-farming/predictoordf.md
+++ b/data-farming/predictoordf.md
@ -0,0 +1,16 @@
 ---
 description: >-
  Run prediction bots to earn continuously.
 ---
 # Predictoor Data Farming
 **This page** is about Predictoor DF, and [this page](predictoordf-guide.md) is a guide.
 # About Predictoor DF
 In Predictoor DF, you run prediction bots to earn continuously. Starts on DF62.
 (Note: this doc will get fleshed out soon.)
--- a/data-farming/reward-schedule.md
+++ b/data-farming/reward-schedule.md
@ -0,0 +1,74 @@
 ---
 description: >-
  Know the OCEAN reward schedule, towards understanding yields
 ---
 # OCEAN Reward Schedule
 <figure><img src="../.gitbook/assets/gif/cash-flow.gif" alt=""><figcaption></figcaption></figure>
 ## Overview
 DF proceeds one round at a time. Each round is weekly.
 Rewards are distributed at the end of every week, for the activity of the previous week.
 The reward schedule = the emission schedule, definining the weekly OCEAN budget for DF. DF currently rewards 150K OCEAN per round. Over time, rewards will increase to be as high as 1.1M OCEAN / week, then decay over time Bitcoin-style.
 DF rounds are grouped into four phases: DF Alpha, DF/VE Alpha, DF Beta, and DF Main. We are now in the "DF Main" phase.
 The table below shows OCEAN rewards per round, and corresponding phase.
 <figure><img src="../.gitbook/assets/data-farming/reward_schedule.png" alt=""><figcaption><p><em>Ocean Reward Schedule for the next 20+ years</em></p></figcaption></figure>
 ### DF Phases
 Each of the first three phases -- DF Alpha, DF/VE Alpha, and DF Beta phases -- had a fixed value. Each of these ran for 4-20 weeks. The final phase -- DF Main -- runs for decades with a Bitcoin-like emissions-schedule (plus a burn-in-period).
 ### Phase: DF Alpha - Rounds 1-4 (4 wks)
  - 10K OCEAN rewards per week.
  - Counting started Thu June 16, 2022 and ended July 13, 2022. It ran for 4 weeks. DF was temporarily paused after this, for time to put veOCEAN into place.
  - The aim was to test technology, learn, and onboard data publishers.
 ### Phase: DF/VE Alpha - Rounds 5-8 (4 wks)
  - 10K OCEAN rewards were per week.
  - Counting started Thu Sep 29, 2022 and ended Oct 27, 2022. It ran for 4 weeks.
  - The aim was to resume Data Farming with veOCEAN, test the technology, onboard data publishers, and keep learning.
 ### Phase: DF Beta - Rounds 9-28 (20 wks)
  - Up to 100K OCEAN rewards per week.
  - Counting started on Oct 27, 2022, ie the day DF/VE Alpha ended. Counting ended on March 15, 2023. It ran for 20 weeks.
  - The aim was to test the effect of larger incentives, and support ecosystem participation, while continually refining the underlying technology.
 ### Phase: DF Main - Rounds 29-1000+
  - Rewards began at 150K OCEAN per week, and go up to 1.1M OCEAN per week. Total emissions are 503.M OCEAN.
  - Counting started on March 15, 2023, ie the day DF Beta ended. It runs for decades.
  - DF Main's schedule mimics Bitcoin including a half-life of 4 years. Unlike Bitcoin, there is a _burn-in period_ to ratchet up value-at-risk versus time. Burn-in is implemented via four sub-phases: DF Main 1, 2, 3 and 4 with multipliers of 10%, 25%, 50%, and 100% respectively.
    - DF Main 1 emits 150K OCEAN per week. It runs 12 months.
    - DF Main 2 starts on Mar 14, 2024 (DF80). Rewards go 2x, to 300K OCEAN / week. It runs 6 months.
    - DF Main 3 starts on Sep 12, 2024 (DF106). Rewards go 2x, to 600K OCEAN / week. It runs 6 months.
    - DF Main 4 starts on Mar 13, 2025 (DF132). Rewards begin at 1.1M OCEAN / week then halve every four years. It runs for decades.
 ## Visualize Emissions: First 5 years
 Let’s visualize emissions!
 The image below shows the first 5 years (including all DF Phases). The y-axis is OCEAN released each week. It’s log-scaled to easily see the differences. The x-axis is time, measured in weeks. In weeks 0–29, we can see the distinct phases for DF Alpha (DF1 // week 0), DF/VE Alpha (DF5 // week 4), DF Beta (DF9 // week 8), DF Main 1 (DF29 // week 28), DF Main 2 (DF80 // week 79), DF Main 3 (DF106 // week 105), and DF Main 4 (DF132 // week 131).
 <figure><img src="../.gitbook/assets/data-farming/emissions_first_5years.png" alt="" width="540"><figcaption><p><em>OCEAN released to DF per week — first 5 years</em></p></figcaption></figure>
 ## Visualize Emissions: First 20 years
 The image below is like the previous one: OCEAN released per week. But now, we show for the first 20 years. Week 131 onwards is DF Main 4. We can see that the y-value divides by two (“halvens”) every four years.
 <figure><img src="../.gitbook/assets/data-farming/emissions_first_20years.png" alt="" width="563"><figcaption><p><em>OCEAN released to DF per week — first 20 years</em></p></figcaption></figure>
 ## Visualize Total OCEAN released
 The image below shows the total OCEAN released by DF for the first 20 years. The y-axis is log-scaled to capture both the small initial rewards and exponentially larger values later on. The x-axis is also log-scaled so that we can more readily see how the curve converges over time.
 <figure><img src="../.gitbook/assets/data-farming/emissions_lifetime.png" alt="" width="563"><figcaption><p><em>Total OCEAN released to DF — first 20 years</em></p></figcaption></figure>
 ## Further resources
 The blog post ["Data Farming Main is here"](https://blog.oceanprotocol.com/ocean-data-farming-main-is-here-49c99602419e) provides further detail yet.
--- a/data-farming/user-guides/README.md
+++ b/data-farming/user-guides/README.md
@ -1,53 +0,0 @@
 ---
 description: Learn the ins-and-outs Data Farming
 ---
 # Data Farming Guides
 <figure><img src="../../.gitbook/assets/gif/school-of-fish2.gif" alt=""><figcaption>Back to school (of fish)</figcaption></figure>
 Data Farming is the core incentive system inside of Ocean Protocol. It offers different ways for participants to help the protocol grow and succeed.
 It's broken down into 2 reward streams:
 1. Passive Rewards
 2. Active Rewards
 As the name suggests, users need to do very little to earn Passive Rewards and the program is aimed to onboard as many people as possible to help drive liquidity and conviction into the protocol.
 Active Rewards is an evolving incentive program that offers different venues for contributors to complete active work that drives the protocol forward.
 Anyone is welcomed to participate.
 ## Passive Rewards stream
 The primary objective of the [Passive Rewards](../df-intro.md#what-are-passive-rewards) stream is to provide an accessible way for anyone to use OCEAN and help the protocol grow.
 In [the veOCEAN user guide](how-to-veocean.md), you'll learn more about the Passive Rewards stream and how to get veOCEAN.
 ## Active Rewards stream & Substreams
 The primary objective of [Active Rewards](../df-intro.md#what-are-active-rewards) and substreams is to provide participants that engage with Data Farming different opportunities to create value. This approach allows users with different skills and interests to collaborate and contribute their unique abilities towards achieving the core values of Ocean Protocol.  
 Let's review the Active Reward substreams and get you started. 
 ### Volume DF Substream
 The bread and butter of the Data Farming incentive program is [Volume DF](../df-volumedf.md). Here publishers and curators that help maintain quality assets in the Ocean ecosystem are rewarded.  
 You can receive OCEAN rewards by allocating veOCEAN voting power to high-quality datasets and assisting Ocean with the curation of Data assets. Through this allocation, you will also receive a portion of the revenue generated by the dataset consumption.
 Allocation power can also be increased via delegation. The Data Farming dApp [Delegate Page](https://df.oceandao.org/delegate) lets you easily manage delegations.
 For more information on how to get started and detailed instructions, please refer to the [Volume DF user guide](how-to-volumedf.md) section.
 ### Challenge DF Substream
 If you are a data scientist and enjoy tackling challenging problems, this is the perfect place for you. [Challenge DF](../df-challengedf.md) provides a competition where you can test your skills in predicting the price of Ethereum. Earn a place on the podium to receive a reward.
 This opportunity allows you to explore the capabilities offered by Ocean Protocol to build algorithms, publish data assets, and to gain valuable exposure. As your models and skills improve, you can begin monetizing your work.
 For detailed instructions and information on how to get started, please refer to the [Challenge DF user guide](how-to-challengedf.md).
 ### Not much of a reader? Watch and learn, friend
 {% embed url="https://youtu.be/zAQlPHkK3og" %}
--- a/data-farming/user-guides/how-to-estimate-apy.md
+++ b/data-farming/user-guides/how-to-estimate-apy.md
@ -1,41 +0,0 @@
 ---
 description: >-
  Learn how to use basic math and a simple spreadsheet to estimate your
  Passive Rewards APY and get deeper into Active Rewards APY.
 ---
 <figure><img src="../../.gitbook/assets/gif/mafs.gif" alt=""><figcaption><p>K.I.S.S.</p></figcaption></figure>
 # veOCEAN and your APY
 Rewards are earned by users that hold and use their veOCEAN to help the protocol improve and grow.  
 To receive competitve short-term APYs, veOCEAN requires users to make long-term commitments.
 First, make sure that you [understand the basics of APY](../df-veocean.md#veocean-and-your-apy) and how veOCEAN works.
 Now that we got that out of the way, let's work through the examples and keep it as simple as possible.
 ### Estimating Passive APY
 To make it easier to estimate your APY, [we have created a simple spreadsheet](https://docs.google.com/spreadsheets/d/1zzuW5pBbX6j6hZL_XtJDtSR2-rDHa_LGOEwgoQ4D8lk/edit?usp=sharing) that let's you easily estimate your Passive APY.
 We have provided 2 sheets as an example of locking-up 10,000 OCEAN for:
 1. A 4-year investment period
 2. A 6-mo investment period
 The above are simplified examples meant for everyone to understand. They are naive investment strategies and are meant to provide you, the reader, with some examples to build upon. You can use these as a reference to create your own plan, so feel free to make a copy of this spreadsheet and customize it to your needs and wants.
 ### Estimating Active APY
 Active Rewards are a bit more complicated and depend on many factors that are currently hard to predict accurately. It is unlikely for the user to get a practical result, which is why we don't offer a tool to estimate Active APY right now.
 You can easily expand the spreadsheet above to support a basic, naive calculations for Active Rewards such as adding a fixed-rate.
 To help solve this challenge, [we built a dashboard](https://df.oceandao.org/volume-df) that shows historical and ongoing summaries of APY, Data Consume Volume, and veOCEAN allocations per-round.
 <figure><img src="../../.gitbook/assets/data-farming/curate-datasets.png" alt=""><figcaption><p>Curate like a Pro.</p></figcaption></figure>
 You can also [learn how rewards are calculated](../df-volumedf.md#how-rewards-are-calculated) to understand more about what's happening behind the scenes of each Data Farming round.
 Finally, you can [review the implementation inside df-web](https://github.com/oceanprotocol/df-web/blob/main/src/utils/rewards.js) to understand how the APYs on the UI are calculated.
--- a/data-farming/user-guides/how-to-volumedf.md
+++ b/data-farming/user-guides/how-to-volumedf.md
@ -1,13 +1,12 @@
 ---
-description: Curate datasets in Data Farming and earn
+description: >-
  Curate datasets in Data Farming and earn
 ---
-# Guide: Volume Data Farming
+# Guide to Volume DF
 <figure><img src="../../.gitbook/assets/gif/avatar-pick-whale.gif" alt=""><figcaption>Pick your whale</figcaption></figure>
 ## Curate to earn
 In Volume DF, you allocate veOCEAN to data assets with high data consume volume (DCV). You do this via the DF dApp.
 We'll show you how!  
@ -40,3 +39,4 @@ We'll show you how!
 <figure><img src="../../.gitbook/assets/data-farming/update-allocations.png" alt=""><figcaption><p>Click the Update Allocations button</p></figcaption></figure>
 That's it! You've successfully allocated (aka "voted on") your favorite assets in the Ocean ecosystem using your veOCEAN and are generating active rewards yield. Now, just wait until next Thursday to see if you can [claim any OCEAN rewards](how-to-claim-rewards.md) on the Active Rewards section of the [Rewards page](https://df.oceandao.org/rewards) for your portion of the assets' sales. Remember that your first time claiming rewards will require at least one week, but not more than 2 weeks of wait!
--- a/data-farming/df-volumedf.md
+++ b/data-farming/df-volumedf.md
@ -3,19 +3,19 @@ description: >-
  Choose your fav data assets, earn more
 ---
-# Curate with Volume DF
+# Volume Data Farming
 <figure><img src="../.gitbook/assets/gif/avatar-plugin.gif" alt=""><figcaption><p>Make your selection and commit. Good things will come.</p></figcaption></figure>
-## What is Volume DF
+**This page** is about Volume DF. There's also a [user guide page](volumedf-guide.md) and a [page for delegation](delegate.md).
-Passive Data Farming is a great start to earn from your locked OCEAN (veOCEAN).
+# About Volume DF
-Volume DF lets you can earn more yet, with that same veOCEAN. In Volume DF, you allocate veOCEAN to data assets with high data consume volume (DCV).
+We've already covered [Passive DF](passivedf.md), which is a great start to earn from your locked OCEAN (veOCEAN).
-### User Guide
+_Volume_ DF lets you can earn more yet, with that same veOCEAN.
-The [Volume DF User Guide](./user-guides/how-to-volumedf.md) tells how to use the Data Farming dApp to allocate veOCEAN.
+In Volume DF, you allocate veOCEAN to data assets with high data consume volume (DCV). This acts as _data curation_.
 ### How to Maximize Volume DF rewards
@ -37,7 +37,7 @@ Here are tactics:
 You can delegate your veOCEAN from one wallet to another. This is handy if you have a hardware wallet holding veOCEAN, and you want a "hot" software wallet to automatically re-allocate more often. There are other uses too. 
-[Here's how to delegate](user-guides/how-to-delegate.md).
+[Here's how to delegate](delegate.md).
 ### Assets that Qualify for Volume DF
@ -54,17 +54,20 @@ To qualify for DF, an asset must also:
 ### How Rewards are Calculated
-The Reward Function (RF) governs how active rewards are allocated to Data Farmers.
+The Reward Function (RF) governs how Volume DF rewards are allocated.
-**Rewards are calculated as follows:**
+_Rewards are calculated as follows:_
 1. Distribute OCEAN across each asset **based on rank**: highest-DCV asset gets the most OCEAN, second-highest-DCV gets second-most, etc. [Here are details](https://blog.oceanprotocol.com/data-farming-df22-completed-df23-started-reward-function-tuned-ffd4359657ee).
 1. For each asset and each veOCEAN holder:
   1. If the holder is a publisher, 2x the effective allocation
   1. Baseline rewards = (% allocation in asset) \* (OCEAN for an asset)
   1. Bound rewards to the asset by 125% APY
-   1. Bound rewards by asset’s DCV \* 0.1%.
+   1. Bound rewards by asset’s `DCV` \* `DCV_multiplier`.
 Step 2.4 is to prevent wash consume. `DCV_multiplier` is a function of fees, with a value of 0.201 for Predictoor feeds, and 0.001 for other data assets.
 The actual code is in [calcrewards.py](https://github.com/oceanprotocol/df-py/blob/main/df_py/volume/calc_rewards.py) in df-py repo.
 When DF restarts each Thursday, the global allocation towards each asset resets back to zero and then starts counting up again until the end of the round. After allocating your veOCEAN to different datasets, it will take time for your voting power to be accounted for. 
--- a/developers/community-monetization.md
+++ b/developers/community-monetization.md
@ -42,6 +42,6 @@ Additionally, provider fees are not limited to data consumption — they can als
 **Benefits to the Ocean Community**
-We’re always looking to give back to the Ocean community and collecting fees is an important part of that. As mentioned above, the Ocean Protocol Foundation retains the ability to implement community fees on data consumption. The tokens that we receive will either be burned or invested in the community via projects that they are building. These investments will take place either through [Data Farming](../data-farming/df-intro.md), [Ocean Shipyard](https://oceanprotocol.com/shipyard), or Ocean Ventures.
+We’re always looking to give back to the Ocean community and collecting fees is an important part of that. As mentioned above, the Ocean Protocol Foundation retains the ability to implement community fees on data consumption. The tokens that we receive will either be burned or invested in the community via projects that they are building. These investments will take place either through [Data Farming](../data-farming/README.md), [Ocean Shipyard](https://oceanprotocol.com/shipyard), or Ocean Ventures.
 Projects that utilize OCEAN or H2O are subject to a 0.1% fee. In the case of projects that opt to use different tokens, an additional 0.1% fee will be applied. We want to support marketplaces that use other tokens but we also recognize that they don’t bring the same wider benefit to the Ocean community, so we feel this small additional fee is proportionate.
--- a/developers/subgraph/get-veocean-stats.md
+++ b/developers/subgraph/get-veocean-stats.md
@ -4,7 +4,7 @@ description: 'Discover the World of veOCEAN: Retrieving a Stats'
 # Get veOCEAN stats
-If you are already familiarized with veOCEAN, you're off to a great start. However, if you need a refresher, we recommend visiting the [veOCEAN](../../data-farming/df-veocean.md) page for a quick overview :mag:
+If you are already familiarized with veOCEAN, you're off to a great start. However, if you need a refresher, we recommend visiting the [veOCEAN](../../data-farming/veocean-passive.md) page for a quick overview :mag:
 On this page, you'll find a few examples to fetch the stats of veOCEANS from the Ocean Subgraph. These examples serve as a valuable starting point to help you retrieve essential information about veOCEAN. However, if you're eager to delve deeper into the topic, we invite you to visit the [GitHub](https://github.com/oceanprotocol/ocean-subgraph/blob/main/test/integration/VeOcean.test.ts) repository. There, you'll discover a wealth of additional examples, which provide comprehensive insights. Feel free to explore and expand your knowledge! :books:
--- a/user-guides/README.md
+++ b/user-guides/README.md
@ -38,8 +38,8 @@ Buy, mint, and sell NFTs using the Ocean Market following the guides below.
 Earn rewards by locking OCEAN, curating data assets, and more.
-{% content-ref url="../data-farming/user-guides/README.md" %}
+{% content-ref url="../data-farming/README.md" %}
-[../data-farming/user-guides/README.md](../data-farming/user-guides/README.md)
+[../data-farming/README.md](../data-farming/README.md)
 {% endcontent-ref %}
 ### Antique Stuff 🏺