tweaks

SUMMARY.md

@@ -127,6 +127,8 @@
   * [Claim Rewards](data-farming/claim-rewards.md)
   * [Reward Schedule](data-farming/reward-schedule.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)

data-farming/README.md

@@ -32,7 +32,7 @@ Active DF's substreams can -- and do -- evolve over time. It's chronicled [here]
 
 ## Reward Schedule & APYs
 
-**[Reward Schedule](ocean-reward-schedule.md)**. The 150,000 OCEAN / week currently available for DF rewards will increase over time to over 1.1M OCEAN / week.
+**[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.
 
 **[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.
 

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:)

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).

data-farming/apys.md

@@ -9,9 +9,7 @@ description: >-
 
 **Contents:**
 
-- [About APYs](#about-apys)
+**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).
-- [Estimated APY vs Time](#estimated-apy-vs-time)
-- [On Estimating APYs](#on-estimating-apys)
 
 # About APYs
 
@@ -39,102 +37,3 @@ The yield for one week is **Weekly Percentage Yield**, or **WPY**. For example,
 
 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.
 
-# Estimated APY vs Time
-
-The plot below shows estimated APY over time. It brings together data from the [OCEAN reward schedule](ocean-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).
-
-
-----
-
-<figure><img src="../../.gitbook/assets/gif/mafs.gif" alt=""><figcaption><p>K.I.S.S.</p></figcaption></figure>
-
-# On Estimating 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:)
-
-# 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).

data-farming/challengedf.md

@@ -34,8 +34,6 @@ Prize Pool: 1,000 OCEAN (as of Nov 2, 2022)
 - 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)

data-farming/delegate.md

@@ -7,15 +7,19 @@ description: >-
 
 <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.
 

data-farming/faq.md

@@ -111,7 +111,7 @@ Also, remember that you don't need to claim rewards and re-stake every week. You
 
 <summary>Where do I learn more about the OCEAN reward schedule?</summary>
 
-In its [docs page](ocean-reward-schedule.md).
+In its [docs page](reward-schedule.md).
 </details>
 
 

data-farming/liquid-staking.md

@@ -1,41 +1,55 @@
+---
+description: 
+---
 
 
+# Liquid Staking
 
-# veOCEAN and Liquid Staking
+This page is about liquid staking of veOCEAN using psdnOCEAN.
 
-### veOCEAN is not Tradeable
+### veOCEAN Limitation: not Tradeable
 
 Once you lock OCEAN, you get veOCEAN.
 
-Unlike OCEAN, veOCEAN cannot be traded or transferred.
+Unlike OCEAN, veOCEAN cannot be traded or transferred. This is by design, to reconcile near-term and long-term incentives.
 
-However, you can [delegate](delegate.md) veOCEAN to others, who then controls allocation to data assets and receives rewards.
+Interestingly, there is a way to get the best of both: locked OCEAN yet tradeability. The idea is "liquid staking".
-
-psdnOCEAN offers interesting optionality; see next section.
 
 ### psdnOCEAN Liquid Staking
 
-While you can't trade veOCEAN, **you can trade psdnOCEAN.**
-
 **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.
 
-### How to convert OCEAN <> psdnOCEAN
+While you can't trade veOCEAN, **you can trade psdnOCEAN.**
 
-- You can lock OCEAN for psdnOCEAN via [the H2O "convert" dapp](https://liquid-staking.h2odata.xyz/convert/ocean).
+### How to get OCEAN -> psdnOCEAN
-- psdnOCEAN can be traded in exchanges. The main 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.
+
+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.
+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.
+[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 on...
+
+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)

data-farming/passivedf-guide.md

@@ -48,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!

data-farming/passivedf.md

@@ -7,11 +7,7 @@ description: >-
 
 <figure><img src="../.gitbook/assets/gif/aquaman-fade.gif" alt=""><figcaption><p>I've got veOCEAN, my work is done.</p></figcaption></figure>
 
-**This page** is about Passive DF, and veOCEAN.
+**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)
-
-Follow-up pages on Passive DF:
-- [Guide to Passive DF](passivedf-guide.md)
-- [Liquid Staking](liquid-staking.md)
 
 # About veOCEAN and Passive DF
 

data-farming/volumedf.md

@@ -7,11 +7,7 @@ description: >-
 
 <figure><img src="../.gitbook/assets/gif/avatar-plugin.gif" alt=""><figcaption><p>Make your selection and commit. Good things will come.</p></figcaption></figure>
 
-**This page** is about 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).
-
-Follow-up pages on Volume DF:
-- [Guide to Volume DF](volumedf-guide.md)
-- [Guide to Delegation](delegate.md)
 
 # About Volume DF
 
@@ -21,8 +17,6 @@ _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). This acts as _data curation_.
 
-You can delegate your veOCEAN to other wallets. This is helpful when you want a bot to automatically update your veOCEAN allocations (from a "hot" wallet) while keeping your locked OCEAN secure in a hardware wallet. There are other use cases too. There's more info [below](#user-guide-to-delegation).
-
 ### How to Maximize Volume DF rewards
 
 Here are tactics:
@@ -43,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
 
@@ -60,16 +54,18 @@ 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.