diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..c6c7268a
Binary files /dev/null and b/.DS_Store differ
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..80385bfb
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+# default reviewer for all pull requests
+* @milkyklim @lehnberg
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 75c0f5ce..ee733be1 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,38 +1,33 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-name: Node.js CI
+name: Check
on:
push:
- branches: [ master ]
+ branches: [master]
pull_request:
- branches: [ master ]
+ branches: [master]
jobs:
- lint:
+ linter:
runs-on: ubuntu-latest
steps:
- - name: Checkout repo
+ - name: Checkout
uses: actions/checkout@v2
+ # with:
+ # # Make sure the actual branch is checked out when running on pull requests
+ # ref: ${{ github.head_ref }}
- - name: Cache modules
- uses: actions/cache@v2
+ - name: Prettify code
+ uses: creyD/prettier_action@v3.1
with:
- path: ~/.npm
- key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
- restore-keys: |
- ${{ runner.os }}-node-
+ # This part is also where you can pass other options, for example:
+ prettier_options: --write **/*.{js,md}
+ commit_message: "CI: Run linter"
- - name: Setup node.js
- uses: actions/setup-node@v1
+ - name: Check markdown links
+ uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
- node-version: '12.x'
-
- - name: Install modules
- run: npm install
-
- - name: Run linter on
- run: npm run lint:check
+ use-quiet-mode: 'yes'
+ config-file: 'mlc_config.json'
diff --git a/README.md b/README.md
index 3bb6cbec..0bb94d4b 100644
--- a/README.md
+++ b/README.md
@@ -1,36 +1,28 @@
-# Introduction to Yearn
+#Introducción
-Yearn Finance is a suite of products in Decentralized Finance \(DeFi\) that at its core provides lending aggregation, yield generation, and insurance on the Ethereum blockchain.
-The protocol is maintained and developed by various independent contributors within the cryptocurrency space. Management of the protocol is governed by YFI holders. Listed below are core products active in production, a brief description on the protocol's governance process, and links to active communication channels.
+Yearn Finance es un despliegue de productos financieros dentro de las finanzas descentralizadas o (DeFi) cuyo objetivo es generar rendimiento de capital en plataformas con contratos inteligentes como Ethereum. El protocolo es mantenido por desarrolladores independientes y gobernado por holders del token YFI.
-## Core Products
+Puedes encontrar, a continuación, una breve descripción de los productos centrales de Yearn, el proceso de gobernanza y los enlaces para los canales de comunicación activos.
-### Vaults
+##Productos centrales
+###Vaults
-Capital pools that automatically generate yield based on opportunities present in the market. Vaults benefit users by socializing gas costs, automating the yield generation and rebalancing process, and automatically shifting capital as opportunities arise. End users also do not need to have a proficient knowledge of the underlying protocols involved or DeFi, thus the Vaults represent a passive-investing strategy.
+Fondos de liquidez que generan rendimiento de capital basados en oportunidades presentes en el mercado. Las Vaults benefician a los usuarios socializando el coste del gas, automatizando la generación de rendimiento de capital y balanceando el proceso así como moviendo el capital a medida que surgen nuevas oportunidades. El usuario final no necesita tener conocimientos de los protocolos subyacentes involucrados en Defi por lo que las vaults representan una estrategia de inversión pasiva.
-### Earn
+###Earn
+El primer producto de Yearn fue un agregador de préstamos. Los fondos cambiaban de dYdX, AAVE, y Compound automáticamente a medida que los ratios de interés cambiaban entre esos protocolos. Los usuarios pueden depositar en estos agregadores de préstamos en contratos inteligentes a través de la página de Yearn de Earn.
-The first Yearn product was a lending aggregator. Funds are shifted between dYdX, AAVE, and Compound automatically as interest rates change between these protocols. Users can deposit to these lending aggregator smart contracts via the Earn page. This product completely optimizes the interest accrual process for end-users to ensure they are obtaining the highest interest rates at all times among the platforms specified above.
+##Gobernanza
+El ecosistema de Yearn está controlado por los holders del token YFI los cuales se someten y votan en las propuestas off-chain que gobiernan el ecosistema. Las propuestas que generan apoyo mayoritario (>50% de los votos) son implementados por la cartera multifirma conformada por 9 miembros. Los cambios deben ser firmados por al menos 6 de los 9 miembros de la cartera multifirma para poder ser implementados. Los miembros de la cartera multifirma han sido elegidos por votación por los holders de YFI y son sujetos a cambio a través de futuros votos de gobernanza. Por favor refiérase a nuestras FAQ para la [lista de miembros de cartera multifirma] (https://docs.yearn.finance/resources/faq#who-is-on-the-multisig) y más información sobre [nuestro proceso de gobernanza] (https://docs.yearn.finance/resources/faq#governance).
-### Zap
+##Canales de comunicación
-A tool that enables users to swap into and out of (known as "Zapping") several liquidity pools available on Curve.Finance. These pools benefit from the lending aggregators discussed above, as well as earning users trading fees by partcipating as Liquidity Providers (LPs) on Curve.Fi. Currently users can use five stablecoins (BUSD, DAI, USDC, USDT, TUSD) and "Zap" into one of two pools (y.curve.fi or busd.curve.f) on Curve. Alternatively, users can "Zap" out of these two Curve pools and into one of the five base stablecoins.
+[Governance Forum] (https://gov.yearn.finance/)
-### Cover
+[Discord] (http://discord.yearn.finance)
-Insurance that enables users to obtain coverage against financial loss for various smart contracts and/or protcols on the Ethereum blockchain. Cover is underwritten by Nexus Mutual.
+[Telegram] (https://t.me/yearnfinance)
-## Governance
+[Reddit] (https://www.reddit.com/r/yearn_finance/)
-The Yearn ecosystem is controlled by YFI token holders who submit and vote on proposals that govern the ecosystem. Proposals that meet quorum requirements \(>20% of the tokens staked in the governance contract\) and generate a majority support \(>50% of the vote\) are implemented by a 9 member multi-signature wallet. Changes must be signed by 6 out of the 9 wallet signers in order to be implemented. The members of the multi-signature wallet were voted in by YFI holders and are subject to change from future governance votes. Please refer to our FAQ for [the list of the multisig signers](https://docs.yearn.finance/faq#who-are-the-9-multisig-signers).
-
-## Communication Channels
-
-Governance Forum [https://gov.yearn.finance/](https://gov.yearn.finance/)
-
-Discord [http://discord.yearn.finance](http://discord.yearn.finance)
-
-Telegram [https://t.me/yearnfinance](https://t.me/yearnfinance)
-
-Reddit [https://www.reddit.com/r/yearn_finance/](https://www.reddit.com/r/yearn_finance/)
+[Reddit](https://www.reddit.com/r/yearn_finance/)
diff --git a/SUMMARY.md b/SUMMARY.md
index 62f88d8e..9eecb8fe 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -1,43 +1,66 @@
# Table of contents
-- [Introduction to Yearn](README.md)
-- [FAQ](faq.md)
-- [DeFi Glossary](defi-glossary.md)
-- [How-To Guides](how-to-guides/README.md)
- - [How to Mint yUSD](how-to-guides/how-to-mint-yusd.md)
- - [How to Add a Custom Token to MetaMask](how-to-guides/how-to-add-a-custom-token-to-metamask.md)
- - [How To Participate in a yVault](how-to-guides/how-to-participate-in-a-yvault.md)
- - [How To Understand yVault ROI](how-to-guides/how-to-understand-yvault-roi.md)
- - [How to Understand CRV Vote Locking](how-to-guides/how-to-understand-crv-vote-locking.md)
- - [How To Make a YIP](how-to-guides/how-to-make-a-yip.md)
-- [Governance](governance.md)
-- [YFI and yTokens](yfi-and-ytokens.md)
-- [yUSD](yusd.md)
+- [Introduction](README.md)
+- [Using Yearn](using-yearn.md)
-## Products
+## Yearn Finance
-- [yVaults](products/yvaults.md)
-- [Earn](products/earn.md)
-- [Zap](products/zap.md)
-- [yInsure](products/yinsure.md)
+- [yVaults](yearn-finance/yvaults/README.md)
+ - [Overview](yearn-finance/yvaults/overview.md)
+ - [Vaults and Strategies](yearn-finance/yvaults/vaults-and-strategies.md)
+ - [Vault Tokens](yearn-finance/yvaults/vault-tokens.md)
+ - [yVault Advantages](yearn-finance/yvaults/yvault-advantages.md)
+- [Earn](yearn-finance/earn.md)
+- [Woofy](yearn-finance/woofy.md)
-## R&D
+## Governance
+
+- [YFI](governance/yfi.md)
+- [Governance and Operations](governance/governance-and-operations.md)
+- [Proposal Process](governance/proposal-process.md)
+- [Proposal Repository](governance/proposal-repository.md)
+
+## Yearn Ecosystem
+
+- [Collaborative Releases](yearn-ecosystem/collaborative-releases/README.md)
+ - [Zap](yearn-ecosystem/collaborative-releases/zap.md)
+- [R&D](yearn-ecosystem/r-and-d/README.md)
+ - [yLiquidate](yearn-ecosystem/r-and-d/yliquidate.md)
+ - [yBorrow](yearn-ecosystem/r-and-d/yborrow.md)
+ - [yTrade](yearn-ecosystem/r-and-d/ytrade.md)
+ - [ySwap](yearn-ecosystem/r-and-d/yswap.md)
+ - [StableCredit](yearn-ecosystem/r-and-d/stablecredit.md)
+ - [Delegated Funding DAO Vaults](yearn-ecosystem/r-and-d/delegated-funding-dao-vaults.md)
+- [yGift](yearn-ecosystem/ygift.md)
+
+## Resources
+
+- [Guides](resources/guides/README.md)
+ - [How to Add a Custom Token to MetaMask](resources/guides/how-to-add-a-custom-token-to-metamask.md)
+ - [How to Make a YIP](resources/guides/how-to-make-a-yip.md)
+ - [How to Understand CRV Vote Locking](resources/guides/how-to-understand-crv-vote-locking.md)
+ - [How to Understand yVault ROI](resources/guides/how-to-understand-yvault-roi.md)
+ - [How to Understand yveCRV](resources/guides/how-to-understand-yvecrv.md)
+- [Risks](resources/risks/README.md)
+ - [Protocol Risks](resources/risks/protocol-risks.md)
+ - [Strategy Risks](resources/risks/strategy-risks.md)
+ - [Vault Risks](resources/risks/vault-risks.md)
+- [Links](resources/links.md)
+- [Security Audits](resources/audits.md)
+- [Financials](resources/financials.md)
+- [FAQ](resources/faq.md)
+- [DeFi Glossary](resources/defi-glossary.md)
-- [yBorrow](r-and-d/yborrow.md)
-- [yLiquidate](r-and-d/yliquidate.md)
-- [ySwap](r-and-d/yswap.md)
-- [yTrade](r-and-d/ytrade.md)
-- [Delegated Funding DAO Vaults](r-and-d/delegated-funding-dao-vaults.md)
-- [StableCredit](r-and-d/stablecredit.md)
## Developers
+- [Naming Conventions](developers/naming-convention.md)
- [Deployed Contracts Registry](developers/deployed-contracts-registry.md)
- [Code Repositories](developers/code-repositories.md)
- [Integration Guide](developers/integration-guide.md)
-- [yVaults Documentation](developers/yvaults-documentation/README.md)
- - [Vaults Overview](developers/yvaults-documentation/vaults-overview.md)
- - [Vault Interfaces](developers/yvaults-documentation/vault-interfaces.md)
+- [v1 yVaults Documentation](developers/v1-yvaults-documentation/README.md)
+ - [v1 yVaults Overview](developers/v1-yvaults-documentation/v1-yvaults-overview.md)
+ - [v1 yVault Interfaces](developers/v1-yvaults-documentation/v1-yvault-interfaces.md)
- [Misc Resources](developers/misc-resources/README.md)
- [YIP Boilerplate](https://gist.github.com/sambacha/07c8580377cf7deec6be569322babcfd#file-yip-boilerplate-proposal-md)
- [Admin Access Policy](developers/misc-resources/adminpolicy.md)
@@ -72,12 +95,11 @@
- [yusdt](developers/misc-resources/smart-contract-integration/yusdt.md)
- [zap](developers/misc-resources/smart-contract-integration/zap.md)
-## Additional Resources
+## Contributors
-- [Team](additional-resources/team.md)
-- [Github](https://github.com/iearn-finance)
-- [Medium](https://medium.com/iearn)
-- [Gov Forum](https://gov.yearn.finance/)
-- [Discord](http://discord.yearn.finance)
-- [Telegram](https://t.me/yearnfinance)
-- [Reddit](https://www.reddit.com/r/yearn_finance/)
+- [Contribute](contributors/README.md)
+- [Contributor Tools](contributors/contributor-tools.md)
+- [Documentation](contributors/documentation/README.md)
+ - [Writing Style Guide](contributors/documentation/writing-style-guide.md)
+ - [Working on Docs](contributors/documentation/working-on-docs.md)
+- [Coordinape](https://docs.coordinape.com/)
diff --git a/additional-resources/team.md b/additional-resources/team.md
deleted file mode 100644
index 452f245b..00000000
--- a/additional-resources/team.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Team
-
-## Ops
-
-| Team Member | Twitter | Github |
-| :---------------------------------------------------------- | :-------------------------------------------------- | :------------------------------------------------- |
-| [@banteg](https://gov.yearn.finance/u/banteg) | [@bantg](https://twitter.com/bantg) | [@banteg](https://github.com/banteg) |
-| [@milkyklim](https://gov.yearn.finance/u/milkyklim) | [@milkyklim](https://twitter.com/milkyklim) | [@milkyklim](https://github.com/milkyklim) |
-| [@tracheopteryx](https://gov.yearn.finance/u/tracheopteryx) | [@tracheopteryx](https://twitter.com/tracheopteryx) | [@tracheopteryx](https://github.com/tracheopteryx) |
-
-## Protocol and Development
-
-| Team Member | Twitter | Github |
-| :-------------------------------------------------------- | :------------------------------------------------------ | :--------------------------------------------- |
-| [@andre.cronje](https://gov.yearn.finance/u/andre.cronje) | [@AndreCronjeTech](https://twitter.com/andrecronjetech) | [@andrecronje](https://github.com/andrecronje) |
-| [@doug](https://gov.yearn.finance/u/doug) | [@doug_molinam](https://twitter.com/doug_molinam) | [@dmolina79](https://github.com/dmolina79) |
-| [@fubuloubu](https://gov.yearn.finance/u/fubuloubu) | [@fubuloubu](https://twitter.com/fubuloubu) | [@fubuloubu](https://github.com/fubuloubu) |
-| [@luciano](https://gov.yearn.finance/u/luciano) | [@lbertenasco](https://twitter.com/lbertenasco) | [@lbertenasco](https://github.com/lbertenasco) |
-| [@x48](https://gov.yearn.finance/u/x48) | [@x48_crypto](https://twitter.com/x48_crypto) | [@x48-crypto](https://github.com/x48-crypto/) |
-
-## Academic "Public Good"
-
-| Team Member | Twitter | Github |
-| :------------------------------------------------ | :------ | :--------------------------------------- |
-| [@orbxball](https://gov.yearn.finance/u/orbxball) | N/A | [@orbxball](https://github.com/orbxball) |
-
-## Communications
-
-| Team Member | Twitter | Github |
-| :------------------------------------------------ | :---------------------------------------- | :----------------------------------- |
-| [@franklin](https://gov.yearn.finance/u/franklin) | [@DeFiGod1](https://twitter.com/DeFiGod1) | N/A |
-| [@fameal](https://gov.yearn.finance/u/fameal) | [@fameal](https://twitter.com/fameal) | [@fameal](https://github.com/fameal) |
-| [@Dark](https://gov.yearn.finance/u/dark) | N/A | N/A |
-
-## Community Grants
-
-In addition to the team members above, Yearn Finance also rewards community contributions. See [Announcements](https://gov.yearn.finance/c/announcement/14) for grants awarded to team members.
diff --git a/archived/features.md b/archived/features.md
index c14ffcaf..14ff9d99 100644
--- a/archived/features.md
+++ b/archived/features.md
@@ -1,21 +1,21 @@
## Features
-- Add support for dYdx, Compound, Aave, and Fulcrum [APR](https://github.com/iearn-finance/apr-oracle/blob/master/contracts/APROracle.sol)
-- Swap between ETH and any asset via on-chain dex aggregators for minimum [slippage](https://github.com/iearn-finance/zap/blob/master/contracts/UniSwap_ETH_cDAI.sol)
-- [Uniswap liquidity provider strategy](https://github.com/iearn-finance/zap/blob/master/contracts/UniSwap_ETH_cDAI.sol)
-- [ETH to DAI into aprDAI strategy](https://github.com/iearn-finance/zap/blob/master/contracts/UniSwap_ETH_cDAI.sol)
-- [aprDAI into DAI into ETH strategy](https://github.com/iearn-finance/zap/blob/master/contracts/UniSwap_ETH_cDAI.sol)
-- [issue](https://github.com/iearn-finance/itoken/blob/master/contracts/IEther.sol) representative interest token on invest
-- [shares pool calculation](https://github.com/iearn-finance/itoken/blob/master/contracts/IEther.sol)
-- [shares redemption strategy](https://github.com/iearn-finance/itoken/blob/master/contracts/IEther.sol)
-- [pool value calculation](https://github.com/iearn-finance/itoken/blob/master/contracts/IEther.sol)
+- Add support for dYdx, Compound, Aave, and Fulcrum [APR](https://github.com/yearn/apr-oracle/blob/master/contracts/APROracle.sol)
+- Swap between ETH and any asset via on-chain dex aggregators for minimum [slippage](https://github.com/yearn/zap/blob/master/contracts/UniSwap_ETH_cDAI.sol)
+- [Uniswap liquidity provider strategy](https://github.com/yearn/zap/blob/master/contracts/UniSwap_ETH_cDAI.sol)
+- [ETH to DAI into aprDAI strategy](https://github.com/yearn/zap/blob/master/contracts/UniSwap_ETH_cDAI.sol)
+- [aprDAI into DAI into ETH strategy](https://github.com/yearn/zap/blob/master/contracts/UniSwap_ETH_cDAI.sol)
+- [issue](https://github.com/yearn/itoken/blob/master/contracts/IEther.sol) representative interest token on invest
+- [shares pool calculation](https://github.com/yearn/itoken/blob/master/contracts/IEther.sol)
+- [shares redemption strategy](https://github.com/yearn/itoken/blob/master/contracts/IEther.sol)
+- [pool value calculation](https://github.com/yearn/itoken/blob/master/contracts/IEther.sol)
## Features 27-01-2020
- Add support for [Chai](https://chai.money/) as an option
- Completed [uniroi.iearn.eth](https://etherscan.io/address/0xd04ca0ae1cd8085438fdd8c22a76246f315c2687#readContract) and liquidity considerations
- Completed [uniapr.iearn.eth](https://etherscan.io/address/0x4c70D89A4681b2151F56Dc2c3FD751aBb9CE3D95#readContract) for APR considerations
-- Added [walkthrough example](https://docs.iearn.finance/walkthrough)
+- Added [walkthrough example](https://docs.yearn.finance/how-to-guides)
## Features 31-01-2020
@@ -51,7 +51,7 @@
- Added to [duneanalytics.com](https://www.duneanalytics.com/) dashboards
- Integrated [renproject.io](https://renproject.io/)
- Curve Finance yToken pool deployed to [y.curve.fi](https://y.curve.fi/)
-- Added [Nexus Mutual](https://app.nexusmutual.io/#/SmartContractCover) cover for [iearn.finance](http://iearn.finance/) and [y.curve.fi](https://y.curve.fi/)
+- Added [Nexus Mutual](https://app.nexusmutual.io/#/SmartContractCover) cover for iearn.finance and [y.curve.fi](https://y.curve.fi/)
- [paraswap.io](https://paraswap.io/#/DAI-TUSD/1000) integrates [y.curve.fi](https://y.curve.fi/)
- [defisnap.io](https://www.defisnap.io/) included v2 yTokens
- [0x](https://0x.org/) integrates [y.curve.fi](https://y.curve.fi/)
diff --git a/archived/resources.md b/archived/resources.md
index 63ac5bb8..884352a4 100644
--- a/archived/resources.md
+++ b/archived/resources.md
@@ -1,22 +1,22 @@
-## [iearn.finance](https://iearn.finance)
+## [iearn.finance](https://yearn.finance/earn)
-[iearn.finance](https://iearn.finance) is a Yield aggregator for lending platforms that rebalances for highest yield during contract interaction.
+[iearn.finance](https://yearn.finance/earn) is a Yield aggregator for lending platforms that rebalances for highest yield during contract interaction.
## [y.curve.fi](https://y.curve.fi)
-This [curve.fi](https://www.curve.fi/) pool uses yTokens, assets inside the [iearn.finance](https://iearn.finance) protocol, as the liquidity pool - this ensures that assets are always being put to work.
+This [curve.fi](https://www.curve.fi/) pool uses yTokens, assets inside the [iearn.finance](https://yearn.finance/earn) protocol, as the liquidity pool - this ensures that assets are always being put to work.
## Quick deposit / withdraw
-Zap In/Out of [iearn.finance](https://iearn.finance) and swap between [curve.fi](https://www.curve.fi/) pools
+Zap In/Out of [iearn.finance](https://yearn.finance/earn) and swap between [curve.fi](https://www.curve.fi/) pools
-[iearn.finance/zap](https://iearn.finance/zap)
+[iearn.finance/zap](https://yearn.finance/zap)
## On-chain APR
Check out on-chain APR live at
-[iearn.finance/apr](https://iearn.finance/apr)
+[iearn.finance/apr](https://yearn.finance/stats)
## Analytics
@@ -34,4 +34,4 @@ ENS: iearn.nexusmutual.eth and curvev1.nexusmutual.eth
Buy Insurance via [Opyn](http://opyn.co/) here;
-[iearn.finance/cover](https://iearn.finance/cover)
+[iearn.finance/cover](https://opyn.co/#/buy)
diff --git a/archived/strategies.md b/archived/strategies.md
index fe956ede..a657c7d5 100644
--- a/archived/strategies.md
+++ b/archived/strategies.md
@@ -8,7 +8,7 @@ These docs are still being worked on.
[1split.eth](https://etherscan.io/address/1split.eth#code) is an on-chain dex aggregator developed by [1inch.exchange](https://1inch.exchange/). The contract allows on-chain quotes and swaps between all ERC20 assets from MultiSwap, Oasis, 0x, Kyber, Uniswap, Synthetix, Synth Depot, Bancor, Airswap, and Curve.fi.
-This allows [iearn.finance](https://iearn.finance) to aggregate the best rates on-chain without any slippage for token swaps, when trying to determine the value in the strategy. The quote functionality is used to determine slippage and to calculate that into the overall strategy.
+This allows [iearn.finance](https://yearn.finance/earn) to aggregate the best rates on-chain without any slippage for token swaps, when trying to determine the value in the strategy. The quote functionality is used to determine slippage and to calculate that into the overall strategy.
## apr.iearn.eth
@@ -28,10 +28,10 @@ The ROI is required for snapshots to be able to get 30 day, 7 day, or APR averag
## defizap.eth
-- ETH split via [1split.eth](https://etherscan.io/address/1split.eth#code) into wBTC and ETH. wBTC deposited into iWBTC. Uniswap liquidity for iWBTC/ETH. [wBTCUnipool.DeFiZap.eth](https://defizap.com/zaps/unipoolwbtc) [4.21%](https://pools.fyi/#/returns/0x4d2f5cfba55ae412221182d8475bc85799a5644b)
-- ETH split via [1split.eth](https://etherscan.io/address/1split.eth#code) into sETH and ETH. Uniswap liquidity for sETH/ETH [sETHUnipool.DeFiZap.eth](https://defizap.com/zaps/unipoolseth) [1.75%](https://pools.fyi/#/returns/0xe9cf7887b93150d4f2da7dfc6d502b216438f244)
-- ETH split via [1split.eth](https://etherscan.io/address/1split.eth#code) into DAI and ETH. DAI deposited into [Chai](https://chai.money/). Uniswap liquidity for CHAI/ETH. [CHAIUnipool.DeFiZap.eth](https://defizap.com/zaps/unipoolchai) [-5.25%](https://pools.fyi/#/returns/0x6c3942b383bc3d0efd3f36efa1cbe7c8e12c8a2b?period=30)
-- ETH split via [1split.eth](https://etherscan.io/address/1split.eth#code) into DAI and ETH. DAI deposited in [cDAI](https://compound.finance/). Uniswap liquidity for cDAI/ETH [cDAIPool.DeFiZap.eth](https://defizap.com/zaps/unipoolcdai) [4.79%](https://pools.fyi/#/returns/0x34E89740adF97C3A9D3f63Cc2cE4a914382c230b?period=30)
+- ETH split via [1split.eth](https://etherscan.io/address/1split.eth#code) into wBTC and ETH. wBTC deposited into iWBTC. Uniswap liquidity for iWBTC/ETH. [wBTCUnipool.DeFiZap.eth](https://zapper.fi/invest) [4.21%](https://pools.fyi/#/returns/0x4d2f5cfba55ae412221182d8475bc85799a5644b)
+- ETH split via [1split.eth](https://etherscan.io/address/1split.eth#code) into sETH and ETH. Uniswap liquidity for sETH/ETH [sETHUnipool.DeFiZap.eth](https://zapper.fi/invest) [1.75%](https://pools.fyi/#/returns/0xe9cf7887b93150d4f2da7dfc6d502b216438f244)
+- ETH split via [1split.eth](https://etherscan.io/address/1split.eth#code) into DAI and ETH. DAI deposited into [Chai](https://chai.money/). Uniswap liquidity for CHAI/ETH. [CHAIUnipool.DeFiZap.eth](https://app.uniswap.org/#/add/ETH/0x06AF07097C9Eeb7fD685c692751D5C66dB49c215) [-5.25%](https://pools.fyi/#/returns/0x6c3942b383bc3d0efd3f36efa1cbe7c8e12c8a2b?period=30)
+- ETH split via [1split.eth](https://etherscan.io/address/1split.eth#code) into DAI and ETH. DAI deposited in [cDAI](https://compound.finance/). Uniswap liquidity for cDAI/ETH [cDAIPool.DeFiZap.eth](https://app.uniswap.org/#/add/ETH/0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643) [4.79%](https://pools.fyi/#/returns/0x34E89740adF97C3A9D3f63Cc2cE4a914382c230b?period=30)
## uniswap.exchange
@@ -41,7 +41,7 @@ Uniswap is an on-chain liquidity pool for cross ERC20/ETH swaps. It allows ERC20
## iearn.eth
-[iearn.finance](https://iearn.finance) is a combination of these strategies. It analyzes the asset you want to invest and the highest returning strategy for it. So for ETH, it would analyze ETH vs cETH vs iETH vs aETH vs dETH. It would add % slippage as an adjusted result to offset the APR. After which it will calculate the highest volume pools that match the tokens. These strategies can be as simple as ETH into Compound, or as complex as ETH split to ETH/DAI, DAI into cDAI, and ETH/cDAI into Uniswap.
+[iearn.finance](https://yearn.finance/earn) is a combination of these strategies. It analyzes the asset you want to invest and the highest returning strategy for it. So for ETH, it would analyze ETH vs cETH vs iETH vs aETH vs dETH. It would add % slippage as an adjusted result to offset the APR. After which it will calculate the highest volume pools that match the tokens. These strategies can be as simple as ETH into Compound, or as complex as ETH split to ETH/DAI, DAI into cDAI, and ETH/cDAI into Uniswap.
This is what the [iearn.finance] protocol does.
diff --git a/contributors/README.md b/contributors/README.md
new file mode 100644
index 00000000..813d6ff9
--- /dev/null
+++ b/contributors/README.md
@@ -0,0 +1,128 @@
+# Contribute
+
+## Yearn Contributors
+
+Help build the future of finance, shape your skills, and grow the Yearn ecosystem. Before joining our community, take some time to understand the philosophy behind Yearn through the [Yearn Manifesto](https://gov.yearn.finance/t/how-we-think-about-yearn/7137).
+
+## How to Contribute
+
+### Have an idea?
+
+We are always open to new suggestions or better ways of doing things. If you have an idea feel free to use the appropriate channel on [Discord](http://discord.yearn.finance), [Reddit](https://www.reddit.com/r/yearn_finance/), or make a post on the governance [forum](https://gov.yearn.finance/c/general-chat/7). If the idea is thorough enough, make a post in the [Proposals](https://gov.yearn.finance/c/proposals/5) section on the governance forum and be sure to follow the Proposal [Guidelines](https://gov.yearn.finance/t/proposal-how-to/106). Check previous [YIPs](https://yips.yearn.finance/all-yip) for guidance.
+
+### File a Bug
+
+If a Yearn product isn't working, please visit the appropriate Github repository listed under [General Resources](#general-resources) — or search in the [Yearn Github Repo](https://github.com/yearn/yearn-protocol) — to see if the issue already exists.
+
+If it does not exist, please create a new issue following the template present in the repository.
+
+If no issue template is present, please include information such as your browser version, device, etc. for that project so the developers can replicate it and fix it.
+
+If the issue already exists, you can signal your support by adding a thumbs up to the existing issue or by adding helpful information.
+
+### Leave Feedback
+
+Use the [Feedback](https://gov.yearn.finance/c/feedback/2) section of the governance forum to provide feedback.
+
+### Write Documentation
+
+The Yearn ecosystem is expanding and, as a result, so is the need for documentation. You can find the "official" Yearn Documentation [here](https://docs.yearn.finance/) — which provides high-level overviews _and_ technical documentation.
+
+Whether its writing _How To_ guides on using vaults or creating diagrams on how the protocol ties together, there is something for everyone. If you speak another language, translations might be up your alley!
+
+You can see our progress on the [Github Project Board](https://github.com/orgs/yearn/projects/2) where you can look through any issue that interests you. Before contributing: Please see our [How to Use Github](https://hackmd.io/4U35op0ORoGT24lzPhbGNQ) guide and ensure that your PRs adhere to our [Writing Style Guide](https://hackmd.io/dXQecpkJQX6XRy4y7k7j3g).
+
+We use a combination of HackMD, Gitbook, and Github for our [Documentation](https://docs.yearn.finance/) and we use [DrawIO](https://draw.io) with Google Drive for our diagrams & schemas. If you are a grammar stickler, you can see our [Reviewer Guide](https://hackmd.io/juTKNn3xTpKJgFDo2AglLw).
+
+Last, but not least, join the #documentation channel in [Discord](https://discord.com/invite/6PNv2nF) and introduce yourself.
+
+If this sounds confusing, please let us know what we can clear up. In the meantime: You can begin contributing to our HackMD docs immediately via the Github issues — we'll guide you through the rest.
+
+### Build
+
+#### Developers
+
+If you're a developer we need your help! Before you begin: Familiarize yourself with Yearn, its products, and its infrastructure by reading our [Documentation](https://docs.yearn.finance/).
+
+You can see our progress on our [Github Project Board](https://github.com/orgs/yearn/projects/1) and you can immediately begin contributing where you see fit. We recommend checking out issues tagged as `help wanted` and recommend sticking to the respective repository's coding guidelines (linting, formatting, PRs, etc). It's that simple 🙂. You can also join us on the #dev channel in [Discord](https://discord.com/invite/6PNv2nF).
+
+If you are interested in working on a specific project, check out the list of Yearn products in the [General Resources](#general-resources) section below or check out our list of repos [here](https://docs.yearn.finance/developers/code-repositories).
+
+If you want an overview on how our services interact with one another in Vaults, please see the schema and accompanying descriptions in the [Vaults Overview](https://docs.yearn.finance/yearn-finance/yvaults/overview).
+
+If you're wondering how **strategies** work, please check out [ETHOnline 🛠️ Yearn Strats 101](https://www.youtube.com/watch?v=4gwZk-IaMRs) — hosted by our Yearn Devs. To start writing a Strategy of your own, please visit the [Yearn Starter Pack Repo](https://github.com/yearn/yearn-starter-pack).
+
+If you are looking to integrate with Yearn, please visit our [Integration Guide](https://docs.yearn.finance/developers/integration-guide) and check out our [Interface Documentation](https://docs.yearn.finance/developers/misc-resources/smart-contract-integration).
+
+#### Designers
+
+We invite designers, animators, artists, and more to share your skills with the Yearn ecosystem! If you're interested in creating graphics that describe Yearn's systems, creating video explainers, fixing Yearn's UI/UX, or any other combination of things — hop into the #ui-ux channel or #media-resources channels in [Discord](https://docs.yearn.finance/developers/yvaults-documentation/vault-interfaces).
+
+## Yearn Contributors
+
+See our wonderful list of contributors along with individual contribution stats at [yContributors.finance](https://ycontributors.finance/). Get your name added to the list by contributing to documentation, code, designs, or whatever else you're interested in!
+
+#### Creating Strategies
+
+##### Workshop
+
+The best introduction to V2 is the workshop did by Doug (https://github.com/dougstorm/). Even its focused on security, it's a great introduction to Vaults V2.
+
+- [Video](https://www.youtube.com/watch?v=C0fsYiCI54g)
+- [Slides](https://docs.google.com/presentation/d/1NsePa_hXV1vsbMixTSRsPKYBHYvmVQf7IvpI_8k4p_k/edit#slide=id.p)
+- [Repository](https://github.com/dougstorm/yearn-vaults-v2-intro/tree/feat/kernel-session)
+
+##### Start coding
+
+When you decide to start, this reading material is going to come handy:
+
+- [Template for Strategies](https://github.com/yearn/brownie-strategy-mix)
+- [Vaults V2 Repository](https://github.com/yearn/yearn-vaults)
+- [How to set up coding environment for Yearn Strategies](https://sambacha.github.io/yearn-vaults/index.html)
+- [Mint your own DAI](https://medium.com/ethereum-grid/forking-ethereum-mainnet-mint-your-own-dai-d8b62a82b3f7)
+- [Dev Docs](https://docs.yearn.finance/developers/deployed-contracts-registry)
+
+Once you have the strategy ready. This will guide you further down the road.
+
+- [Vault naming standard](https://github.com/iearn-finance/yearn-assets/blob/master/naming-standard.md)
+- [Release process](https://github.com/yearn/yearn-vaults/blob/master/docs/OPERATIONS.md)
+- [Security check](https://docs.google.com/document/d/1hBKB73kJPQM71enrG8xoSFj7wxYmczUlgigyq2KkcTE/edit#heading=h.4ieoeyetfrxm)
+
+##### Other reading material
+
+This is complement to the others but it's not directly related to creating strategies.
+
+- [The Keep3r Network](https://macarse.medium.com/the-keep3r-network-experiment-bb1c5182bda3)
+- [Andre intro to Yearn Vaults](https://medium.com/iearn/yearn-finance-v2-af2c6a6a3613)
+- [Delegated vaults explanation](https://medium.com/iearn/delegated-vaults-explained-fa81f1c3fce2)
+
+## General Resources
+
+### Yearn Products
+
+- [Yearn.Finance](https://yearn.finance/), [Github](https://github.com/yearn/iearn-finance)
+- [Yearn Governance](https://ygov.finance/), [Github](https://github.com/yearn/ygov-finance)
+- [Yearn Insurance](https://yinsure.finance/), [Github](https://github.com/yearn/yinsure-finance)
+- [Yearn Borrow](https://yborrow.finance/), [Github](https://github.com/yearn/iborrow-finance)
+- [Yearn Swap](https://yswap.exchange/), [Github](https://github.com/yearn/yswap-finance)
+- [Yearn Documentation](https://docs.yearn.finance/), [Github](https://github.com/yearn/yearn-docs)
+- [Yearn Forum](https://gov.yearn.finance/)
+
+#### List of Yearn Tools
+
+- Yearn Discord FAQ Bot, [Github](https://github.com/dgornjakovic/yfi-faq-bot)
+- [Yearn Party](https://yearn.party/), [Github](https://github.com/x48-crypto/yearn-party)
+- [Yearn Tools (Based off Yearn API)](https://yearn.tools/), [Github](https://github.com/yearn-integrations/api)
+
+#### Contributors Websites
+
+- [yCosystem (Yearn Community Aggregator)](https://ycosystem.info/) - Repository Of Yearn Links
+- [Vaults Finance](https://vaults.finance/) - One click deposit into vaults
+- [LearnYearn](https://learnyearn.finance/) Additional explainers and content
+- [Feel the Yearn](https://feel-the-yearn.app/vaults) - Vault Statistics
+- [YFI Address Stats](https://www.yfistats.com/) - TVL and vault pricing information built by @Bob_The_Buidler
+- [Yieldfarming](https://yieldfarming.info/), [Github](https://github.com/yieldfarming/yieldfarming)
+- [Feel-the-yearn](https://feel-the-yearn.app) - Table of current active strategies
+- [yVault ROI Calculator](https://yvault-roi.netlify.app/)
+- [Yearn Snapshot](https://yearn.snapshot.page/)
+- [Yearn Newsletter](https://yearn.substack.com/) - Weekly YFI newsletter run by [@yfi_nomad](https://twitter.com/yfi_nomad)
diff --git a/contributors/contributor-tools.md b/contributors/contributor-tools.md
new file mode 100644
index 00000000..9bf9f1bd
--- /dev/null
+++ b/contributors/contributor-tools.md
@@ -0,0 +1,185 @@
+# Contributor Tools
+
+This Guide introduces the tools used by the Yearn Community team and its contributors.
+
+Yearn contributors work with tools geared towards promoting open-source feedback, communication, transparency, and clarity. While there is no sophisticated software stack, contributors should be comfortable with the more heavily used tools and how they function within Yearn contribution workflows.
+
+## Discussion Platforms
+
+### Discord
+
+Various Yearn teams (documentation, development etc) host AMAs, ideation, discussions, and follows-ups on Yearn's Discord Channel, an open-source platform geared towards improving team communication. The [Yearn Discord](http://discord.yearn.finance/) lists all channels and users.
+
+Start participating in public discussions by joining the recommended channels below.
+
+- [#general](https://discord.com/channels/734804446353031319/734862139386232902)
+- [#governance](https://discord.com/channels/734804446353031319/734805853768777738)
+- [#support](https://discord.com/channels/734804446353031319/734811808401063966)
+- [#dev](https://discord.com/channels/734804446353031319/735311380646723684)
+- [#documentation](https://discord.com/channels/734804446353031319/748476302121762866)
+
+**Pro Tips:**
+
+- Visit [#documentation](https://discord.com/channels/734804446353031319/748476302121762866) regularly.
+ - It's an excellent channel for collaboration.
+- Coordinate with other members.
+- Share early and share often.
+- Ask for feedback.
+- Provide progress updates.
+
+### Meetings
+
+Yearn contributors host meetings when necessary on Google Hangouts. These are not centrally organized and arise organically within discussions between contributors or teams, as such, invitations are up to the individuals organizing these discussions. Invitations are sent to contributors by Discord or Telegram and Google Calendar automatically schedules the event and sends reminders.
+
+- [Jitsi Meet](http://meet.jit.si)
+- [Google Meet](https://meet.google.com/_meet)
+
+## Writing Platforms
+
+### HackMD
+
+Many Yearn Doc contributors prepare their long-form documentation in [HackMD](https://hackmd.io/), a collaborative Markdown editor. HackMD also tracks versions, enables commenting, and allows multiple users to work on a document simultaneously.
+
+**Note:** Run all drafts through [Grammarly](https://app.grammarly.com/) regularly, and before final submissions.
+
+- Grammarly will catch most spelling and grammatical errors.
+ - Review the suggestions to make sure they make sense.
+ - **Do not blindly accept Grammarly edits.**
+- HackMD does not identify spelling and grammatical errors.
+ - Copy text from the rendered preview into Grammarly and address any errors it flags.
+ - Grammarly will miss errors if it’s given raw Markdown text.
+
+**Pro Tip:**
+Install the HackMD Google Chrome [extension](https://chrome.google.com/webstore/detail/hackmd-it/cnephjboabhkldgfpdokefccdofncdjh?hl=en) to make searching easier.
+
+### Gitbook
+
+Yearn Documentation contributors use Gitbook as a graphical user interface (GUI) to edit content and update personal Github repositories. It is an in-browser editor and as a result improves efficiency compared to using special programs which may be more difficult for non-technical users to navigate.
+
+### Google Docs
+
+Google Docs is a collaborative writing platform, with features like suggestion editing and version naming. Docs simplify feedback and review and are easy to share between team members and contributors.
+
+**Suggestions:**
+
+- Start new projects and create first drafts in Google Docs.
+- Use "Suggesting Mode" and leave "Notes" when reviewing a document.
+ - Suggestions draw attention to proposed changes.
+ - Notes leave room for side discussions.
+- Avoid including direct links in a Google Doc.
+ - Use the Markdown format to simplify conversion later on.
+ - Incorrect: `https://bad.link.com`
+ - Correct: `[link](https://link.com)`
+- Versions can be named, renamed, downloaded, or revisited at any time.
+ - Versions help other contributors quickly find and see any changes.
+ - Example: Naming a Version
+- Make sure to name versions before passing projects off for review.
+ - Use descriptive names for versions.
+ - Names should contain information specific to the contents of the file or version.
+- Include a version number in the name, along with any other relevant details.
+ - Numbers after the decimal define draft iterations.
+ - Example: V0.1, V0.2, V1.2, etc.
+
+### Markdown
+
+Yearn documents hosted on GitHub are written in Markdown, a plaintext formatting syntax. Markdown allows for easy conversion to HTML and various other outputs, making documents easy to read on the web.
+
+- Learn the basics of Markdown:
+ - [Daring Fireball](https://daringfireball.net/projects/markdown/)
+ - [Markdown Syntax Guide](https://guides.github.com/features/mastering-markdown/)
+ - [Practice Communicating Using Markdown](https://lab.github.com/githubtraining/communicating-using-markdown)
+
+### VSCode
+
+If you are using Google Docs to write, consider using Visual Studio Code and install the extensions below to facilitate formatting:
+
+- Markdown Preview Enhanced
+- Markdown Linter
+- Code Spell Checker
+- GitLens
+- Prettier
+ - Prettier will auto-correct most Markdown mistakes.
+- The [vscode-markdownlint](https://github.com/DavidAnson/vscode-markdownlint#configure) GitHub repo describes how to edit the error settings JSON file.
+ - Use it to address any Markdown errors that follow the Writing Style Guide.
+- How to integrate GitHub with VSCode:
+ - **Video:** [Up and Running with Visual Studio Code and GitHub](https://youtu.be/ghL-KlAhBnc)
+
+## Tools and Tips
+
+### Writing Specific
+
+#### Best Practices
+
+- Include line breaks above and below headings.
+- Use top-level headers `#` only once per document.
+ - Do not make multiple top-level headings.
+- Avoid repeat headings.
+ - They will break auto-generated navigation.
+- Avoid trailing spaces.
+- Do not use:
+ - Em or en [dashes](https://en.wikipedia.org/wiki/Wikipedia:Hyphens_and_dashes): `—`.
+ - Ampersands `&` in titles and headers.
+ - Pipes `|` in titles and headers.
+ - Curly quotes. Use the plaintext version.
+ - **Correct:** `"`
+ - **Incorrect:** `“`
+ - Escaping parentheses. Use normal parentheses.
+ - **Correct:** `(SOMETHING)`
+ - **Incorrect:** `\(SOMETHING\)`
+- Add tasks using check-boxes as projects grow.
+ - A dash and brackets (`- []`) on a new line show up as a check-box in GitHub's UI.
+ - **Example:**
+ - \[ \]
+- Ensure there is a single hard return at the end of a .md file.
+- Use in-text comments for extra visibility when collaborating with other contributors on HackMD documents.
+ - Click on the comment icon in the toolbar and choose an appropriate style.
+ - Consider including a timestamp or username:
+ - **Markdown:** `> Look Here! [name=John Doe]`
+ - **Rendered:** `Look Here! \[name=John Doe\]`
+ - Make sure to delete comments before submitting Pull Requests.
+- Use an emoji to call attention to an important point, when necessary.
+ - Practice discretion and use them sparingly.
+ - Do not load documents with emojis.
+ - This [cheat sheet](https://gist.github.com/rxaviers/7360908) lists emojis and their Markdown shortcuts.
+
+#### Naming Files and Versions
+
+- Markdown file names should be lowercase.
+- Use dashes `-`, not spaces, to separate words within Markdown file names.
+ - **Correct:** `meeting-transcript-ep-01.md`
+ - **Incorrect:** `Meeting Transcript Episode 01.md`
+- Use descriptive names for Markdown files and versions.
+ - Filenames should contain information specific to the contents of the file.
+ - Context is provided from the directory or through the presentation layer (e.g., GitBooks).
+ - **Correct:** `meeting-summary-ep-01.md`
+ - **Incorrect:** `scientific-governance-and-risk-meeting-summary-ep-01.md`
+
+**Pro Tip:**
+For a document's final draft, name it "Final draft, moving to GitHub." Post a link to the HackMD file or a relevant page on GitHub.
+
+### Miscellaneous
+
+#### Important Links
+
+- [GitHub Desktop](https://desktop.github.com/)
+- [Broken Link Checker](https://ahrefs.com/broken-link-checker)
+- [Code Blocks](https://gsuite.google.com/marketplace/app/code_blocks/100740430168?pann=cwsdp&hl=en): for formatting blocks of code in a doc or adding Markdown.
+- [Markdown Conversion](https://github.com/lmmx/gdocs2md-html): for Google Drive.
+ - A long [stack-exchange thread](https://webapps.stackexchange.com/questions/44047/how-can-google-docs-and-markdown-play-nice) on this use case.
+- [DrawIO](https://draw.io/): Open source software using Google Drive for createing flowcharts and schemas.
+- [Figma](https://www.figma.com/): Creates visual mockups, especially for team collaboration.
+
+#### Wallets and 3rd Party Services
+
+- [Metamask](https://metamask.io/): Wallet for sending and receiving YFI
+- [Zerion](https://zerion.io/): For checking Yearn Treasury statistics.
+
+#### Keyboard Shortcuts
+
+- [Mac Shortcuts](https://www.mediaatelier.com/CheatSheet/?ref=producthunt)
+- [Windows Shortcuts](https://cheatkeys.com/)
+- [Use The Keyboard](https://usethekeyboard.com/): Open-source collection of keyboard shortcuts for Mac apps, Windows programs, and websites.
+
+### Acknowledgments
+
+This document could not be possible without the amazing work done by the MakerDAO team as this document is mostly based on their [Contributor Tools Guide](https://github.com/makerdao/community-portal/blob/r2d/content/en/contribute/content/contributor-tools.mdx).
diff --git a/contributors/documentation/README.md b/contributors/documentation/README.md
new file mode 100644
index 00000000..d397c66d
--- /dev/null
+++ b/contributors/documentation/README.md
@@ -0,0 +1,5 @@
+# Documentation
+
+{% page-ref page="writing-style-guide.md" %}
+
+{% page-ref page="working-on-docs.md" %}
\ No newline at end of file
diff --git a/contributors/documentation/working-on-docs.md b/contributors/documentation/working-on-docs.md
new file mode 100644
index 00000000..82951eed
--- /dev/null
+++ b/contributors/documentation/working-on-docs.md
@@ -0,0 +1,131 @@
+# How to contribute to docs
+
+**IF YOU HAVE ANY QUESTIONS** post in the #documentation channel on [discord](https://discord.gg/vqhqQT7s)
+
+Yearn's documentation repository is hosted on GitHub in order to foster and encourage open source collaboration.
+
+*Note for translators: Non-english docs are store in separate branches. When merging your changes, direct your pull request to the corresponding branch*
+
+---
+
+## Working with HackMD
+
+In order to contribute to Yearn docs, you will need to be able to write with Markdown syntax. It's extremely easy to learn. Use this [cheat sheet](https://www.markdownguide.org/cheat-sheet/) to get started.
+
+If you have no experience cloning and working on a repository, you can make your edits or additions in [HackMD](https://hackmd.io) and then create an issue in GitHub that contains the Markdown copy. Just create a profile on Discord, and that can be linked to create a HackMD account.
+
+Here's how to contribute using issues:
+
+1\. Create an issue in https://github.com/yearn/yearn-docs
+
+
+ 
+
+
+2\. Title your proposed changes - Make it clear what you are editing or adding.
+
+3\. Paste the changes directly from your HackMD into the 'Write' section.
+
+4\. Click 'Submit new issue'.
+
+
+ 
+
+
+---
+
+## Editing through the documentation UI
+
+Another simple way to contribute is through the built in 'Edit on GitHub' button that you will see on all pages of Yearn docs. For this, you won't need to use HackMD at all, just make sure to have a GitHub account.
+
+1\. Find the 'Edit on GitHub' button on the top right of the docs page.
+
+
+ 
+
+
+2\. Find the pencil button on the GitHub page that opens. It will say 'Edit the file in your fork of this project'
+
+
+ 
+
+
+3\. From here, you will be able to edit any of the copy. Once you're finished, give your changes a title and a description at the bottom and 'Propose Changes'
+
+
+
+
+
+4\. After you 'Propose changes' GitHub will create a branch of the yearn-docs repository for you and show a summary of the changes you made. If everything looks right and complies with the [Writing Style Guide](https://docs.yearn.finance/contributors/writing-style-guide), click 'Create pull request'
+
+5\. In your pull request (PR), give enough context about your changes for the repo admin to understand why they should be accepted. Afterwards, click 'Create pull request' and the admins will either merge, deny or make a comment.
+
+
+ 
+
+
+---
+
+## Cloning the docs repository
+
+Cloning a repository is ideal if you are working on more than one page.
+
+**This is a basic guide that doesn't involve using the command prompt.** There are multiple ways to go about cloning and contributing to a repository. We encourage you to learn more about GitHub as it will help you troubleshoot any issues that you might encounter.
+
+1\. Login to your GitHub account.
+
+2\. Install [GitHub Desktop](https://desktop.github.com).
+
+3\. Install [Visual Code Studio](https://code.visualstudio.com). (VSCode)
+
+4\. Fork the [yearn/yearn-docs](https://github.com/yearn/yearn-docs) repository
+ - If you are translating, fork the branch that has the name of the language you are translating to. For example, Portuguese is the [portuguese](https://github.com/yearn/yearn-docs/tree/portuguese) docs are contained branch. You will need the same file structure as this branch to merge changes into it.
+
+
+ 
+
+
+5\. Login to GitHub Desktop, find your forked repository and clone it
+
+
+ 
+
+
+6\. Click 'contribute to parent project'. This only effects your upstream and origin and upstream branch, which can be edited through the command line
+7\. Open the repository in VSCode
+
+
+ 
+
+
+8\. Create a new branch and give it a title that has to do with your current task. Keeping different tasks in different branches is important for organizational purposes.
+
+9\. Find the page you are looking to edit in VSCode's sidebar. They follow the same structure as the GitBook UI. README.md will always be.
+
+
+ 
+
+
+10\. Edit the .md file, save it and minimize VSCode.
+
+11\. GitHub Desktop will now show that you have changed a file. Give your change (commit) a title and description, then click 'commit to master'.
+
+
+ 
+
+
+12\. Now, your changes are committed to your local branch. In order to push them to your public GitHub repo, click 'publish branch'.
+
+13\. You now see a notification suggesting to make a pull request (PR) both on GitHub Desktop and the website. If you don't see this, you can go to https://github.com/yearn/yearn-docs and create one from there.
+
+14\. Click on 'create pull request' and you should see the following screen.
+
+
+
+
+
+15\. Make sure the base repository is 'yearn/yearn-docs' and the base is 'master'. (unless you are contributing to translated versions, in which case, the base should be the name of the language you are translating) The head repository should be 'your-username/yearn-docs' and the compare should be 'your-branch-name'.
+
+16\. Make sure that your PR has all of the information needed to contextualize the change and that your changes comply with the [Writing Style Guide](https://docs.yearn.finance/contributors/writing-style-guide). Once you create a pull request, it will be sent to the repo admins who can approve it to be merged into the live site.
+
+
diff --git a/contributors/documentation/writing-style-guide.md b/contributors/documentation/writing-style-guide.md
new file mode 100644
index 00000000..9301a05e
--- /dev/null
+++ b/contributors/documentation/writing-style-guide.md
@@ -0,0 +1,301 @@
+# Writing Style Guide
+
+The Yearn Community Writing Style Guide summarizes the standards and best practices **writers** should follow when contributing to Yearn Documentation resources.
+
+## Writing Intent and Tone
+
+Yearn Community materials should cater to readers who are unfamiliar with the Yearn ecosystem. Writers should also assume that their readers have tight schedules and short attention spans, as after all, farming is honest but hard work.
+
+As such, Writers should focus on communicating concepts as clearly and succinctly as possible.
+
+- Use simple language.
+- Use short, concise sentences.
+- Avoid unnecessary words.
+- Remain open and objective.
+- Provide examples when possible.
+- Provide examples to help explain concepts, but avoid overcomplicating them.
+ - Use math when necessary, but keep it simple and visually easy to understand.
+- Link to basic terms if necessary.
+
+## Writer Guidelines
+
+### General Rules
+
+- Run all drafts through [Grammarly](https://app.grammarly.com/) regularly, and before final submissions.
+ - Grammarly will catch most spelling and grammatical errors.
+ - Copy rendered text into Grammarly and address any mistakes it flags.
+ - HackMD does not identify spelling and grammatical errors.
+ - Grammarly will miss errors if it’s given raw Markdown text.
+ - Be careful of copy and pasting code from Grammarly to VScode, Grammarly may mess with formatting.
+
+**Please Note**
+
+- When migrating to a new document (i.e., from Google Docs to HackMD):
+ - Leave a note in the old file.
+ - Provide a link to the latest version.
+- Do not blindly accept Grammarly suggestions.
+ - Review edits to make sure they make sense.
+
+**Use:**
+
+- [Oxford commas](https://en.wikipedia.org/wiki/Serial_comma).
+- [Pluralized, gender-neutral pronouns](https://en.wikipedia.org/wiki/Singular_they).
+ - Use “they/their” instead of “he/she/his/hers.”
+ - **Examples:** “When they…” or “If users choose to X, then their…”
+- The `%` symbol. Do not spell out "percent."
+ - **Correct:** 15%
+ - **Incorrect:** 15 percent
+- Double quotes `" "` for phrases, quotes, etc.
+ - Do not use single `' '` quotes.
+
+**Avoid:**
+
+- [First-person language.](https://en.wikipedia.org/wiki/Grammatical_person)
+ - **Examples:** I, we, our, etc.
+- [Second-person language](https://en.wikipedia.org/wiki/Grammatical_person) (unless it is appropriate for a guide or action page).
+ - **Examples:** "You then..." or "Now you should..."
+- Exclamation points.
+- Footnotes.
+- References to deprecated names for Yearn Components.
+ - **Examples:** yyCRV or yUSD instead of yvCurve-Y (see: [Yearn Naming Conventions](../developers/naming-convention.md)).
+- Parentheses for stating additional information.
+ - **Incorrect:** Development Grants are larger sized ($5,000 to $50,000) grants aimed at individuals or teams building projects around vaults and the broader Yearn ecosystem.
+ - **Correct:** Development Grants are generally larger sized grants, ranging from $5,000 to $50,000, aimed at individuals or teams building projects around vaults and the broader Yearn ecosystem.
+
+### Abbreviations
+
+- Use parentheses to define abbreviated terms the first time they appear in a given document.
+ - **Example:** A Yearn Improvement Proposal (YIP) is a proposal framework to support new initiatives and to expand the scope of existing ones.
+
+### Acronyms, Decades and Cases
+
+Do not use apostrophes to pluralize acronyms or indicate decades. Add an "s" at the end.
+
+#### Acronyms
+
+- To make an acronym plural:
+ - **Correct:** YIPs
+ - **Incorrect:** YIP's
+
+#### Decades
+
+- To indicate a decade:
+ - **Correct:** 1990s
+ - **Incorrect:** 1990's
+
+#### Capitalize
+
+- Names and proper nouns.
+- Cities, countries, nationalities, and languages.
+- Terms with definitions provided by Yearn.
+
+#### Title Case
+
+- **The [Title Case Converter](https://titlecaseconverter.com/) will keep titles consistent.**
+- Follow the New York Times standard.
+- Capitalize the first and last words, all nouns, pronouns, verbs, adverbs, and adjectives.
+- Lowercase all articles, conjunctions, and prepositions.
+
+### Currencies
+
+The examples below use dollars, but the same rules apply to all global currencies.
+
+- Use lowercase except when writing "US Dollar.”
+- Use figures and the "\$" sign in all except casual references, or amounts without a figure.
+ - **Standard:** "The book costs \$4."
+ - **Casual:** "Please give me a dollar."
+- For amounts under \$1 million, follow this format:
+ - **Correct:** $4, $25, $500, $1,000, \$650,000.
+- For amounts over \$1 million, use the word, not numerals.
+ - **Correct:** "He is worth \$4 million."
+ - **Incorrect:** "He is worth \$4,000,000."
+
+### Naming Conventions
+
+#### Cryptocurrencies
+
+- When directly referring to the creation, destruction, or manipulation of a token (particularly as it relates to tooling) or when referencing the token as a currency, in an instructional or conversational setting, or as a conceptual product of the Foundation or its systems:
+ - Use the proper prefix if necessary and capitalized TLA version: `wETH`
+ - **Example:** “wETH is a token that represents Ether 1:1 and conforms to the ERC20 token standard.”
+- Similarly, when referring to exchange pairs:
+ - Use: `wETH/DAI`
+
+#### Yearn Products
+
+Please see [Yearn Naming Conventions](../developers/naming-convention.md).
+
+#### Yearn
+
+- When referring to Yearn as a smart contract system, use "The Yearn Protocol."
+ - **Example:** “The Yearn Protocol is a set of contracts for yield optimization."
+- When referring to Yearn as a body of YFI voters and the general stakeholder community, use "Yearn Community" or simply "Yearn."
+ - **Example:** "Yearn passed a vote to decrease the yCRV vault performance fee."
+ - **Example:** "The Yearn Community passed a vote to add an additional vault."
+- Use "Yearn" for casual references to Yearn and the Yearn Protocol as a whole.
+
+### Numbers
+
+- Spell out numbers below 10.
+ - **Examples:** one, two, three, etc.
+- Use numerals for numbers above 10, unless starting a sentence.
+- For numbers with million, billion, or trillion, use figures in all except casual cases.
+ - **Standard:** "The nation has 1 million citizens."
+ - **Casual:** "I'd like to make a billion dollars."
+
+### Lists
+
+When bulleted and numbered lists contain complete sentences, capitalize the first word, and follow each with a period. If list items are phrases, no capitalization or punctuation is required.
+
+- _Don't_ use a list with only 1 item.
+- Use [parallel construction](https://en.wikipedia.org/wiki/Parallelism_%28grammar%29) for each item in a list.
+- Start with the same [part of speech](https://en.wikipedia.org/wiki/Part_of_speech) for each item (in this case, a verb).
+- Use the same verb [tense](https://en.wikipedia.org/wiki/Grammatical_tense#English) for each item.
+- Use the same [voice](https://en.wikipedia.org/wiki/Voice_%28grammar%29) for each item.
+- Use the same sentence type (statement, question, exclamation) for each item.
+- List items that include definitions should look like this:
+ - **Team:** Yearn Protocol Developers and Contributors
+ - **Community**: General participants in Yearn forums and chat
+- Use dashes rather than asterisks for unordered lists.
+ - **Correct:** `-`
+ - **Incorrect:** `*`
+- Alphabetize lists of names unless there is a clear priority at work.
+- Do not use ordered (numbered) lists unless order matters.
+- Ordered list items should use the `1. ` repeated.
+ - Markdown will automatically generate numbers.
+
+**Example:**
+
+```markdown
+1. Item 1
+1. Item 2
+1. Item 3
+1. Item 3a
+1. Item 3b
+```
+
+### Links
+
+- Use [absolute links](https://docs.microsoft.com/en-us/contribute/how-to-write-links) and standard web URLs when referencing external resources.
+- Create descriptive hyperlinks and avoid generic language.
+ - **Correct - Descriptive:** (Learn more at [Yearn Documentation](https://docs.yearn.finance/)
+ - **Incorrect - Generic:** Learn more [here](https://docs.yearn.finance/).
+- Include a `.`outside the link for sentences that end with a link.
+- When creating links for parallel translated documents, make sure to update relative links to reflect the correct heading.
+
+### Tables of Contents
+
+- Include a table of contents for documents that span several pages and multiple sections.
+- Use the raw Markdown from the Table of Contents above as a template.
+ - Be sure to include the line breaks `---` as well to keep formatting consistent.
+- The table of contents should list relevant sections for easy navigation.
+
+## Markdown Guide
+
+Yearn documents posted on GitHub are written in Markdown, a text-to-HTML conversion tool for web writers.
+
+- Include line breaks above and below headings.
+- Use top-level headers (`#`) only once per document.
+ - Do not make multiple top-level headings.
+- Avoid repeat headings.
+ - They will break auto-generated navigation.
+- Avoid trailing spaces.
+- Do not use:
+ - Em or en [dashes:](https://en.wikipedia.org/wiki/Wikipedia:Hyphens_and_dashes) `—`
+ - Ampersands `&` in titles and headers.
+ - Pipes `|` in titles and headers.
+ - Curly quotes. Use the plaintext version.
+ - **Correct:** `"`
+ - **Incorrect:** `“`
+ - Escaping parentheses. Use normal parentheses.
+ - **Correct:** `(SOMETHING)`
+ - **Incorrect:** `\(SOMETHING\)`
+- Ensure there is a single hard return at the end of a .md file.
+- Use emojis to call attention to an important point, when necessary.
+ - Practice discretion and use them sparingly.
+ - This [cheat sheet](https://gist.github.com/rxaviers/7360908) lists emojis and their Markdown shortcuts.
+
+## Best Practices and Resources
+
+Writers and contributors familiar with Yearn and cryptocurrency basics will have a better sense of where to apply their skills best.
+
+- Spend some time learning about Yearn's function, history, and any recent events before contributing.
+- In-depth knowledge is appreciated but not required.
+
+### Learn the Basics of Markdown
+
+- [Daring Fireball](https://daringfireball.net/projects/markdown/)
+- [Markdown Syntax Guide](https://guides.github.com/features/mastering-markdown/)
+- [Practice Communicating Using Markdown](https://lab.github.com/githubtraining/communicating-using-markdown)
+
+### Helpful Writing Tools
+
+Make use of any writing tools that help improve workflow and writing quality. See the list below for some recommendations.
+
+#### Text Editors
+
+- [Grammarly](https://app.grammarly.com/) - Mistake-free writing editor
+- [HemingwayApp](https://www.hemingwayapp.com/) - Make writing bold and clear
+
+#### Word Choice
+
+- [Thesaurus](https://www.thesaurus.com/) - Synonyms
+- [Powerthesaurus](https://www.powerthesaurus.org/) - Synonyms and phrase suggestions
+- [WordHippo](https://www.wordhippo.com/) - Synonyms and phrase suggestions
+
+### Review Community Guides
+
+Review the respective Contribute.md for each repository where pertinent before starting work on any Yearn project.
+
+- Yearn contributor guides outline writing standards and help simplify the writing process.
+
+#### Document-Specific Maintenance Guides
+
+- Check for an associated maintenance guide before starting work on a given document if applicable.
+- A document maintenance guide outlines standards to help Reviewers and contributors when maintaining a given resource.
+ - The rules described within a document-specific maintenance guide supersede other guides.
+ - If a discrepancy is glaring or unreasonable, bring the issue to an admin in the [#documentation](https://discord.com/channels/734804446353031319/748476302121762866) channel on Yearn's discord.
+
+#### Contributor Tools
+
+- The [Contributor Tools Guide](contributor-tools.md) guide introduces the tools regularly used by Yearn contributors.
+
+### Express Interest
+
+- Check out the [Getting Started guide]() for contributing to Documentation.
+- Join the [#documentation](https://discord.com/channels/734804446353031319/748476302121762866) channel on Yearn's Discord, read the pinned messages, and reach out to a channel admin.
+- Yearn community team members and senior contributors help onboard new contributors via Discord or Telegram chats where applicable.
+- Feel free to discuss personal interests and relevant skills to help determine a well-suited project/issue and jump right in.
+- To understand strengths you can also provide relevant examples of past projects, work, and experience.
+ - Demonstrate a reliable work ethic and offer quality work that speaks for itself.
+ - Stand out by suggesting projects and adding insight to public discussions.
+
+### Collaborate
+
+- When accepting an assignment, be sure to collaborate early and often.
+- Visit [#documentation](https://discord.com/channels/734804446353031319/748476302121762866) or corresponding Telegram chat regularly.
+- Coordinate with other members.
+ - Ask as many questions as necessary
+ - Ask for feedback when stuck.
+ - Provide frequent progress updates.
+- Develop a plan that defines an approach for an assignment.
+ - Produce a project outline. Clarify the what so we can agree on the how.
+ - Set achievable deadlines. Timeboxing is good :)
+ - Assign and divide tasks with other contributors.
+ - Multiple contributors should not start work on similar projects individually. Please check that the same issue does not already exist in the Github Issues for that Repository, and if it does please coordinate with whoever is working on it to divide the work if needed.
+
+#### Track Progress
+
+- Track projects and progress with [GitHub Issues.](https://github.com/orgs/yearn/projects/2)
+ - Keep GitHub issues updated with comments and feedback.
+- Take advantage of version history when working in HackMD or Google Docs.
+
+#### Final Drafts and Submissions
+
+- Transfer approved final drafts from Google Docs to HackMD or DrawIO(for diagrams) if need be.
+- Let the team know when a project is ready for final review by moving your issue to the status of `Pending Review` on Github and messaging in the appropriate Discord or Telegram channel.
+- Once reviewed, submit completed projects for approval as a [Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request) on GitHub.
+ - Ensure to update any relevant issues and the project board on GitHub
+
+### Acknowledgements
+
+This document could not be possible without the amazing work done by the MakerDAO team as this document is mostly based on their [Writing Style Guide](https://github.com/makerdao/community-portal/blob/r2d/content/en/contribute/content/writing-style-guide.mdx).
diff --git a/developers/code-repositories.md b/developers/code-repositories.md
index ae0e0497..36089fbc 100644
--- a/developers/code-repositories.md
+++ b/developers/code-repositories.md
@@ -2,61 +2,95 @@
## Frontends
-- Yearn.Finance
+- Yearn.Finance v2
- Site: [https://yearn.finance](https://yearn.finance/)
- - Repo: [https://github.com/iearn-finance/iearn-finance](https://github.com/iearn-finance/iearn-finance)
-- Yearn Governance
- - Site: [https://ygov.finance](https://ygov.finance/)
- - Repo: [https://github.com/iearn-finance/ygov-finance](https://github.com/iearn-finance/ygov-finance)
-- Yearn Insurance
- - Site: [https://yinsure.finance](https://yinsure.finance/)
- - Repo: [https://github.com/iearn-finance/yinsure-finance](https://github.com/iearn-finance/yinsure-finance)
-- Yearn Borrow
- - Site: [https://yborrow.finance](https://yborrow.finance/)
- - Repo: [https://github.com/iearn-finance/iborrow-finance](https://github.com/iearn-finance/iborrow-finance)
-- Yearn Swap
- - Site: [https://yswap.exchange](https://yswap.exchange/)
- - Repo: [https://github.com/iearn-finance/yswap-finance](https://github.com/iearn-finance/yswap-finance)
+ - Repo: [https://github.com/yearn/yearn-finance](https://github.com/yearn/yearn-finance)
+- Yearn.Finance v1
+ - Site: [https://v1.yearn.finance/](https://v1.yearn.finance/)
+ - Repo: [https://github.com/yearn/iearn-finance](https://github.com/yearn/iearn-finance)
- Yearn Documentation
- Site: [https://docs.yearn.finance](https://docs.yearn.finance/)
- - Repo: [https://github.com/iearn-finance/docs](https://github.com/iearn-finance/docs)
+ - Repo: [https://github.com/yearn/yearn-docs](https://github.com/yearn/yearn-docs)
+- YGift
+ - Site: [https://ygift.to/](https://ygift.to/)
+ - Repo: [https://github.com/yearn/ygift-ui](https://github.com/yearn/ygift-ui)
## Smart Contracts
-Yearn smart contracts repo: [https://github.com/iearn-finance/yearn-protocol](https://github.com/iearn-finance/yearn-protocol)
+Yearn smart contracts repo: [https://github.com/yearn/yearn-protocol](https://github.com/yearn/yearn-vaults)
-- [Controllers](https://github.com/iearn-finance/yearn-protocol/tree/develop/contracts/controllers)
-- [Registries](https://github.com/iearn-finance/yearn-protocol/tree/develop/contracts/registries)
-- [Vaults](https://github.com/iearn-finance/yearn-protocol/tree/develop/contracts/vaults)
-- [Strategies](https://github.com/iearn-finance/yearn-protocol/tree/develop/contracts/strategies)
-- [iToken Wrappers](https://github.com/iearn-finance/itoken/tree/master/contracts)
-- [APR Oracle](https://github.com/iearn-finance/apr-oracle/tree/master/contracts)
-- [Utils](https://github.com/iearn-finance/yearn-protocol/tree/develop/contracts/utils)
+- [Controllers](https://github.com/yearn/yearn-protocol/tree/develop/contracts/controllers)
+- [Registries](https://github.com/yearn/yearn-protocol/tree/develop/contracts/registries)
+- [Vaults](https://github.com/yearn/yearn-protocol/tree/develop/contracts/vaults)
+- [Strategies](https://github.com/yearn/brownie-strategy-mix)
+- [Token Wrappers](https://github.com/yearn/brownie-wrapper-mix)
+- [APR Oracle](https://github.com/yearn/apr-oracle/tree/master/contracts)
+- [Utils](https://github.com/yearn/yearn-protocol/tree/develop/contracts/utils)
## Security
-- [Disclosures Repo](https://github.com/iearn-finance/yearn-security/tree/master/disclosures)
+- [Security policy](https://github.com/yearn/yearn-protocol/blob/develop/SECURITY.md)
+- [Security disclosures](https://github.com/yearn/yearn-security/tree/master/disclosures)
+- [Audits](https://github.com/yearn/yearn-security/tree/master/audits)
+
+## API
+- Vaults.finance
+ - Site: [https://vaults.finance](https://vaults.finance)
+ - Repo: [https://github.com/yearn/yearn-data](https://github.com/yearn/yearn-data)
+- Yearn Tools \(Based off Yearn API\)
+ - Site: [https://yearn.tools](https://yearn.tools/)
+ - Repo: [https://github.com/yearn/yearn-api](https://github.com/yearn/yearn-api)
+
+## Tooling
+
+- [Yearn Strategy Brownie Mix](https://github.com/yearn/brownie-strategy-mix)
+- [Yearn Affiliate Wrapper Brownie Mix](https://github.com/yearn/brownie-wrapper-mix)
+- [Ape Safe: Gnosis Safe TX builder](https://github.com/banteg/ape-safe)
+- [Yearn SDK](https://github.com/yearn/yearn-sdk)
+- [Yearn Exporter](https://github.com/yearn/yearn-exporter)
+- [Yearn Mainnet Fork](https://github.com/yearn/yearn-mainnet-fork)
+- [Yearn Vaults V2 Subgraph](https://github.com/yearn/yearn-vaults-v2-subgraph)
+- [Yearn Vaults V1 Subgraph](https://github.com/yearn/yearn-subgraph)
## Misc
-- [Yearn multisig \(ychad.eth\) budget](https://github.com/iearn-finance/ychad-audit)
-- [Yearn improvement proposals](https://github.com/iearn-finance/YIPS)
-- [Collection of public audits](https://github.com/iearn-finance/audits)
+- [Yearn multisig \(ychad.eth\) budget](https://github.com/yearn/ychad-audit)
+- [Yearn improvement proposals](https://github.com/yearn/YIPS)
- [Yearn vault schema](https://github.com/sambacha/yearn-vault-schema)
+- [Yearn project management resources](https://github.com/yearn/yearn-pm)
+- [Yearn IPFS metadata](https://github.com/yearn/yearn-meta)
## Yearn Community Tools
+- Yearn.fi Alternative Frontend
+ - Site: [https://yearn.fi/](https://yearn.fi/)
+ - Repo: [https://github.com/antonnell/yearn-finance](https://github.com/antonnell/yearn-finance)
+- Experimental Vaults
+ - Site: [https://ape.tax](https://ape.tax)
+ - Repo: [https://github.com/fameal/ape-tax](https://github.com/fameal/ape-tax)
- Yearn Discord FAQ Bot
- Repo: [https://github.com/dgornjakovic/yfi-faq-bot](https://github.com/dgornjakovic/yfi-faq-bot)
- Yearn Party
- Site: [https://yearn.party](https://yearn.party/)
- Repo: [https://github.com/x48-crypto/yearn-party](https://github.com/x48-crypto/yearn-party)
-- Yearn Tools \(Based off Yearn API\)
- - Site: [https://yearn.tools](https://yearn.tools/)
- - Repo: [https://github.com/yearn-integrations/api](https://github.com/yearn-integrations/api)
- Recycler Vault Interface
- Site: [https://vaults.finance](https://vaults.finance/)
- Repo: [https://github.com/banteg/yearn-recycle](https://github.com/banteg/yearn-recycle)
- Add Yearn Tokens to MetaMask
- Site: [https://addyearn.finance](https://addyearn.finance/)
- Repo: [https://github.com/x48-crypto/watch-token](https://github.com/x48-crypto/watch-token)
+
+
+## Inactive
+- Yearn Governance
+ - Site: [https://ygov.finance](https://ygov.finance/)
+ - Repo: [https://github.com/yearn/ygov-finance](https://github.com/yearn/ygov-finance)
+- Yearn Insurance
+ - Site: [https://yinsure.finance](https://yinsure.finance/)
+ - Repo: [https://github.com/yearn/yinsure-finance](https://github.com/yearn/yinsure-finance)
+- Yearn Borrow
+ - Site: [https://yborrow.finance](https://yborrow.finance/)
+ - Repo: [https://github.com/yearn/iborrow-finance](https://github.com/yearn/iborrow-finance)
+- Yearn Swap
+ - Site: [https://yswap.exchange](https://yswap.exchange/)
+ - Repo: [https://github.com/yearn/yswap-finance](https://github.com/yearn/yswap-finance)
\ No newline at end of file
diff --git a/developers/deployed-contracts-registry.md b/developers/deployed-contracts-registry.md
index 4e59312d..4f09f234 100644
--- a/developers/deployed-contracts-registry.md
+++ b/developers/deployed-contracts-registry.md
@@ -12,109 +12,15 @@ The Yearn ecosystem is controlled by YFI token holders who submit and vote on pr
| ---------------------------------------------------------------------------- | ------------------------------------------ |
| [YFI](https://etherscan.io/token/0x0bc529c00c6401aef6d220be8c6ea1667f6ad93e) | 0x0bc529c00c6401aef6d220be8c6ea1667f6ad93e |
-### v2 Yield Tokens
-The v2 yield tokens can be used in one lender at a time. Currently being used on Curve’s Y Pool, Yearn’s yBTC pool and sUSD pool.
+### WOOFY
-| Token | Address | Github |
-| ---------------------------------------------------------------------------------- | ------------------------------------------ | ---------------------------------------------------------------------------------------- |
-| [yDAIv2](https://etherscan.io/address/0x16de59092dAE5CcF4A1E6439D611fd0653f0Bd01) | 0x16de59092dAE5CcF4A1E6439D611fd0653f0Bd01 | [YDAIv2.sol](https://github.com/iearn-finance/itoken/blob/master/contracts/YDAIv2.sol) |
-| [yUSDCv2](https://etherscan.io/address/0xd6aD7a6750A7593E092a9B218d66C0A814a3436e) | 0xd6aD7a6750A7593E092a9B218d66C0A814a3436e | [YUSDCv2.sol](https://github.com/iearn-finance/itoken/blob/master/contracts/YUSDCv2.sol) |
-| [yUSDTv2](https://etherscan.io/address/0x83f798e925BcD4017Eb265844FDDAbb448f1707D) | 0x83f798e925BcD4017Eb265844FDDAbb448f1707D | [YUSDTv2.sol](https://github.com/iearn-finance/itoken/blob/master/contracts/YUSDTv2.sol) |
-| [ysUSDv2](https://etherscan.io/address/0xF61718057901F84C4eEC4339EF8f0D86D2B45600) | 0xF61718057901F84C4eEC4339EF8f0D86D2B45600 | [YSUSDv2.sol](https://github.com/iearn-finance/itoken/blob/master/contracts/YSUSDv2.sol) |
-| [yTUSDv2](https://etherscan.io/address/0x73a052500105205d34daf004eab301916da8190f) | 0x73a052500105205d34daf004eab301916da8190f | [YTUSDv2.sol](https://github.com/iearn-finance/itoken/blob/master/contracts/YTUSDv2.sol) |
-| [yWBTCv2](https://etherscan.io/address/0x04Aa51bbcB46541455cCF1B8bef2ebc5d3787EC9) | 0x04Aa51bbcB46541455cCF1B8bef2ebc5d3787EC9 | [YWBTCv2.sol](https://github.com/iearn-finance/itoken/blob/master/contracts/YWBTCv2.sol) |
+YFI can be transformed into WOOFY through [Woofy Finance](https://woofy.finance/). It is effectively the same thing as YFI with a smaller denomination. The rate is 1 YFI = 1,000,000 WOOFY.
-### v3 Yield Tokens
-
-The v3 yield tokens allow the underlying assets to be spread across multiple lenders. Currently being used on Curve’s BUSD pool.
-
-| Token | Address | Github |
-| ---------------------------------------------------------------------------------- | ------------------------------------------ | ---------------------------------------------------------------------------------------- |
-| [yDAIv3](https://etherscan.io/address/0xC2cB1040220768554cf699b0d863A3cd4324ce32) | 0xC2cB1040220768554cf699b0d863A3cd4324ce32 | [YDAIv3.sol](https://github.com/iearn-finance/itoken/blob/master/contracts/YDAIv3.sol) |
-| [yUSDCv3](https://etherscan.io/address/0x26EA744E5B887E5205727f55dFBE8685e3b21951) | 0x26EA744E5B887E5205727f55dFBE8685e3b21951 | [YUSDCv3.sol](https://github.com/iearn-finance/itoken/blob/master/contracts/YUSDCv3.sol) |
-| [yUSDTv3](https://etherscan.io/address/0xE6354ed5bC4b393a5Aad09f21c46E101e692d447) | 0xE6354ed5bC4b393a5Aad09f21c46E101e692d447 | [YUSDCv3.sol](https://github.com/iearn-finance/itoken/blob/master/contracts/YUSDCv3.sol) |
-| [yBUSDv3](https://etherscan.io/address/0x04bC0Ab673d88aE9dbC9DA2380cB6B79C4BCa9aE) | 0x04bC0Ab673d88aE9dbC9DA2380cB6B79C4BCa9aE | [YBUSDv3.sol](https://github.com/iearn-finance/itoken/blob/master/contracts/YBUSDv3.sol) |
-
-## Vault Contracts
-
-Vaults follow unique strategies that are designed to maximize yield of the deposited asset and minimize risk. The vaults are maintained by a `Controller` which oversees the strategy execution. Strategies' generated profits are used to buy respective vault underlying asset.
-
-The `Controller` contract can be found [here](https://etherscan.io/address/0x9e65ad11b299ca0abefc2799ddb6314ef2d91080#code) and the source code can be found [here](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/controllers/Controller.sol).
-
-### Vaults
-
-| Vault | Address | GitHub |
-| ------------------------------------------------------------------------------------------------- | ------------------------------------------ | ------------------------------------------------------------------------------------------------------ |
-| [WETH](https://etherscan.io/address/0xe1237aa7f535b0cc33fd973d66cbf830354d16c7) | 0xe1237aa7f535b0cc33fd973d66cbf830354d16c7 | [yWETH.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yWETH.sol) |
-| [YFI](https://etherscan.io/address/0xba2e7fed597fd0e3e70f5130bcdbbfe06bb94fe1) | 0xba2e7fed597fd0e3e70f5130bcdbbfe06bb94fe1 | [yVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yVault.sol) |
-| [curve.fi/3pool LP](https://etherscan.io/address/0x9cA85572E6A3EbF24dEDd195623F188735A5179f#code) | 0x9cA85572E6A3EbF24dEDd195623F188735A5179f | [yVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yVault.sol) |
-| [curve.fi/y LP](https://etherscan.io/address/0x5dbcf33d8c2e976c6b560249878e6f1491bca25c) | 0x5dbcf33d8c2e976c6b560249878e6f1491bca25c | [yVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yVault.sol) |
-| [curve.fi/busd LP](https://etherscan.io/address/0x2994529c0652d127b7842094103715ec5299bbed) | 0x2994529c0652d127b7842094103715ec5299bbed | [yVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yVault.sol) |
-| [curve.fi/sbtc LP](https://etherscan.io/address/0x7ff566e1d69deff32a7b244ae7276b9f90e9d0f6) | 0x7ff566e1d69deff32a7b244ae7276b9f90e9d0f6 | [yVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yVault.sol) |
-| [DAI](https://etherscan.io/address/0xacd43e627e64355f1861cec6d3a6688b31a6f952) | 0xacd43e627e64355f1861cec6d3a6688b31a6f952 | [yVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yVault.sol) |
-| [TUSD](https://etherscan.io/address/0x37d19d1c4e1fa9dc47bd1ea12f742a0887eda74a) | 0x37d19d1c4e1fa9dc47bd1ea12f742a0887eda74a | [yVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yVault.sol) |
-| [USDC](https://etherscan.io/address/0x597ad1e0c13bfe8025993d9e79c69e1c0233522e) | 0x597ad1e0c13bfe8025993d9e79c69e1c0233522e | [yVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yVault.sol) |
-| [USDT](https://etherscan.io/address/0x2f08119c6f07c006695e079aafc638b8789faf18) | 0x2f08119c6f07c006695e079aafc638b8789faf18 | [yVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yVault.sol) |
-
-### Strategies
-
-| Strategy | Address | GitHub | Vault |
-| ------------------------------------------------------------------------------------------------------ | ------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------- |
-| [StrategyCurve3CrvVoterProxy](https://etherscan.io/address/0xC59601F0CC49baa266891b7fc63d2D5FE097A79D) | 0xC59601F0CC49baa266891b7fc63d2D5FE097A79D | [StrategyCurve3CrvVoterProxy.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/strategies/StrategyCurve3CrvVoterProxy.sol) | [curve.fi/3pool LP](0xe1237aa7f535b0cc33fd973d66cbf830354d16c7) |
-| [StrategyMKRVaultDAIDelegate](https://etherscan.io/address/0x932fc4fd0eee66f22f1e23fba74d7058391c0b15) | 0x932fc4fd0eee66f22f1e23fba74d7058391c0b15 | [StrategyMKRVaultDAIDelegate.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/strategies/StrategyMKRVaultDAIDelegate.sol) | [WETH](0xe1237aa7f535b0cc33fd973d66cbf830354d16c7) |
-| [StrategyYFIGovernance](https://etherscan.io/address/0x395f93350d5102b6139abfc84a7d6ee70488797c) | 0x395f93350d5102b6139abfc84a7d6ee70488797c | [StrategyYFIGovernance.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/strategies/StrategyYFIGovernance.sol) | [YFI](0xba2e7fed597fd0e3e70f5130bcdbbfe06bb94fe1) |
-| [StrategyCurveYCRVVoter](https://etherscan.io/address/0xc999fb87aca383a63d804a575396f65a55aa5ac8) | 0xc999fb87aca383a63d804a575396f65a55aa5ac8 | [StrategyCurveYCRVVoter.sol](https://github.com/iearn-finance/yearn-protocol/blob/master/contracts/strategies/StrategyCurveYCRVVoter.sol) | [curve.fi/y LP](0x5dbcf33d8c2e976c6b560249878e6f1491bca25c) |
-| [StrategyCurveYBUSD](https://etherscan.io/address/0xb15ee8e74dac2d77f9d1080b32b0f3562954aee9) | 0xb15ee8e74dac2d77f9d1080b32b0f3562954aee9 | [StrategyCurveYBUSD.sol](https://github.com/iearn-finance/yearn-protocol/blob/master/contracts/strategies/StrategyCurveYBUSD.sol) | [curve.fi/busd LP](0x2994529c0652d127b7842094103715ec5299bbed) |
-| [StrategyCurveSBTC](https://etherscan.io/address/0x4feeaeced575239b46d70b50e13532ecb62e4ea8) | 0x4feeaeced575239b46d70b50e13532ecb62e4ea8 | [StrategyCurveSBTC.sol](https://github.com/iearn-finance/yearn-protocol/blob/master/contracts/strategies/StrategyCurveSBTC.sol) | [curve.fi/sbtc LP](0x7ff566e1d69deff32a7b244ae7276b9f90e9d0f6) |
-| [StrategyDAICurve](https://etherscan.io/address/0xaa880345a3147a1fc6889080401c791813ed08dc) | 0xaa880345a3147a1fc6889080401c791813ed08dc | [StrategyDAICurve.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/strategies/StrategyDAICurve.sol) | [DAI](0xacd43e627e64355f1861cec6d3a6688b31a6f952) |
-| [StrategyTUSDCurve](https://etherscan.io/address/0x1d91e3f77271ed069618b4ba06d19821bc2ed8b0) | 0x1d91e3f77271ed069618b4ba06d19821bc2ed8b0 | [StrategyTUSDCurve.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/strategies/StrategyTUSDCurve.sol) | [TUSD](0x37d19d1c4e1fa9dc47bd1ea12f742a0887eda74a) |
-| [StrategyDForceUSDC](https://etherscan.io/address/0xa30d1d98c502378ad61fe71bcdc3a808cf60b897) | 0xa30d1d98c502378ad61fe71bcdc3a808cf60b897 | [StrategyDForceUSDC.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/strategies/StrategyDForceUSDC.sol) | [USDC](0x597ad1e0c13bfe8025993d9e79c69e1c0233522e) |
-| [StrategyDForceUSDT](https://etherscan.io/address/0x787c771035bde631391ced5c083db424a4a64bd8) | 0x787c771035bde631391ced5c083db424a4a64bd8 | [StrategyDForceUSDT.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/strategies/StrategyDForceUSDT.sol) | [USDT](0x2f08119c6f07c006695e079aafc638b8789faf18) |
-
-## Delegated Vault Contracts
-
-Volatile assets can also participate in yield farming strategies as part of the Delegated Vaults. Currently, there is only one Delegated Vault: aLINK. The `Controller` deposits LINK into AAVE and borrows stable coins \(USDC\). The initial health factor of these loans is always above 4, and if the health factor drops below 4 at any time the `Controller` repays a portion of the debt in order to maintain a health factor above 4.
-
-The stable coins borrowed \(e.g., USDC, DAI, USDT, etc.\) depend on the strategy selected by the `Controller`. After obtaining stable coins the `Controller` will deposit them into one of the yVaults identified above.
-
-The aLINK vault uses the `StrategyControllerV2` [contract](https://etherscan.io/address/0x2be5d998c95de70d9a38b3d78e49751f10f9e88b#code). The source code for `StrategyControllerV2` is [here](https://github.com/iearn-finance/vaults/blob/master/contracts/controllers/StrategyControllerV2.sol).
-
-| Strategy | Strategy | GitHub |
-| -------------------------------------------------------------------------------------------- | ------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------- |
-| [StrategyVaultUSDC](https://etherscan.io/address/0x25faca21dd2ad7edb3a027d543e617496820d8d6) | 0x25faca21dd2ad7edb3a027d543e617496820d8d6 | [StrategyVaultUSDC.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/strategies/StrategyVaultUSDC.sol) |
-
-| Vault | Address | GitHub |
-| -------------------------------------------------------------------------------- | ------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------ |
-| [aLINK](https://etherscan.io/address/0x29e240cfd7946ba20895a7a02edb25c210f9f324) | 0x29e240cfd7946ba20895a7a02edb25c210f9f324 | [yDelegatedVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yDelegatedVault.sol) |
-
-## Governance Contracts
-
-YFI holders govern the Yearn ecosystem and are eligible to receive a portion of protocol profits. Therefore, YFI represents a right to govern the platform and a claim on earnings. Profits are obtained from each of Yearn's products. In order to claim profits, YFI holders stake their tokens into the Governance contract.
-
-| Contract | Status | Address |
-| ---------------------------------------------------------------------------------------------------------------- | ------ | ------------------------------------------ |
-| [Governance Staking \(v2\)](https://etherscan.io/address/0xba37b002abafdd8e89a1995da52740bbc013d992#code) | Live | 0xba37b002abafdd8e89a1995da52740bbc013d992 |
-| [YearnGovernance \(Balancer v1\)](https://etherscan.io/address/0x3a22df48d84957f907e67f4313e3d43179040d6e#code) | Old | 0x3a22df48d84957f907e67f4313e3d43179040d6e |
-| [YearnRewards \(Yearn v1\)](https://etherscan.io/address/0x0001fb050fe7312791bf6475b96569d83f695c9f#code) | Old | 0x0001fb050fe7312791bf6475b96569d83f695c9f |
-| [YearnRewards \(Balancer v1\)](https://etherscan.io/address/0x033e52f513f9b98e129381c6708f9faa2dee5db5#code) | Old | 0x033e52f513f9b98e129381c6708f9faa2dee5db5 |
-| [YearnRewards \(Gov. Staking v1\)](https://etherscan.io/address/0xb01419e74d8a2abb1bbad82925b19c36c191a701#code) | Old | 0xb01419e74d8a2abb1bbad82925b19c36c191a701 |
-
-## Status and Info Contracts
-
-| Utility | Summary |
-| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [YRegistry](https://etherscan.io/address/0x3ee41c098f9666ed2ea246f4d2558010e59d63a0#code) | The Vault Registry is the single source of truth for active Yearn vaults. The registry allows users to query for active Yearn vaults and vault metadata \(details [here](https://hackmd.io/JDWZ6BAuSmm-VRQRp-bZXw#Vault-Registry-)\). |
-| [UniswapROI](https://etherscan.io/address/0xd04ca0ae1cd8085438fdd8c22a76246f315c2687#code) | On-chain uniswap pool ROI calculator |
-| [APROracle](https://etherscan.io/address/0x97ff4a1b787ade6b94cca95b61f79417c673331d#code) | Allows on-chain rate comparison between Compound, Fulcrum, Aave, and dYdX. |
-| [UniswapAPR](https://etherscan.io/address/0x4c70D89A4681b2151F56Dc2c3FD751aBb9CE3D95#code) | An on-chain uniswap pool APR calculator. It calculates all values in ETH adjusted for the last year. |
-| [IEarnAPR](https://etherscan.io/address/0x9cad8ab10daa9af1a9d2b878541f41b697268eec#code) | Contract for on-chain APR decision trees between Compound, Fulcrum, Aave, and dYdX. |
-| [IEarnManager](https://etherscan.io/address/0x318135fbd0b40d48fcef431ccdf6c7926450edfb#code) | On-chain stateless execution. Recommendations based on IearnAPR. |
-| [APRWithPoolOracle](https://etherscan.io/address/0xAE8F37F0e8AD690486bFA2495113d7E94B7a7Ba6#code) | APR used for stateless `recommend()` function. Can be used to change the recommended provider. |
-| [IEarnAPRWithPool](https://etherscan.io/address/0xcD5F61c392B61F440991DEf98FF6Af07FC6900D4#code) | APR used for stateless `recommend()` function. Can be used to change the recommended provider. |
+| Token | Address |
+| ---------------------------------------------------------------------------- | ------------------------------------------ |
+| [WOOFY](https://etherscan.io/token/0xd0660cd418a64a1d44e9214ad8e459324d8157f1)| 0xd0660cd418a64a1d44e9214ad8e459324d8157f1 |
-## Utility Contracts
+## V2 Registry
-| Utility | Address |
-| --------------------------------------------------------------------------------------------- | ------------------------------------------ |
-| [Curve's yPool](https://etherscan.io/address/0xdF5e0e81Dff6FAF3A7e52BA697820c5e32D806A8#code) | 0xdF5e0e81Dff6FAF3A7e52BA697820c5e32D806A8 |
+The Vault Registry is the single source of truth for active Yearn vaults. The registry allows users to query for active Yearn vaults and vault metadata. For info on yield tokens, vault contracts, strategy contracts, and vault statuses or info, check the [v2.registry.ychad.eth](https://etherscan.io/address/0xfeb4acf3df3cdea7399794d0869ef76a6efaff52) contract.
diff --git a/developers/integration-guide.md b/developers/integration-guide.md
deleted file mode 100644
index 4432e4c6..00000000
--- a/developers/integration-guide.md
+++ /dev/null
@@ -1,120 +0,0 @@
-# Integration Guide
-
-## Integration Points
-
-- [Vault Registry](integration-guide.md#Vault-Registry)
-- [Subgraph](integration-guide.md#Subgraph)
-- [API](integration-guide.md#API)
-
-### Vault Registry
-
-The Yearn Vault Registry \(aka yRegistry\) is a smart contract deployed on the ethereum mainnet. The Vault Registry is the single source of truth for active Yearn vaults. The registry allows users to query for active Yearn vaults and vault metadata \(see "[available data](integration-guide.md#Vault-Registry-Available-Data)" below\).
-
-#### Details
-
-- Currently vaults are added manually by Yearn governance.
-- In the future the vault registry may be integrated into the vault lifecycle \(meaning new vaults would get added into the registry during their deployment process\).
-
-#### Interact
-
-- ENS: [registry.ychad.eth](https://etherscan.io/enslookup-search?search=registry.ychad.eth)
-- Address: [0x3ee41c098f9666ed2ea246f4d2558010e59d63a0](https://etherscan.io/address/0x3ee41c098f9666ed2ea246f4d2558010e59d63a0#readContract)
-
-#### Code
-
-- [https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/registries/YRegistry.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/registries/YRegistry.sol)
-
-#### Available data
-
-- Vault addresses \(methods: `getVaults`\).
-- Active controller address per vault \(methods: `getVaultInfo`, `getVaultsInfo`\).
-- Active strategy address per vault \(methods: `getVaultInfo`, `getVaultsInfo`\).
-- Vault type \(normal, wrapped, delegated\) \(methods: `isDelegated`, `isWrapped`\).
-- Governance address \(methods: `governance`\).
-
-#### Integrations
-
-- Yearn API - utilizes vault registry as the single source of truth in many API calls.
-
-#### Future Integrations
-
-- Yearn Subgraph - in the future we would like the Yearn subgraph to index new vaults automatically using the Vault registry. In order to accomplish this the vault registry must first be incorporated into the vault lifecycle.
-
-### Subgraph
-
-The Yearn Subgraph is a GraphQL-based public API running on [The Graph](https://thegraph.com) that can be utilized to extract current and historical data from the Yearn ecosystem.
-
-#### Details
-
-- See [README](https://github.com/juanmardefago/subgraph-y/blob/master/README.md) for detailed integration details.
-
-#### Interact
-
-- [Graph Explorer](https://thegraph.com/explorer/subgraph/iearn-finance/yearn-finance)
-
-#### Code
-
-- [Github](https://github.com/juanmardefago/subgraph-y)
-
-#### Available data
-
-- Vault snapshot \(current contract values\).
-- Vault metrics per vault \(net deposits, withdrawals, transfers, earnings, etc.\).
-- Vault metrics per user \(net deposits, withdrawals, transfers, earnings, etc.\).
-- Active controller address per vault.
-- Active strategy address per vault.
-- Historical harvest events and earnings.
-
-#### Integrations
-
-**Examples of projects using the Yearn Subgraph**
-
-| Link | Code | By |
-| :--------------------------------------------------------------- | :------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------- |
-| [https://yearn.tools](https://yearn.tools) | [https://github.com/yearn-integrations/api](https://github.com/yearn-integrations/api) | [x48](https://twitter.com/x48_crypto), [Lucinao](https://twitter.com/lbertenasco), [Graham](https://twitter.com/grahamu) |
-| [https://yvault-roi.netlify.app](https://yvault-roi.netlify.app) | [https://github.com/rrridges/yvault-roi](https://github.com/rrridges/yvault-roi) | [Matt Ridges](https://twitter.com/rrridges) |
-| [https://www.yfistats.com](https://www.yfistats.com) | | [Bob_The_Builder](https://twitter.com/Bob_The_Buidler) |
-
-### API
-
-Yearn API is a collection of Serverless API endpoints focused on Yearn integrations.
-
-#### Details
-
-**Goals**
-
-- Provide free API endpoints to simplify 3rd party integration with Yearn.
-- Provide an "API playground" \(Swagger UI\) anyone can use to quickly browse and test available APIs.
-- Document all existing APIs.
-- Allow the entire API stack to be forked to enable community involvement in API development.
-
-**Data Sources**
-
-- Vault Registry - Yearn API utilizes the vault registry in a number of endpoints to maintain a list of active vaults.
-- Subgraph - Yearn API utilizes the Yearn Subgraph for various metrics endpoints.
-
-#### Interact
-
-- Yearn API Playground \(Swagger UI\): [https://yearn.tools](https://yearn.tools).
-
-#### Code
-
-- [Github](https://github.com/yearn-integrations/api)
-
-#### Available data
-
-- Current vault snapshots.
-- Vault listings from vault registry \(with injected strategy/controller/token metadata\).
-- Vault metrics per user \(net deposits, withdrawals, transfers, earnings, etc.\).
-- Vault transactions per user.
-- Vault APY data.
-
-#### Integrations
-
-**Examples of projects using the API**
-
-| Link | Code | By |
-| :------------------------------------------------------- | :----------------------------------------------------------------------------------------------- | :---------------------------------------- |
-| [https://yearn.finance](https://yearn.finance) | [https://github.com/iearn-finance/iearn-finance](https://github.com/iearn-finance/iearn-finance) | [Yearn](https://twitter.com/iearnfinance) |
-| [https://yearn.party](https://yearn.party) | [https://github.com/x48-crypto/yearn-party](https://github.com/x48-crypto/yearn-party) | [x48](https://twitter.com/x48_crypto) |
-| [https://feel-the-yearn.app](https://feel-the-yearn.app) | | [Graham](https://twitter.com/grahamu) |
diff --git a/developers/misc-resources/adminpolicy.md b/developers/misc-resources/adminpolicy.md
index b9cc4b59..5623a36e 100644
--- a/developers/misc-resources/adminpolicy.md
+++ b/developers/misc-resources/adminpolicy.md
@@ -6,12 +6,12 @@ These docs are still being worked on.
## v2 Yield Tokens
-| Contract | ABI | Address |
-| :------- | :------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------- |
-| yDAIv2 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yDAI.json) | [ydaiv2.iearn.eth](https://etherscan.io/address/0x16de59092dAE5CcF4A1E6439D611fd0653f0Bd01#readContract) |
-| yUSDCv2 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yUSDC.json) | [yusdcv2.iearn.eth](https://etherscan.io/address/0xd6aD7a6750A7593E092a9B218d66C0A814a3436e) |
-| yUSDTv2 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yUSDT.json) | [yusdtv2.iearn.eth](https://etherscan.io/address/0x83f798e925BcD4017Eb265844FDDAbb448f1707D) |
-| yTUSDv2 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yTUSD.json) | [ytusdv2.iearn.eth](https://etherscan.io/address/0x73a052500105205d34daf004eab301916da8190f) |
+| Contract | ABI | Address |
+| :------- | :----------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------- |
+| yDAIv2 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yDAI.json) | [ydaiv2.iearn.eth](https://etherscan.io/address/0x16de59092dAE5CcF4A1E6439D611fd0653f0Bd01#readContract) |
+| yUSDCv2 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yUSDC.json) | [yusdcv2.iearn.eth](https://etherscan.io/address/0xd6aD7a6750A7593E092a9B218d66C0A814a3436e) |
+| yUSDTv2 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yUSDT.json) | [yusdtv2.iearn.eth](https://etherscan.io/address/0x83f798e925BcD4017Eb265844FDDAbb448f1707D) |
+| yTUSDv2 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yTUSD.json) | [ytusdv2.iearn.eth](https://etherscan.io/address/0x73a052500105205d34daf004eab301916da8190f) |
### yDAIv2
@@ -65,13 +65,13 @@ As per set_new_COMPOUND
## Utility Contracts
-| Contract | ABI | Address |
-| :---------------- | :----------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------- |
-| APROracle | [JSON](https://github.com/iearn-finance/apr-oracle/blob/master/build/contracts/APROracle.json) | [apr.iearn.eth](https://etherscan.io/address/0x97ff4a1b787ade6b94cca95b61f79417c673331d#code) |
-| UniswapROI | [JSON](https://github.com/iearn-finance/uniswap-roi/blob/master/build/contracts/UniswapROI.json) | [uniroi.iearn.eth](https://etherscan.io/address/0xd04ca0ae1cd8085438fdd8c22a76246f315c2687#readContract) |
-| UniswapAPR | [JSON](https://github.com/iearn-finance/uniswap-roi/blob/master/build/contracts/UniswapAPR.json) | [uniapr.iearn.eth](https://etherscan.io/address/0x4c70D89A4681b2151F56Dc2c3FD751aBb9CE3D95#readContract) |
-| APRWithPoolOracle | [JSON](https://github.com/iearn-finance/apr-oracle/blob/master/build/contracts/APRWithPoolOracle.json) | [apradj.iearn.eth](https://etherscan.io/address/0xAE8F37F0e8AD690486bFA2495113d7E94B7a7Ba6#code) |
-| IEarnAPRWithPool | [JSON](https://github.com/iearn-finance/uniswap-roi/blob/master/build/contracts/IEarnAPRWithPool.json) | [iapradj.iearn.eth](https://etherscan.io/address/0xcD5F61c392B61F440991DEf98FF6Af07FC6900D4#readContract) |
+| Contract | ABI | Address |
+| :---------------- | :--------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------- |
+| APROracle | [JSON](https://github.com/yearn/apr-oracle/blob/master/build/contracts/APROracle.json) | [apr.iearn.eth](https://etherscan.io/address/0x97ff4a1b787ade6b94cca95b61f79417c673331d#code) |
+| UniswapROI | [JSON](https://github.com/yearn/uniswap-roi/blob/master/build/contracts/UniswapROI.json) | [uniroi.iearn.eth](https://etherscan.io/address/0xd04ca0ae1cd8085438fdd8c22a76246f315c2687#readContract) |
+| UniswapAPR | [JSON](https://github.com/yearn/uniswap-roi/blob/master/build/contracts/UniswapAPR.json) | [uniapr.iearn.eth](https://etherscan.io/address/0x4c70D89A4681b2151F56Dc2c3FD751aBb9CE3D95#readContract) |
+| APRWithPoolOracle | [JSON](https://github.com/yearn/apr-oracle/blob/master/build/contracts/APRWithPoolOracle.json) | [apradj.iearn.eth](https://etherscan.io/address/0xAE8F37F0e8AD690486bFA2495113d7E94B7a7Ba6#code) |
+| IEarnAPRWithPool | [JSON](https://github.com/yearn/uniswap-roi/blob/master/build/contracts/IEarnAPRWithPool.json) | [iapradj.iearn.eth](https://etherscan.io/address/0xcD5F61c392B61F440991DEf98FF6Af07FC6900D4#readContract) |
### IEarnAPRWithPool
diff --git a/developers/misc-resources/smart-contract-integration/apr.md b/developers/misc-resources/smart-contract-integration/apr.md
index 1786dafa..cd285754 100644
--- a/developers/misc-resources/smart-contract-integration/apr.md
+++ b/developers/misc-resources/smart-contract-integration/apr.md
@@ -1,8 +1,8 @@
# apr
-| Contract | ABI | Address |
-| :-------- | :--------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------- |
-| APROracle | [JSON](https://github.com/iearn-finance/apr-oracle/blob/master/build/contracts/APROracle.json) | [apr.iearn.eth](https://etherscan.io/address/0x97ff4a1b787ade6b94cca95b61f79417c673331d#code) |
+| Contract | ABI | Address |
+| :-------- | :------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------- |
+| APROracle | [JSON](https://github.com/yearn/apr-oracle/blob/master/build/contracts/APROracle.json) | [apr.iearn.eth](https://etherscan.io/address/0x97ff4a1b787ade6b94cca95b61f79417c673331d#code) |
## IAPROracle Interface
diff --git a/developers/misc-resources/smart-contract-integration/aprmap.md b/developers/misc-resources/smart-contract-integration/aprmap.md
index 0e9bdc74..e6ece8a2 100644
--- a/developers/misc-resources/smart-contract-integration/aprmap.md
+++ b/developers/misc-resources/smart-contract-integration/aprmap.md
@@ -1,8 +1,8 @@
# aprmap
-| Contract | ABI | Address |
-| :-------- | :--------------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------------------- |
-| IIEarnAPR | [JSON](https://github.com/iearn-finance/uniswap-roi/blob/master/build/contracts/IEarnAPR.json) | [iapr.iearn.eth](https://etherscan.io/address/0x9cad8ab10daa9af1a9d2b878541f41b697268eec#readContract) |
+| Contract | ABI | Address |
+| :-------- | :------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------------------- |
+| IIEarnAPR | [JSON](https://github.com/yearn/uniswap-roi/blob/master/build/contracts/IEarnAPR.json) | [iapr.iearn.eth](https://etherscan.io/address/0x9cad8ab10daa9af1a9d2b878541f41b697268eec#readContract) |
## IIEarnAPR Interface
diff --git a/developers/misc-resources/smart-contract-integration/aprmapwithpool.md b/developers/misc-resources/smart-contract-integration/aprmapwithpool.md
index 17dedd17..6875c743 100644
--- a/developers/misc-resources/smart-contract-integration/aprmapwithpool.md
+++ b/developers/misc-resources/smart-contract-integration/aprmapwithpool.md
@@ -1,8 +1,8 @@
# aprmapwithpool
-| Contract | ABI | Address |
-| :---------------- | :------------------------------------------------------------------------------------------------------ | :-------------------------------------------------------------------------------------------------------- |
-| IIEarnAPRWithPool | [JSON](https://github.com/iearn-finance/uniswap-roi/blob/master/build/contracts/IIEarnAPRWithPool.json) | [iapradj.iearn.eth](https://etherscan.io/address/0xAE8F37F0e8AD690486bFA2495113d7E94B7a7Ba6#readContract) |
+| Contract | ABI | Address |
+| :---------------- | :--------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------- |
+| IIEarnAPRWithPool | [JSON](https://github.com/yearn/uniswap-roi/blob/master/build/contracts/IEarnAPRWithPool.json) | [iapradj.iearn.eth](https://etherscan.io/address/0xAE8F37F0e8AD690486bFA2495113d7E94B7a7Ba6#readContract) |
## IIEarnAPRWithPool Interface
diff --git a/developers/misc-resources/smart-contract-integration/aprwithpool.md b/developers/misc-resources/smart-contract-integration/aprwithpool.md
index 4248831c..25b871e4 100644
--- a/developers/misc-resources/smart-contract-integration/aprwithpool.md
+++ b/developers/misc-resources/smart-contract-integration/aprwithpool.md
@@ -1,8 +1,8 @@
# aprwithpool
-| Contract | ABI | Address |
-| :---------------- | :----------------------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------------- |
-| APRWithPoolOracle | [JSON](https://github.com/iearn-finance/apr-oracle/blob/master/build/contracts/APRWithPoolOracle.json) | [apradj.iearn.eth](https://etherscan.io/address/0xeC3aDd301dcAC0e9B0B880FCf6F92BDfdc002BBc#code) |
+| Contract | ABI | Address |
+| :---------------- | :--------------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------------- |
+| APRWithPoolOracle | [JSON](https://github.com/yearn/apr-oracle/blob/master/build/contracts/APRWithPoolOracle.json) | [apradj.iearn.eth](https://etherscan.io/address/0xeC3aDd301dcAC0e9B0B880FCf6F92BDfdc002BBc#code) |
## APRWithPoolOracle Interface
diff --git a/developers/misc-resources/smart-contract-integration/curvefi.md b/developers/misc-resources/smart-contract-integration/curvefi.md
index 17ea1bb1..b21cca08 100644
--- a/developers/misc-resources/smart-contract-integration/curvefi.md
+++ b/developers/misc-resources/smart-contract-integration/curvefi.md
@@ -1,8 +1,8 @@
# curvefi
-| Contract | ABI | Address |
-| :------- | :----------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------- |
-| ICurveFi | [JSON](https://github.com/curvefi/curve-contract/blob/compounded/deployed/2020-01-21_mainnet/swap.abi) | [curve.fi](https://etherscan.io/address/0x2e60CF74d81ac34eB21eEff58Db4D385920ef419#code) |
+| Contract | ABI | Address |
+| :------- | :--------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------- |
+| ICurveFi | [JSON](https://github.com/curvefi/curve-contract/blob/master/contracts/pools/compound/pooldata.json) | [curve.fi](https://etherscan.io/address/0xA2B47E3D5c44877cca798226B7B8118F9BFb7A56) |
## ICurveFi Interface
diff --git a/developers/misc-resources/smart-contract-integration/imanage.md b/developers/misc-resources/smart-contract-integration/imanage.md
index 5115b3d4..7f26e61f 100644
--- a/developers/misc-resources/smart-contract-integration/imanage.md
+++ b/developers/misc-resources/smart-contract-integration/imanage.md
@@ -1,8 +1,8 @@
# imanage
-| Contract | ABI | Address |
-| :------------ | :------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------- |
-| IIEarnManager | [JSON](https://github.com/iearn-finance/uniswap-roi/blob/master/build/contracts/IEarnManager.json) | [imanage.iearn.eth](https://etherscan.io/address/0x318135fbd0b40d48fcef431ccdf6c7926450edfb#readContract) |
+| Contract | ABI | Address |
+| :------------ | :----------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------- |
+| IIEarnManager | [JSON](https://github.com/yearn/uniswap-roi/blob/master/build/contracts/IEarnManager.json) | [imanage.iearn.eth](https://etherscan.io/address/0x318135fbd0b40d48fcef431ccdf6c7926450edfb#readContract) |
## IIEarnManager Interface
diff --git a/developers/misc-resources/smart-contract-integration/interface.md b/developers/misc-resources/smart-contract-integration/interface.md
index 9a0da120..439df0dd 100644
--- a/developers/misc-resources/smart-contract-integration/interface.md
+++ b/developers/misc-resources/smart-contract-integration/interface.md
@@ -1,10 +1,10 @@
# interface
-| Contract | ABI | Address |
-| :------------------ | :------------------------------------------------------------------------------------------------ | :------------------------------------------------------------------------------------------------------------------------- |
-| APROracle | [JSON](https://github.com/iearn-finance/apr-oracle/blob/master/build/contracts/APROracle.json) | [apr.iearn.eth](https://etherscan.io/address/0x97ff4a1b787ade6b94cca95b61f79417c673331d#code) |
-| Uniswap_ETH_CDAIZAP | [JSON](https://github.com/iearn-finance/zap/blob/master/build/contracts/UniSwap_ETH_CDAIZap.json) | [0xB82674CfA16bb28D9b70bEC830fF24BAEC6B1337](https://etherscan.io/address/0xb82674cfa16bb28d9b70bec830ff24baec6b1337#code) |
-| iEther | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/IEther.json) | [0x9Dde7cdd09dbed542fC422d18d89A589fA9fD4C0](https://etherscan.io/address/0x9dde7cdd09dbed542fc422d18d89a589fa9fd4c0#code) |
+| Contract | ABI | Address |
+| :------------------ | :---------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------- |
+| APROracle | [JSON](https://github.com/yearn/apr-oracle/blob/master/build/contracts/APROracle.json) | [apr.iearn.eth](https://etherscan.io/address/0x97ff4a1b787ade6b94cca95b61f79417c673331d#code) |
+| Uniswap_ETH_CDAIZAP | [JSON](https://github.com/yearn/zap/blob/master/build/contracts/UniSwap_ETH_CDAIZap.json) | [0xB82674CfA16bb28D9b70bEC830fF24BAEC6B1337](https://etherscan.io/address/0xb82674cfa16bb28d9b70bec830ff24baec6b1337#code) |
+| iEther | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/IEther.json) | [0x9Dde7cdd09dbed542fC422d18d89A589fA9fD4C0](https://etherscan.io/address/0x9dde7cdd09dbed542fc422d18d89a589fa9fd4c0#code) |
## APR Interface
diff --git a/developers/misc-resources/smart-contract-integration/itoken.md b/developers/misc-resources/smart-contract-integration/itoken.md
index 646a4507..4f6e9e21 100644
--- a/developers/misc-resources/smart-contract-integration/itoken.md
+++ b/developers/misc-resources/smart-contract-integration/itoken.md
@@ -1,8 +1,8 @@
# itoken
-| Contract | ABI | Address |
-| :------- | :-------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------- |
-| iEther | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/IEther.json) | [ieth.iearn.eth](https://etherscan.io/address/0x9dde7cdd09dbed542fc422d18d89a589fa9fd4c0#code) |
+| Contract | ABI | Address |
+| :------- | :------------------------------------------------------------------------------ | :--------------------------------------------------------------------------------------------- |
+| iEther | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/IEther.json) | [ieth.iearn.eth](https://etherscan.io/address/0x9dde7cdd09dbed542fc422d18d89a589fa9fd4c0#code) |
## iToken Interface
diff --git a/developers/misc-resources/smart-contract-integration/uniswapapr.md b/developers/misc-resources/smart-contract-integration/uniswapapr.md
index 3ba5a298..ccc4704c 100644
--- a/developers/misc-resources/smart-contract-integration/uniswapapr.md
+++ b/developers/misc-resources/smart-contract-integration/uniswapapr.md
@@ -1,8 +1,8 @@
# uniswapapr
-| Contract | ABI | Address |
-| :--------- | :----------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------- |
-| UniswapAPR | [JSON](https://github.com/iearn-finance/uniswap-roi/blob/master/build/contracts/UniswapAPR.json) | [uniapr.iearn.eth](https://etherscan.io/address/0x4c70D89A4681b2151F56Dc2c3FD751aBb9CE3D95#readContract) |
+| Contract | ABI | Address |
+| :--------- | :--------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------- |
+| UniswapAPR | [JSON](https://github.com/yearn/uniswap-roi/blob/master/build/contracts/UniswapAPR.json) | [uniapr.iearn.eth](https://etherscan.io/address/0x4c70D89A4681b2151F56Dc2c3FD751aBb9CE3D95#readContract) |
## UniswapAPR Interface
diff --git a/developers/misc-resources/smart-contract-integration/uniswaproi.md b/developers/misc-resources/smart-contract-integration/uniswaproi.md
index 1fd435bb..9b05f7dd 100644
--- a/developers/misc-resources/smart-contract-integration/uniswaproi.md
+++ b/developers/misc-resources/smart-contract-integration/uniswaproi.md
@@ -1,8 +1,8 @@
# uniswaproi
-| Contract | ABI | Address |
-| :--------- | :----------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------- |
-| UniswapROI | [JSON](https://github.com/iearn-finance/uniswap-roi/blob/master/build/contracts/UniswapROI.json) | [uniroi.iearn.eth](https://etherscan.io/address/0xd04ca0ae1cd8085438fdd8c22a76246f315c2687#readContract) |
+| Contract | ABI | Address |
+| :--------- | :--------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------- |
+| UniswapROI | [JSON](https://github.com/yearn/uniswap-roi/blob/master/build/contracts/UniswapROI.json) | [uniroi.iearn.eth](https://etherscan.io/address/0xd04ca0ae1cd8085438fdd8c22a76246f315c2687#readContract) |
## UniswapROI Interface
diff --git a/developers/misc-resources/smart-contract-integration/ybtc.md b/developers/misc-resources/smart-contract-integration/ybtc.md
index 92284dee..0a6e7c41 100644
--- a/developers/misc-resources/smart-contract-integration/ybtc.md
+++ b/developers/misc-resources/smart-contract-integration/ybtc.md
@@ -1,9 +1,9 @@
# ybtc
-| Contract | ABI | Address |
-| :------- | :------------------------------------------------------------------------------------ | :------------------------------------------------------------------------------------------------------- |
-| yBTC | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yBTC.json) | [ybtc.iearn.eth](https://etherscan.io/address/0x04ef8121ad039ff41d10029c91ea1694432514e9#readContract) |
-| yBTCv2 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yBTC.json) | [ybtcv2.iearn.eth](https://etherscan.io/address/0x04Aa51bbcB46541455cCF1B8bef2ebc5d3787EC9#readContract) |
+| Contract | ABI | Address |
+| :------- | :----------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------- |
+| yBTC | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yWBTC.json) | [ybtc.iearn.eth](https://etherscan.io/address/0x04ef8121ad039ff41d10029c91ea1694432514e9#readContract) |
+| yBTCv2 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yWBTC.json) | [ybtcv2.iearn.eth](https://etherscan.io/address/0x04Aa51bbcB46541455cCF1B8bef2ebc5d3787EC9#readContract) |
## IyBTC Interface
diff --git a/developers/misc-resources/smart-contract-integration/ycrv.md b/developers/misc-resources/smart-contract-integration/ycrv.md
index da489bdd..ea3fb0f2 100644
--- a/developers/misc-resources/smart-contract-integration/ycrv.md
+++ b/developers/misc-resources/smart-contract-integration/ycrv.md
@@ -1,8 +1,8 @@
# ycrv
-| Contract | ABI | Address |
-| :------- | :------------------------------------------------------------------------------------ | :---------------------------------------------------------------------------------------- |
-| IyCRV | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yCRV.json) | [ycrv.iearn.eth](https://etherscan.io/address/0x9Ce551A9D2B1A4Ec0cc6eB0E0CC12977F6ED306C) |
+| Contract | ABI | Address |
+| :------- | :---------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------- |
+| IyCRV | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yCRV.json) | [ycrv.iearn.eth](https://etherscan.io/address/0x9Ce551A9D2B1A4Ec0cc6eB0E0CC12977F6ED306C) |
## IyUSDT Interface
diff --git a/developers/misc-resources/smart-contract-integration/ydai.md b/developers/misc-resources/smart-contract-integration/ydai.md
index f9563427..7d4ef00b 100644
--- a/developers/misc-resources/smart-contract-integration/ydai.md
+++ b/developers/misc-resources/smart-contract-integration/ydai.md
@@ -1,10 +1,10 @@
# ydai
-| Contract | ABI | Address |
-| :------- | :------------------------------------------------------------------------------------ | :------------------------------------------------------------------------------------------------------- |
-| yDAIv1 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yDAI.json) | [ydai.iearn.eth](https://etherscan.io/address/0x9d25057e62939d3408406975ad75ffe834da4cdd#readContract) |
-| yDAIv2 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yDAI.json) | [ydai.iearn.eth](https://etherscan.io/address/0x16de59092dAE5CcF4A1E6439D611fd0653f0Bd01#readContract) |
-| yDAIv3 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yDAI.json) | [ydaiv3.iearn.eth](https://etherscan.io/address/0xC2cB1040220768554cf699b0d863A3cd4324ce32#readContract) |
+| Contract | ABI | Address |
+| :------- | :---------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------- |
+| yDAIv1 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yDAI.json) | [ydai.iearn.eth](https://etherscan.io/address/0x9d25057e62939d3408406975ad75ffe834da4cdd#readContract) |
+| yDAIv2 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yDAI.json) | [ydai.iearn.eth](https://etherscan.io/address/0x16de59092dAE5CcF4A1E6439D611fd0653f0Bd01#readContract) |
+| yDAIv3 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yDAI.json) | [ydaiv3.iearn.eth](https://etherscan.io/address/0xC2cB1040220768554cf699b0d863A3cd4324ce32#readContract) |
## IyDAI Interface
diff --git a/developers/misc-resources/smart-contract-integration/ysusd.md b/developers/misc-resources/smart-contract-integration/ysusd.md
index 0908b987..15b3ddca 100644
--- a/developers/misc-resources/smart-contract-integration/ysusd.md
+++ b/developers/misc-resources/smart-contract-integration/ysusd.md
@@ -1,9 +1,9 @@
# ysusd
-| Contract | ABI | Address |
-| :------- | :------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------- |
-| ySUSD | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/ySUSD.json) | [ysusd.iearn.eth](https://etherscan.io/address/0x36324b8168f960A12a8fD01406C9C78143d41380) |
-| ySUSDv2 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/ySUSD.json) | [ysusd.iearn.eth](https://etherscan.io/address/0xF61718057901F84C4eEC4339EF8f0D86D2B45600) |
+| Contract | ABI | Address |
+| :------- | :----------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------- |
+| ySUSD | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/ySUSD.json) | [ysusd.iearn.eth](https://etherscan.io/address/0x36324b8168f960A12a8fD01406C9C78143d41380) |
+| ySUSDv2 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/ySUSD.json) | [ysusd.iearn.eth](https://etherscan.io/address/0xF61718057901F84C4eEC4339EF8f0D86D2B45600) |
## IySUSD Interface
diff --git a/developers/misc-resources/smart-contract-integration/ytusd.md b/developers/misc-resources/smart-contract-integration/ytusd.md
index 6e54fe79..d8b71b0b 100644
--- a/developers/misc-resources/smart-contract-integration/ytusd.md
+++ b/developers/misc-resources/smart-contract-integration/ytusd.md
@@ -1,8 +1,8 @@
# ytusd
-| Contract | ABI | Address |
-| :------- | :------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------- |
-| yTUSDv2 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yTUSD.json) | [ytusd.iearn.eth](https://etherscan.io/address/0x73a052500105205d34daf004eab301916da8190f) |
+| Contract | ABI | Address |
+| :------- | :----------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------- |
+| yTUSDv2 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yTUSD.json) | [ytusd.iearn.eth](https://etherscan.io/address/0x73a052500105205d34daf004eab301916da8190f) |
## IyTUSD Interface
diff --git a/developers/misc-resources/smart-contract-integration/yusdc.md b/developers/misc-resources/smart-contract-integration/yusdc.md
index 8772b936..eb01a8c6 100644
--- a/developers/misc-resources/smart-contract-integration/yusdc.md
+++ b/developers/misc-resources/smart-contract-integration/yusdc.md
@@ -1,10 +1,10 @@
# yusdc
-| Contract | ABI | Address |
-| :------- | :------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------- |
-| yUSDCv1 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yUSDC.json) | [yusdc.iearn.eth](https://etherscan.io/address/0xa2609b2b43ac0f5ebe27deb944d2a399c201e3da) |
-| yUSDCv2 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yUSDC.json) | [yusdcv2.iearn.eth](https://etherscan.io/address/0xd6aD7a6750A7593E092a9B218d66C0A814a3436e) |
-| yUSDCv3 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yUSDC.json) | [yusdcv3.iearn.eth](https://etherscan.io/address/0x26EA744E5B887E5205727f55dFBE8685e3b21951) |
+| Contract | ABI | Address |
+| :------- | :----------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------- |
+| yUSDCv1 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yUSDC.json) | [yusdc.iearn.eth](https://etherscan.io/address/0xa2609b2b43ac0f5ebe27deb944d2a399c201e3da) |
+| yUSDCv2 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yUSDC.json) | [yusdcv2.iearn.eth](https://etherscan.io/address/0xd6aD7a6750A7593E092a9B218d66C0A814a3436e) |
+| yUSDCv3 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yUSDC.json) | [yusdcv3.iearn.eth](https://etherscan.io/address/0x26EA744E5B887E5205727f55dFBE8685e3b21951) |
## IyUSDC Interface
diff --git a/developers/misc-resources/smart-contract-integration/yusdt.md b/developers/misc-resources/smart-contract-integration/yusdt.md
index 09fb7442..d206f65d 100644
--- a/developers/misc-resources/smart-contract-integration/yusdt.md
+++ b/developers/misc-resources/smart-contract-integration/yusdt.md
@@ -1,10 +1,10 @@
# yusdt
-| Contract | ABI | Address |
-| :------- | :------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------- |
-| yUSDT | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yUSDT.json) | [yusdt.iearn.eth](https://etherscan.io/address/0xa1787206d5b1bE0f432C4c4f96Dc4D1257A1Dd14) |
-| yUSDTv2 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yUSDT.json) | [yusdt.iearn.eth](https://etherscan.io/address/0x83f798e925BcD4017Eb265844FDDAbb448f1707D) |
-| yUSDTv3 | [JSON](https://github.com/iearn-finance/itoken/blob/master/build/contracts/yUSDT.json) | [yusdtv3.iearn.eth](https://etherscan.io/address/0xE6354ed5bC4b393a5Aad09f21c46E101e692d447) |
+| Contract | ABI | Address |
+| :------- | :----------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------- |
+| yUSDT | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yUSDT.json) | [yusdt.iearn.eth](https://etherscan.io/address/0xa1787206d5b1bE0f432C4c4f96Dc4D1257A1Dd14) |
+| yUSDTv2 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yUSDT.json) | [yusdt.iearn.eth](https://etherscan.io/address/0x83f798e925BcD4017Eb265844FDDAbb448f1707D) |
+| yUSDTv3 | [JSON](https://github.com/yearn/itoken/blob/master/build/contracts/yUSDT.json) | [yusdtv3.iearn.eth](https://etherscan.io/address/0xE6354ed5bC4b393a5Aad09f21c46E101e692d447) |
## IyUSDT Interface
diff --git a/developers/misc-resources/smart-contract-integration/zap.md b/developers/misc-resources/smart-contract-integration/zap.md
index 2e60b4cd..55f5989d 100644
--- a/developers/misc-resources/smart-contract-integration/zap.md
+++ b/developers/misc-resources/smart-contract-integration/zap.md
@@ -1,8 +1,8 @@
# zap
-| Contract | ABI | Address |
-| :------------------ | :------------------------------------------------------------------------------------------------ | :-------------------------------------------------------------------------------------------- |
-| Uniswap_ETH_CDAIZAP | [JSON](https://github.com/iearn-finance/zap/blob/master/build/contracts/UniSwap_ETH_CDAIZap.json) | [zap.iearn.eth](https://etherscan.io/address/0xb82674cfa16bb28d9b70bec830ff24baec6b1337#code) |
+| Contract | ABI | Address |
+| :------------------ | :---------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------- |
+| Uniswap_ETH_CDAIZAP | [JSON](https://github.com/yearn/zap/blob/master/build/contracts/UniSwap_ETH_CDAIZap.json) | [zap.iearn.eth](https://etherscan.io/address/0xb82674cfa16bb28d9b70bec830ff24baec6b1337#code) |
## ZAP Interface
diff --git a/developers/naming-convention.md b/developers/naming-convention.md
new file mode 100644
index 00000000..6316ccda
--- /dev/null
+++ b/developers/naming-convention.md
@@ -0,0 +1,126 @@
+# Naming conventions
+
+## yVaults
+
+### Dev Cheat Sheet (Examples)
+
+- **Vanilla ERC20 tokens**
+ - Name: `${token.symbol()} or override yVault`
+ - Symbol: `yv${token.symbol()} or override`
+ - **Examples:** `USDC yVault`, `yvUSDC`, `aLINK yVault`, `yvaLINK`
+- **LP positions**
+ - **Curve**
+ - Name: `Curve + pool + Pool yVault`
+ - **Examples:** `Curve sBTC Pool yVault`, `Curve 3pool yVault`, `Curve Y Pool yVault`
+ - Symbol: `yvCurve-pool`
+ - **Examples:** `yvCurve-sBTC`, `yvCurve-3pool`, `yvCurve-Y`. We make an exception for the last one and call it `yUSD`.
+ - **Uniswap**
+ - Name: `Uniswap + v${self.version()} + TOKEN-TOKEN + LP yVault`
+ - **Examples:** `Uniswap v2 USDT-WETH LP yVault`, `Uniswap v2 WBTC-WETH LP yVault`
+ - Symbol: `yvUni-TOKEN-TOKEN`
+ - **Examples:** `yvUni-USDT-WETH`, `yvUni-WBTC-WETH`
+ - Note: Version was included for Uniswap LP tokens to help limit confusion between UNI-v2 LP tokens and upcoming UNI-v3 LP tokens.
+ - **Balancer**
+ - Name: `Balancer + TOKEN-TOKEN + Pool yVault`
+ - **Examples:** `Balancer USDT-WETH Pool yVault`, `Balancer WBTC-WETH Pool yVault`
+ - Symbol: `yvBal-TOKEN-TOKEN`
+ - **Examples:** `yvBal-USDT-WETH`, `yvBal-WBTC-WETH`
+ - **SushiSwap**
+ - Name: `SushiSwap + TOKEN-TOKEN + LP yVault`
+ - **Examples:** `SushiSwap USDT-WETH LP yVault`, `Uniswap v2 WBTC-WETH LP yVault`
+ - Symbol: `yvSushi-TOKEN-TOKEN`
+ - **Examples:** `yvSushi-USDT-WETH`, `yvSushi-WBTC-WETH`
+- **Experimental**
+ - No hard rules for `name` or `symbol`, just be sure to end `name` with "yVault".
+ - **Examples:** `yveCRV-DAO yVault`, `yveCRV-DAO`, `St. Banteg of Yearn Patron of Plebs Lido St. Ether yVault`, `sboypoplyvstETH`
+
+### Overview and Explanation
+
+- Acceptable alternative names include Yearn Vaults, or informally referring to the product as vaults.
+- When referring to a specific yVault, the preferred name is generally `TOKEN + yVault`; this matches the `name` field on the yVault contract. However, it is also acceptable to use `yvTOKEN + Vault`, `Yearn + TOKEN + Vault` or `yvTOKEN`; the latter matches `symbol` in the contract.
+ - **Examples:** `DAI yVault`, `yvDAI Vault`, `Yearn DAI Vault`, or simply `yvDAI`
+- For each yVault, name and symbol conventions are as follows:
+ - Name: `${token.symbol()} or override yVault`
+ - Symbol: `yv${token.symbol()} or override`
+- A `version` field is included in the token contract to correspond to the major yVault release version.
+ - Additionally, developers may find it useful to denote `version` within the `name` field itself to help clarify the token to be deposited. Useful examples include Uniswap LPs (below), and also v1 vs v2 Aave aTokens.
+- The predominant use case for name and symbol override is for LP tokens. The use of the term `Pool` or `LP` is interchangeable, and will be selected based on colloquial use for each protocol.
+ - For instance, Curve and Balancer LP positions are typically referred to as pools since they can contain more than two tokens, while Uniswap and SushiSwap positions are typically referred to as LPs.
+ - **Curve**
+ - Name: `Curve + pool + Pool yVault`
+ - **Examples:** `Curve sBTC Pool yVault`, `Curve 3pool yVault`, `Curve Y Pool yVault`
+ - In this case, `pool` is taken directly from Curve.fi's UI, and we can adjust for capitalization as needed. In the case of the `3pool`, the redundant "Pool" is removed.
+ - Symbol: `yvCurve-pool`
+ - **Examples:** `yvCurve-sBTC`, `yvCurve-3pool`, `yvCurve-Y`
+ - Note: In this methodology, `yvCurve-Y` refers to the vault previously known as `yUSD`. Please see below for a more detailed discussion on proper use of `yUSD`.
+ - **Uniswap**
+ - Name: `Uniswap + v${self.version()} + TOKEN-TOKEN + LP yVault`
+ - **Examples:** `Uniswap v2 USDT-WETH LP yVault`, `Uniswap v2 WBTC-WETH LP yVault`
+ - Symbol: `yvUni-TOKEN-TOKEN`
+ - **Examples:** `yvUni-USDT-WETH`, `yvUni-WBTC-WETH`
+ - Note: Version was included for Uniswap LP tokens to help limit confusion between UNI-v2 LP tokens and upcoming UNI-v3 LP tokens.
+ - **Balancer**
+ - Name: `Balancer + TOKEN-TOKEN + Pool yVault`
+ - **Examples:** `Balancer USDT-WETH Pool yVault`, `Balancer WBTC-WETH Pool yVault`
+ - Symbol: `yvBal-TOKEN-TOKEN`
+ - **Examples:** `yvBal-USDT-WETH`, `yvBal-WBTC-WETH`
+ - Note: Since Balancer allows more than two tokens per pool, append as many `TOKEN` as needed for the pool in question.
+ - **SushiSwap**
+ - Name: `SushiSwap + TOKEN-TOKEN + LP yVault`
+ - **Examples:** `SushiSwap USDT-WETH LP yVault`, `Uniswap v2 WBTC-WETH LP yVault`
+ - Symbol: `yvSushi-TOKEN-TOKEN`
+ - **Examples:** `yvSushi-USDT-WETH`, `yvSushi-WBTC-WETH`
+
+## yVault Want Token
+
+- In Yearn's UI, it may be useful to denote the desired token to deposit into a specific yVault. For basic ERC20 `want` tokens, `name` and `symbol` can be pulled directly from the token contract and utilized as-is.
+ - **Examples:** `USD Coin`, `USDC`, `ChainLink Token`, `LINK`
+- However, for LP positions, naming needs to be standardized.
+ - Curve
+ - Name: `Curve + pool + Pool`
+ - **Examples:** `Curve sBTC Pool`, `Curve 3pool`, `Curve Y Pool`, `Curve Compound Pool`
+ - In this case, `pool` is taken directly from Curve.fi's UI, and we can adjust for capitalization as needed. In the case of the `3pool`, the redundant "Pool" is removed.
+ - Symbol: `crvPOOL or override`
+ - **Examples:** `crvBUSD`, `crvCOMP`, `crvGUSD`, `crvMUSD`, `crvTBTC`, `crvSBTC`, `yCRV`, `3Crv`
+ - These names were chosen as `crvBUSD` and `crvSBTC` are already fairly widely used, and applying this formula works well for other pools. `yCRV` and `3Crv` are the allowed exceptions, as `yCRV` is the most widely used name for that pool, and `3Crv` usage is now fairly common with the recent admin fee distribution.
+ - Uniswap
+ - Name: `Uniswap + v${self.version()} + TOKEN-TOKEN + LP`
+ - **Examples:** `Uniswap v2 USDT-WETH LP`, `Uniswap v2 WBTC-WETH LP`
+ - Symbol: `TOKEN-TOKEN UNI`
+ - **Examples:** `USDT-WETH UNI`, `WBTC-WETH UNI`
+ - Balancer
+ - Name: `Balancer + TOKEN-TOKEN + Pool`
+ - **Examples:** `Balancer USDT-WETH Pool`, `Balancer WBTC-WETH Pool`
+ - Symbol: `TOKEN-TOKEN BPT`
+ - **Examples:** `USDT-WETH BPT`, `WBTC-WETH BPT`
+ - Note: Since Balancer allows more than two tokens per pool, append as many `TOKEN` as needed for the pool in question.
+ - SushiSwap
+ - Name: `SushiSwap + TOKEN-TOKEN + LP`
+ - **Examples:** `SushiSwap USDT-WETH LP`, `Uniswap v2 WBTC-WETH LP`
+ - Symbol: `TOKEN-TOKEN SLP`
+ - **Examples:** `USDT-WETH SLP`, `WBTC-WETH SLP`
+
+## yUSD
+
+- While the term `yUSD` was used to refer to the Curve Y Pool yVault in the past, under our updated naming convention this vault token is now `yvCurve-Y`. However, usage of `yUSD` is still permissable when referring to the asset itself.
+ - **Example:** Yearn pays monthly grants in `yUSD`.
+- In the future, if Yearn creates a new `yUSD` that is a collection of several yVault tokens (as has been previously discussed), then the current `yUSD` will simply be referred to as `yvCurve-Y` and only the new token will be `yUSD`.
+
+## yEarn
+
+- These are Yearn's original yield-aware tokens, whose v2 and v3 contracts can be found [here](https://docs.yearn.finance/developers/deployed-contracts-registry#v2-yield-tokens).
+- These products should be referred to as yEarn Tokens, `underlying token name + Earn`, or `y{token.symbol()}v${self.version()}`
+ - **Examples:** `yDAIv2`, `yDAI Earn`, `yBUSDv3`, `yBUSD Earn`
+
+## Test Products
+
+- For deployed contracts that have not reached their final production version, a simple modification is included to designate these on the contract level as being test products.
+ - Name: `${token.symbol()} or override + Test + Product`
+ - Symbol: `yt${token.symbol()} or override`
+ - **Examples:** `DAI Test yVault`, `ytDAI`
+- Additionally, the v2 yVault contracts have upgradeable `name` and `symbol` fields. This means that should a test contract perform well, these fields can be updated to reflect that it is no longer a test contract, removing the need to deploy new contracts.
+
+## Future Products
+
+- Future products can follow a simple naming convention: `y + product`, where the product and any potential token names follow similar guidelines as above with yVaults. These can then be further modified as needed based on the product\(s\).
+ - **Examples:** `ySwap`, `yBorrow`, `yTrade`
diff --git a/developers/yvaults-documentation/README.md b/developers/v1-yvaults-documentation/README.md
similarity index 75%
rename from developers/yvaults-documentation/README.md
rename to developers/v1-yvaults-documentation/README.md
index 5be38df8..5ab9ad7e 100644
--- a/developers/yvaults-documentation/README.md
+++ b/developers/v1-yvaults-documentation/README.md
@@ -1,4 +1,4 @@
-# yVaults Documentation
+# v1 yVaults Documentation
{% page-ref page="vault-interfaces.md" %}
diff --git a/developers/yvaults-documentation/vault-interfaces.md b/developers/v1-yvaults-documentation/v1-yvault-interfaces.md
similarity index 97%
rename from developers/yvaults-documentation/vault-interfaces.md
rename to developers/v1-yvaults-documentation/v1-yvault-interfaces.md
index 0e6f6daf..22c0cbcc 100644
--- a/developers/yvaults-documentation/vault-interfaces.md
+++ b/developers/v1-yvaults-documentation/v1-yvault-interfaces.md
@@ -1,8 +1,12 @@
-# Vault Interfaces
+---
+description: This documentation only covers v1 vaults. v2 vault developer documentation coming soon.
+---
+
+# v1 yVault Interfaces
## IStrategy
-Source code: [yearn-protocol/develop/interfaces/yearn/IStrategy.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/interfaces/yearn/IStrategy.sol)
+Source code: [yearn-protocol/develop/interfaces/yearn/IStrategy.sol](https://github.com/yearn/yearn-protocol/blob/develop/interfaces/yearn/IStrategy.sol)
### function `want()`
@@ -134,7 +138,7 @@ function balanceOf() external view returns (uint256);
## IVault
-Source code: [yearn-protocol/develop/interfaces/yearn/IVault.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/interfaces/yearn/IVault.sol)
+Source code: [yearn-protocol/develop/interfaces/yearn/IVault.sol](https://github.com/yearn/yearn-protocol/blob/develop/interfaces/yearn/IVault.sol)
### function `token()`
@@ -355,7 +359,7 @@ function withdrawAll() external;
## IController
-Source code: [yearn-protocol/develop/interfaces/yearn/IController.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/interfaces/yearn/IController.sol)
+Source code: [yearn-protocol/develop/interfaces/yearn/IController.sol](https://github.com/yearn/yearn-protocol/blob/develop/interfaces/yearn/IController.sol)
### function `withdraw()`
diff --git a/developers/yvaults-documentation/vaults-overview.md b/developers/v1-yvaults-documentation/v1-yvaults-overview.md
similarity index 88%
rename from developers/yvaults-documentation/vaults-overview.md
rename to developers/v1-yvaults-documentation/v1-yvaults-overview.md
index 15c36998..d5447636 100644
--- a/developers/yvaults-documentation/vaults-overview.md
+++ b/developers/v1-yvaults-documentation/v1-yvaults-overview.md
@@ -1,4 +1,8 @@
-# Vaults Overview
+---
+description: This documentation only covers v1 vaults. v2 vault developer documentation coming soon.
+---
+
+# v1 Vaults Overview
This document gives a _generalized and high level overview_ of how the protocol and its actors, smart contracts, and other services interact with each other. The aim is to build intuition about how Yearn products work.
@@ -8,13 +12,13 @@ All vaults are different. This is not a formal specification. Contracts and comp
-All contracts are open source and available from the [/yearn-protocol](https://github.com/iearn-finance/yearn-protocol) GitHub repo.
+All contracts are open source and available from the [/yearn-protocol](https://github.com/yearn/yearn-protocol) GitHub repo.
## Protocol Contracts
### Vaults
-Example: [yWETH.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/vaults/yWETH.sol)
+Example: [yWETH.sol](https://github.com/yearn/yearn-protocol/blob/develop/contracts/vaults/yWETH.sol)
Vaults act as the representation of the user in the system, and is the internal customer for investments. There is one vault per deposit token, and they are agnostic to the strategies they interact with.
@@ -26,19 +30,19 @@ Their primary tasks are to:
### Controller
-[Controller.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/controllers/Controller.sol)
+[Controller.sol](https://github.com/yearn/yearn-protocol/blob/develop/contracts/controllers/Controller.sol)
The Controller act as the gatekeeping interface between vaults and strategies and oversees communication and fund flows. Deposits and withdrawals in and out of strategies flow through the `Controller`. It keeps track of the addresses for the active vaults, strategies, tokens, and strategy rewards destination, acting as a pseudo-registry that verifies the origin and destination of a transaction. The `Controller` also handles strategy migration, moving funds from an old strategy to a new one.
### Registry
-[YRegistry.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/registries/YRegistry.sol)
+[YRegistry.sol](https://github.com/yearn/yearn-protocol/blob/develop/contracts/registries/YRegistry.sol)
The registry is a wrapper of the controller that contains additional meta-data about active addresses. Its functionality is currently being expanded.
### Strategies
-Example: [CurveYCRVVoter.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/strategies/CurveYCRVVoter.sol)
+Example: [CurveYCRVVoter.sol](https://github.com/yearn/yearn-protocol/blob/develop/contracts/strategies/CurveYCRVVoter.sol)
Strategies are investment instruction sets, written by a `Strategist`. They are agnostic to the vaults that use them.
@@ -58,7 +62,7 @@ The `Treasury` contract accumulates all the Management fees sent from the strate
### Governance
-[StrategyYFIGovernance.sol](https://github.com/iearn-finance/yearn-protocol/blob/develop/contracts/strategies/StrategyYFIGovernance.sol)
+[StrategyYFIGovernance.sol](https://github.com/yearn/yearn-protocol/blob/develop/contracts/strategies/StrategyYFIGovernance.sol)
Yearn Governance is a combination of the YFI staking contract to participate in Governance voting, and the 6-of-9 multi-sig that executes the decisions by the YFI holders.
diff --git a/faq.md b/faq.md
deleted file mode 100644
index ba65e1a0..00000000
--- a/faq.md
+++ /dev/null
@@ -1,534 +0,0 @@
----
-title: faq.yearn.finance
-tags: "docs, faq, published"
----
-
-# FAQ
-
-## General
-
-### Is it safe to invest money in yearn?
-
-- Please, do your own research and decide for yourself.
-
-### Is yearn audited?
-
-- Yes, you can find the list of audits [here](https://github.com/iearn-finance/audits).
-
-## Feedback & Support
-
-If you have questions about how to do anything, we can help you on:
-
-- [Discord](http://discord.yearn.finance)
-- [Telegram](https://t.me/yearnfinance)
-
-But if you think something can be improved, or you found a bug, we want to squash it. Please post it here:
-
-- [Github](https://github.com/iearn-finance) — create a new issue in the relevant repository.
-- [Forum](https://gov.yearn.finance/c/feedback/) — post in the feedback category.
-
-## Products
-
-### yearn.finance
-
-- [yearn.finance](https://yearn.finance/) hosts UIs for the **Vaults**, **Earn**, **Zap**, **APR**, and **Cover** products.
-
-### Vaults
-
-- [yearn.finance/vaults](https://yearn.finance/vaults)
-
-#### What is a Vault?
-
-- Vaults employ strategies to automate the best yield farming opportunities available.
-- They were designed so that the community could work together to build new strategies to find the best yield.
-- Andre explains [vaults](https://medium.com/iearn/yearn-finance-v2-af2c6a6a3613) and [delegated vaults](https://medium.com/iearn/delegated-vaults-explained-fa81f1c3fce2) in these two blog posts.
-- Simply put vaults can do this:
- - Use any asset as liquidity.
- - Use liquidity as collateral and manage collateral at a safe level so you never default.
- - Borrow stablecoins.
- - Put the stablecoins to work on some farming.
- - Reinvest earned stablecoins.
-
-#### Can't I just do all this myself though?
-
-- Yes you could, but vaults help you save on gas, keep it at a good collateral/debt ratio so you don't default, and auto optimizes for highest yielding stablecoin strategies, even when you are sleeping.
-
-#### I see ROI on the vaults page is it the current one?
-
-- No. This is the historical average for that vault. Current APY / returns are not shown as vaults are a beta product and being tested live.
-- Various third party sites provide APY and other info, they are listed below in [Statistics](https://docs.yearn.finance/faq#statistics).
-
-#### What are the risks?
-
-- While the assets deposited can't decrease, the debt of the vault can. If a strategy does not manage to outperform the debt, then a portion of the asset will be impermanently locked. If a strategy then outperforms the debt again, this asset will become unlocked.
- - There are mechanisms in the vaults to prevent this but nothing is bulletproof.
-- As of now, the Vaults have not been audited.
-- Smart contract risk with any contracts that the vaults interact with.
-
-#### What are the different yVaults?
-
-**yLINK and yaLINK**
-
-- **What's the difference between LINK and aLINK vaults?**
- - None in terms of returns. Deposited LINK will be deposited into Aave generating aLINK \(Aave interest bearing LINK\). So depositing directly into aLINK vault you are one step ahead in the process.
-- **Why is the yield different for aLINK and LINK vaults?**
- - aLINK has a 0.5% insurance "fee" \(this is returned when it is outperformed\). LINK vault doesn't have this fee to avoid double dipping.
-
-**yETH and yWETH**
-
-- **What's the difference between WETH and ETH vaults?**
- - None in terms of returns. Deposited ETH it will be wrapped into WETH anyway. The WETH vault just makes it easier for other Ethereum protocols to interact with this vault.
-- **How does ETH vault protect itself from liquidation?**
- - This vault reads ETH price directly from the Maker's OSM \(Oracle Security Model\), a system that reads Oracle price 1 hour in advance. This gives the vault 1 hour to pay the CDP debt before liquidation. Also, the vault keeps increasing collateralization by depositing profit on each harvest call.
-
-**Other Vaults**
-
-- v1 Money Market vaults, formerly called iEarn, can be found [here](https://yearn.finance/earn).
-- Additional vaults can be found [here](https://yearn.finance/vaults).
-
-#### If the current strategy for the yCRV vault is farming CRV does it just get added to my balance when I withdrawal?
-
-- No. The vault will farm CRV then sell it on the market automatically. When you withdrawal you will get more yCRV.
-
-#### Why isn't yCRV worth \$1, it's a stable coin right?
-
-- No, yCRV is not worth \$1, and no it is NOT a stablecoin. You can think of yCRV as an index of yield bearing stablecoins \(yDAI+yUSDC+yUSDT+yTUSD\) that also generates yield \(trading fees from the Curve Y pool\) as well. Therefore the price of yCRV is non-decreasing.
-
-#### If I unstake my yCRV from the yCRV vault, does that then revert it back to the Curve Y pool at Curve, or do I have to do something else like restake it there?
-
-- When you withdraw your yCRV from the vault, you get back yCRV + plus interest accrued - fees, all in yCRV. Since it is the yCRV token you got back, it is already staked in Curve Y pool making stablecoin swap fees. No need to do anything else with Curve, unless you want to stake it [here](https://dao.curve.fi/minter/gauges) to generate CRV.
-
-#### Why can’t we get a better APY for the YFI vault?
-
-- You can’t just get same numbers for 2 completely different coins. The new sBTC is following the same strategy that the yCRV vault using curve liquidity pool. The obvious answer is that there aren’t much safe platforms accepting YFI as stake so there aren’t much valid strategies for the YFI vault right now.
-
-#### I deposited into a vault, what will I get out when I withdrawal?
-
-- You will always withdrawal only the coin type that you put in.
-- You will get the amount you put in, plus the pool yield you earned, minus the fees.
-
-#### What are the Fees?
-
-- **0.5% fee** on funds withdrawn from active strategies
- - Each vault has some amount of the total funds idle and most of them active in the strategy. The idle funds are the difference between `vault holdings` and `strategy holdings`, you can see them on [feel the yearn](https://feel-the-yearn.app/).
- - When you withdraw, if your funds come from the idle funds, you won't be charged any withdrawal fee. If they come from the strategy, you will be charged the 0.5% fee.
-- **5% fee** on additional yield
- - For community-made strategies, like the new yETH vault, currently 10% of this fee goes to the strategy creator. The other 90% goes to the treasury and is then distributed to governance.
-
-#### Can you explain the 5% fee on additional yield?
-
-- Formerly this was called a "5% fee on subsidized gas" which confused literally everyone except Andre. Technically it is not a performance fee — it's a fee on the some profit-generating transactions that incur high gas costs and are critical to the vault's internal functioning.
-- Each vault has multiple levels. Here are two examples that show where this fee is taken when the `harvest()` function is called.
-- yCRV Vault example:
- - Level 1: stablecoins earn interest in money markets \(compound, aave, dydx\)
- - Level 2: the level 1 tokens \(yDAI, yUSDC, yUSDT, and yTUSD\) are provided as liquidty to the yCRV pool to earn trading fees
- - Level 3: the strategy earns CRV token rewards which it recycles into yCRV—**this is the only level where the 5% fee is taken.**
-- USDC Vault example:
- - Level 1: Interest for being lent out at Compound
- - Level 2: COMP liquidated to USDC
- - Level 3: The strategy earns DF tokens rewards from DForce that get harvested and sold for USDC—**this is the only level where the 5% fee is taken.**
-
-#### Where do the fees go?
-
-- They go to a dedicated treasury [contract](https://etherscan.io/address/0x93A62dA5a14C80f265DAbC077fCEE437B1a0Efde).
-- From the treasury they stay up to the \$500k limit, over that amount they are redirected to the governance staking [contract](https://etherscan.io/address/0xBa37B002AbaFDd8E89a1995dA52740bbC013D992).
-
-#### Did the fees always go there?
-
-- No, when yearn started they went directly to Andre's [address](https://etherscan.io/address/0x2d407ddb06311396fe14d4b49da5f0471447d45c).
-- Then we handed off to the [multisig](https://etherscan.io/address/0xFEB4acf3df3cDEA7399794D0869ef76A6EfAff52) and fees went directly there.
-- And before our current gov v2, staking rewards went [here](https://etherscan.io/address/0xb01419E74D8a2abb1bbAD82925b19c36C191A701)
-
-#### Yield
-
-- We plan to make a dashboard in the future that will clearly show your current APY of all the positions you have open. Currently for the Vaults as they are still in beta we are not showing the APY live, but it is post on [twitter](https://twitter.com/iearnfinance) around once a day. You can roughly estimate the yield you are getting by looking at what the [current strategy](https://feel-the-yearn.vercel.app/) is farming and checking what its APY is.
-- For example if yCRV vault is farming the CRV token, you can check what the yield is on [Curve's homepage](https://www.curve.fi/) for the Y pool
-
-### Vault Strategies
-
-#### What is a Vault Strategy?
-
-- Yearn's vault strategies are modular smart contracts for each vault that tells it what assets to borrow, which assets to farm, and where it should sell the farmed assets.
-
-#### What are the current strategies?
-
-- You can view the current strategies implemented at [feel-the-yearn](https://feel-the-yearn.vercel.app/).
-- In the future we plan to make a dashboard to make the strategies and APY easy to understand.
-
-#### Who is in control of the strategies?
-
-- Andre and other developers write them but the multi-sig decides if they will be implemented or not.
-
-#### How can I make a strategy?
-
-- For now you can post your strategy on the forum in the strategy section. Detailing what it should buy/sell/farm and what the current APY is. There will be a template to help you get started.
-
-#### What is the process for getting my strategy onto yearn?
-
-- Post it on the forum and if it gets approved it will be used in the vaults and you can get paid for it.
-
-#### When does a strategy changes and who changes it? Is it automatic?
-
-- For now Andre watches the markets and writes strategies that he and the multi-sig thinks are safe while giving the highest yield. They change them according to current yields on the market.
-
-### Earn
-
-- [yearn.finance/earn](https://yearn.finance/earn)
-
-#### What is Earn?
-
-- Earn is a yield aggregator for lending platforms that rebalances for highest yield during contract interaction.
-- Deposit DAI, USDC, USDT, TUSD, or sUSD and it will auto lend to the highest lending rate on these platforms [Compound](https://compound.finance/), [Dydx](https://dydx.exchange/) or [Aave](https://app.aave.com/home) \(Ddex and Fulcrum are currently disabled\).
-- Learn more in the [Yearn Docs](https://docs.yearn.finance/yearn.finance/yearn)
-
-### Zap
-
-- [yearn.finance/zap](https://yearn.finance/zap)
-
-#### What is Zap?
-
-- Zap allows users to convert supported tokens with just one contract interaction to reduce transaction costs.
-- Zaps were made by DefiZap which is now [Zapper.fi](https://zapper.fi) as a type of all in one DeFi routing service.
-
-#### Why use a Zap?
-
-- "Zaps allow you get into a DeFi position in one transaction — it’s called zapping in." - [How to use Zaps guide](https://defitutorials.substack.com/p/how-to-use-defizap).
- - Note that this is an old article and [Zapper](https://zapper.fi) was formed as a result of DeFiSnap + DeFiZap coming together to create the ultimate hub for Decentralized Finance aka \#DeFi. So some of the stuff in the article above is out of date, but you can still use Zaps on Zapper.fi.
-
-#### So what can I do with Zaps on yearn?
-
-- With a zap you can take your DAI, for example, and get yCRV with it in one transaction. Normally, to turn DAI into yCRV, you would have to go to earn, deposit DAI and receive yDAI, then go to [Curve.fi - Yearn pool](https://www.curve.fi/iearn/deposit) and deposit your yDAI and then you would get yCRV. This is a lot to do, so instead you can do it in one transaction!
-
-#### That sounds awesome, what's the downside?
-
-- Well, it does take a lot of gas and could be costly, even more so than doing it yourself manually, but if you have a big transaction and are in a rush it is a great method to get into a DeFi position or liquidity pool fast.
-
-### yInsure / Cover
-
-- [yinsure.finance](https://yinsure.finance/)
-
-#### What's yInsure?
-
-- yInsure, also known as **Cover**, is a pooled coverage system providing insurance against smart contract risk.
-- It has no KYC requirement and is underwritten by Nexus Mutual.
-- Learn more in this [article](https://medium.com/iearn/yinsure-finance-a-new-insurance-primitive-77d5d4217896).
-
-### Products Currently in Research & Development
-
-#### yTrade
-
-- [ytrade.finance](https://ytrade.finance/)
-- Leveraged stable coin trades \(testnet\).
-
-#### yLiquidate
-
-- [yliquidate.finance](https://yliquidate.finance/)
-- 0 capital automated liquidations for Aave \(testnet\).
-
-#### ySwap
-
-- [yswap.exchange](https://yswap.exchange/)
-- Single sided automated market maker \(testing in mainnet\).
-
-#### yBorrow
-
-- [yborrow.finance](https://yborrow.finance/)
-- Credit delegation vaults for smart contract to smart contract lending \(testnet\).
-
-## Communication
-
-- [Forum](https://gov.yearn.finance)
- - A lot of real-time discussion happens on the telegram and discord but for a proposal to turn into a YIP \(Yearn Improvement Proposal\) it needs to be posted and discussed on the forum.
- - This is the main place token holders check for governance related issues.
-- [Discord](http://discord.yearn.finance/)
- - Including non-English channels.
-- [Telegram](https://t.me/yearnfinance) - Main Chat.
-- [Telegram](https://t.me/yearncommunity) - Trading/Social/Fork Chat.
-- Twitter
- - [yearn.finance](https://twitter.com/iearnfinance?s=20) - Official Twitter of Yearn
- - [Andre Cronje](https://twitter.com/AndreCronjeTech?s=20) - Lead Developer of Yearn
- - [yLearnfinance](https://twitter.com/yLearnfinance) - Yearn Info
- - [Learn 2 Yearn](https://twitter.com/learn2yearn) - Yearn Info
-
-## Governance
-
-### All about YIPs
-
-#### What is a YIP? Why do they matter?
-
-- A YIP or Yearn Improvement Proposal is how features are added to the yearn ecosystem. Users start a proposal on the forum, discuss it and gauge the sentiment of if the proposal will be accepted. If a lot of users agree with it then it can be posted on-chain for everyone to vote on.
-
-#### How many people need to vote to pass a YIP proposed on-chain?
-
-- The quorum is 20%. Which means that 20% of the staked YFI needs to vote on a proposal for it to pass or else it will fail. Also, it has to have at least 50% of the votes for yes.
-- You can post your proposal on-chain first but if people haven't talked about it, they probably won't vote for it.
-
-#### How do I make a proposal?
-
-- The default template for proposals can be found on [Github](https://github.com/iearn-finance/YIPS/blob/master/yip-X.md) + on the [forum](https://gov.yearn.finance) if you make a post under proposals or discussion it will auto-fill in the template as well.
-- The process is roughly:
- 1. forum discussion
- 2. promote to YIP \(usually done by mods\), add YIP to github, put on chain
- 3. announce
-
-#### Who can make a proposal?
-
-- Anyone can post a proposal both on the forum and on-chain.
-
-### Voting
-
-#### How do I vote?
-
-- Stake your YFI and then you can cast your vote for YIPs that are on-chain on the voting [dashboard](https://ygov.finance/vote)
-
-#### Can I vote if my YFI is in the YFI vault?
-
-- No, your YFI must be staked in the governance [contract](https://ygov.finance/staking) in order to vote.
-
-#### Where can I view the YIPs?
-
-- You can view them on the voting [dashboard](https://ygov.finance/vote) if you login to your web3 account or at [yips.yearn.finance](https://yips.yearn.finance/all-yip).
-
-#### Why should I stake? What is the APY \(Annual Percentage Yield\)?
-
-- You should stake if you want to vote on YIPs and get rewards that are generated from the yearn ecosystem. The APY for staking is currently not listed on the UI. You can ask on the chat what the rate is.
-
-#### What do I have to do to get rewards with my YFI?
-
-- All you need to do is stake YFI at [ygov.finance/stake](https://ygov.finance/stake) and you will get rewards if the treasury is at or above 500k usd. You can check the treasury address [here](https://zapper.fi/dashboard?address=0xFEB4acf3df3cDEA7399794D0869ef76A6EfAff52).
-- Note that if you stake you get rewards \(as long as they are not going to the treasury\) but you can only claim them within 3 days of voting.
-
-#### Does staking my YFI matter for voting?
-
-- Yes. You have to stake your YFI at [ygov.finance/stake](https://ygov.finance/stake) in the v2 tab under Governance V2 to have your votes count. As of now, you can vote without staking, but you will waste your gas and it won't count so make sure you have staked first if you want to vote.
-
-#### What if I want to take my YFI out before the end of the vote lock?
-
-- You can't, sorry. The lock lasts 3 days after you last voted, until then you cannot unstake your tokens.
-- If you try to unstake your tokens before the lock ends you will see a very high gas cost, this is an error, you will not be able to unstake until the 3 day lock has ended
-
-#### I voted and I know the vote lock is 3 days, is there anywhere I can see exactly how long I have left till I can unstake my YFI?
-
-- Yes! You can read the contract directly ygov.finance staking [contract](https://etherscan.io/address/0xBa37B002AbaFDd8E89a1995dA52740bbC013D992#readContract) go to 28 votelock and input your eth address. This will give you the eth block number when you can unstake.
-
-#### What’s the difference between voting for a poll on the forum and an on-chain vote?
-
-- A poll just gauges the sentiment of what the community is feeling on the proposal while a on-chain vote will be binding and will take effect if it passes.
-
-#### What about the new gasless voting thing?
-
-- We now have an off-chain signaling system that uses staked balances from ygov. This replaces the older, informal forum polls which were vulnerable to sybil attacks. It can do multiple choice and doesn't cost gas to use, you sign with your wallet instead. We still use the normal on-chain voting system for YIPs.
-
-#### How long is my YFI tied up if I stake it?
-
-- Your YFI is locked for 3 days after you vote.
-
-#### Why can't I claim my staking rewards!
-
-- To claim your staking rewards you have to 1\) be staked and 2\) have voted within 3 days to be able to claim them. This will be fixed in an update soon.
-
-### yDAO
-
-- Pokemol [site](https://pokemol.com/dao/0xcb46298767fb5d44c18313976c30d3eeb5071862/).
-- Forum [post](https://gov.yearn.finance/t/ydao-for-community-funding/2243).
-
-#### What is its purpose?
-
-- Used to fund value-added contributions to the yearn ecosystem.
-
-#### Who cares, how do I make money from this?
-
-- You don't. This is solely for allocating funding for projects, and the YFI donated will be spent and your share value will be diluted.
-
-#### Who can join?
-
-- Open for anyone to join with a base rate of 1 Share = 0.1 YFI.
-
-#### How can I join?
-
-- Go here to [Pokemol](https://pokemol.com/dao/0xcb46298767fb5d44c18313976c30d3eeb5071862) sign in with your web3 account. Click New Proposal button in the top right. Click member.
- - Title: your name/entity
- - Description: “Pledging X amount of YFI in exchange for Y Shares” \(Please make this consistent with the amount being pledged at 0.1 YFI per share\)
- - Link: Link to you or your entity \(Website, Twitter, Linkedin\)
- - Shares Requested: The number of Shares being requested
- - Token Tribute: The amount of YFI being pledged \(you will need to unlock YFI\)
- - Loot: The number of shares being requested
- - After you submitted the two transactions and are in the new member queue, you will need a sponsor. Please copy the link to your proposal and let us know you’d like to join in the [yDAO Telegram channel](https://t.me/joinchat/Qn1GPBv0y7lY1vAmRCB7KA)
-
-#### How can I request funding?
-
-- The same ways as joining except instead of click member click the funding tab and fill in the details of your request. You can ask in the [telegram chat](https://t.me/joinchat/Qn1GPBv0y7lY1vAmRCB7KA) if you have any questions.
-
-#### I don't speak English, when will everything be translated?
-
-- We are working on translating to other languages but it will take time. For now you can go to your language in the global section in [Discord](http://discord.yearn.finance/).
-
-## Community
-
-### Is Andre Cronje in charge of yearn?
-
-- Andre isn't in charge of Yearn, the YFI token holders make the decisions on what to build and governance decisions, Andre is the lead developer of the yearn ecosystem.
-
-### What does Andre do?
-
-- Andre is the main developer building out the products that comprise the yearn ecosystem: Yearn, Ytrade, Yswap, Yliquidate, Yborrow. He is also currently in charge of running the Vaults and overseeing them.
-
-### What is the multisig and what do they do?
-
-- The multi-signature address is explained in detail in this [thread](https://gov.yearn.finance/t/yfi-minting-ownership/155). Basically, it is a 6 of 9 multi-signature account that has control over minting YFI if a vote to mint tokens has passed successfully.
-
-### Who are the 9 multisig signers?
-
-- [Cp0x.com](https://twitter.com/kaplansky1/status/1285427247286046725)
-- [Daryllautk](https://twitter.com/Daryllautk/status/1285434908383444992)
-- [Devops199fan](https://twitter.com/devops199fan/status/1285430347954622464)
-- [Banteg](https://twitter.com/bantg/status/1285426492906909696)
-- [Milkyklim](https://milkyklim.keybase.pub/yearn-social-proof.txt)
-- [Joe Mahon aka Substreight](https://twitter.com/Substreight/status/1299780260737630209)
-- [Tarun Chitra, Gauntlet](https://twitter.com/gauntletnetwork/status/1299778153674616833)
-- [Vasiliy Shapovalov, p2p.org](https://twitter.com/_vshapovalov/status/1299799139635679232)
-- [Mariano Conti, ex-MakerDAO](https://twitter.com/nanexcool)
-
-### Have the multisig signers changed?
-
-- Yes, [YIP-40](https://gov.yearn.finance/t/yip-40-replace-inactive-multisig-signers/3535) changed four of the signers
-- Outgoing signers were:
- - [Coopahtroopa](https://twitter.com/Cooopahtroopa/status/1285438650550038529)
- - [Michael, Curve.fi](https://twitter.com/CurveFinance/status/1285428322986389504)
- - [Calvin Liu](https://twitter.com/cjliu49/status/1285439553180798976)
- - [Damir Bandalo](https://twitter.com/damirbandalo/status/1285500362015875073)
-
-### What decisions can Andre make on his own?
-
-- Andre can build out the Yearn ecosystem and come up with new products. Usually, he posts his thoughts and ideas on the [forum](https://gov.yearn.finance) for everyone to see.
-
-### Does the multisig group tell him what to do?
-
-- They are in close contact with one another, but Andre's priorities are decided by YFI token holders via YIPs.
-
-### Who else writes code for yearn? Is there a team?
-
-- Right now it's just Andre.
-
-### Does anyone get paid for working on yearn?
-
-- As of this moment, not yet, but thanks to the passage of [YIP 36](https://yips.yearn.finance/YIPS/yip-36) and the creation of a community pool of funds that will be kept at 500k usd, we can now pay Andre for his work, fund audits, and pay for new devs to be hired along with anything else the the yearn ecosystem needs.
-
-### How can I work for yearn?
-
-- You can make a YIP to apply for funding from the 500k USD treasury directly or ask the yDAO for funding.
-
-### Do you have any job openings?
-
-- Yes, we do! We need all kinds of people to help make the yEarn ecosystem a thriving product and to give value to YFI. You can ask in the Discord or Telegram about applying or post on the forum. State how you think you can add value to Yearn, and how much you think you should be paid from the community pool. Also, you can go to the [yDAO](https://gov.yearn.finance/t/ydao-for-community-funding/2243) as well for funding on your work for the Yearn ecosystem.
-
-### How to Participate?
-
-- You can participate in YFI by voting on YIPs that are active, discussing the YIPs yet to be proposed on-chain on the forums and talking about YFI in the Telegram and Discord. If you know a second language help us translate the site and YIPs into that language.
-
-### Ongoing efforts to improve the Yearn ecosystem
-
-- You can view the active YIPs [here](https://yips.yearn.finance/all-yip)
-
-## User Interface
-
-### Can I use the Yearn ecosystem dApps on my phone?
-
-- Yes, you have to use the Metamask browser
-
-## Technical Support
-
-### I sent my ETH transaction but it says pending? How do I fix this?
-
-- You should always make sure to set your gas properly if you want a transaction to go through quickly. Check current gas prices at [Ethgasstation](https://ethgasstation.info/) or [gasnow](https://www.gasnow.org/).
-- If you're using MetaMask and you put your transaction through but it's going too slow, you have the option to speed it up by clicking the `speed up` button below your last pending transaction under "activity". This should resend the same TX again with a higher gas price to get it confirmed faster.
-- If you've tried everything and your transaction is still stuck pending, you can fix it by sending a transaction to the nonce of the first stuck transaction with a high gas price to overwrite the stuck queue. Here's a good [guide](https://ethgasstation.info/blog/stuck-transaction-guide) explaining how to do this.
-
-### Why is the withdrawal fee so high?
-
-- If you're seeing higher than normal fees while using the yearn ecosystem then it may be due to Ethereum congestion and abnormally high gas costs. Check [Ethgasstation](https://ethgasstation.info/). Your options are to wait until gas prices drop or spend the money to process your transaction now.
-- If the gas prices are crazy high, that means there is an error and the transaction will not be able to process. For instance if you are trying to deposit a token you don't have or if there is no cover available for a contract at [http://yinsure.finance/](http://yinsure.finance/).
-
-## Related Projects
-
-### [Curve](https://www.curve.fi)
-
-- Curve is an exchange liquidity pool on Ethereum \(like [Uniswap](https://app.uniswap.org/#/)\) designed for \(1\) extremely efficient stablecoin trading \(2\) low risk, supplemental fee income for liquidity providers, without an opportunity cost. Curve allows users \(and smart contracts like 1inch, Paraswap, Totle and Dex.ag\) to trade between DAI and USDC with a bespoke low slippage, low fee algorithm designed specifically for stablecoins and earn fees. Behind the scenes, the liquidity pool is also supplied to the Compound protocol or yearn.finance where it generates even more income for liquidity providers.
-- Curve [FAQ](https://www.curve.fi/rootfaq).
-
-### [Aave](https://app.aave.com/home)
-
-- Aave is an open source and non-custodial protocol enabling the creation of money markets. Users can earn interest on deposits and borrow assets.
-
-## Resources
-
-### Where can I learn more about yearn?
-
-- [Learn Yearn](https://www.learnyearn.finance/)
-- [Medium.com/iearn](https://medium.com/iearn)
-- [yCosystem](https://ycosystem.info/)
-
-### Lists of Smart Contracts
-
-- [https://gov.yearn.finance/t/yearn-contracts/1951](https://gov.yearn.finance/t/yearn-contracts/1951)
-- [https://etherscan.io/accounts/label/yearn-finance](https://etherscan.io/accounts/label/yearn-finance)
- - sign-in required
-- [Delegated controller](https://etherscan.io/address/0x2be5d998c95de70d9a38b3d78e49751f10f9e88b#readContract)
-- [StrategyVaultTUSD](https://etherscan.io/address/0x35CEE4c61B7619956e0B2015B5411F93CBba817A#code)
-- [yLINK token](https://etherscan.io/address/0x881b06da56bb5675c54e4ed311c21e54c5025298#code)
-- [yaLINK token](https://etherscan.io/address/0x29e240cfd7946ba20895a7a02edb25c210f9f324#readContract)
-- [StrategyMStableSavingsTUSD](https://etherscan.io/address/0xd6214317bf66921154d78e3074bada013a4de8e8#readContract)
-- [yTUSD](https://etherscan.io/address/0x37d19d1c4e1fa9dc47bd1ea12f742a0887eda74a)
-- [yTokenRebalance](https://etherscan.io/address/0x19b6424C58aFcee6D0cb954D4B8d44B9b5e9cC09#code)
-- [CollateralVaultProxy](https://etherscan.io/address/0xf0988322b8392245d6232e520bf3cdf912b043c4)
-- [USDC strategy for LINK](https://etherscan.io/address/0x25fAcA21dd2Ad7eDB3a027d543e617496820d8d6)
-- [Strategy for USDC vault](https://etherscan.io/address/0xA30d1D98C502378ad61Fe71BcDc3a808CF60b897)
-- [Strategy for USDC vault](https://etherscan.io/address/0xA30d1D98C502378ad61Fe71BcDc3a808CF60b897)
-- [DAI vault](https://etherscan.io/address/0xACd43E627e64355f1861cEC6d3a6688B31a6F952)
-
-### Registry of Tokens and Utility Contracts
-
-- [https://docs.yearn.finance/yearn.finance/yearn-1](https://docs.yearn.finance/yearn.finance/yearn-1)
-
-### Vaults Detail Reference
-
-- [https://vaults.finance/](https://vaults.finance/)
-
-### Statistics
-
-- [yieldfarming.info](https://yieldfarming.info/)
-- [yVault ROI Calculator](https://py-earn.herokuapp.com/)
-- [stats.finance/yearn](https://stats.finance/yearn)
-- [Feel The Yearn](https://feel-the-yearn.vercel.app/)
-- Initial Distribution [Dune Dashboard](https://explore.duneanalytics.com/dashboard/yearn)
-- Voting Stats [Dune Dashboard](https://explore.duneanalytics.com/public/dashboards/Lqnxzm7fa8NVhKC4kc37DDFPZgqXryaIjyLRYAYp)
-- Vaults Stats [Dune Dashboard](https://explore.duneanalytics.com/public/dashboards/g0bGfgloeXBd9C18jpBjdXi5KkQjR7IXYqFRUnHk)
-
-### Latest Yearn News
-
-- [yearn.finance](https://twitter.com/iearnfinance) - Offical Twitter of Yearn
-- [AndreCronjeTech](https://twitter.com/AndreCronjeTech)
-- [Yearn Finance](https://medium.com/iearn) - Offical Blog
-
-### Podcasts
-
-- [Unchained - Andre Cronje on YFI and the Fair Launch: ‘I’m Lazy’](https://unchainedpodcast.com/andre-cronje-of-yearn-finance-on-yfi-and-the-fair-launch-im-lazy/)
-- [Andre Cronje and the Philosophy of Yearn Finance](https://anchor.fm/hasu-research/episodes/6-Andre-Cronje-and-the-Philosophy-of-Yearn-Finance-ei4vds)
-- [The FTX Podcast - Andre Cronje DeFI Architect](https://open.spotify.com/episode/6d14TJtQU7eB69azelpdeh)
-- [Zapper Community Call - With Andre](https://www.youtube.com/watch?v=venoiaiVZ-U)
-- [In DeFi My Money is Actually Mine. Its a Beautiful Concept But it Comes With Responsibilities - Andre Cronje](https://anchor.fm/camila-russo/episodes/In-DeFi-My-Money-is-Actually-Mine--Its-a-Beautiful-Concept-But-it-Comes-With-Responsibilities-Andre-Cronje-ehs3op)
-- [YFI: Farming the Farmers \| Andre Cronje](http://podcast.banklesshq.com/25-king-of-the-yield-farmers-andre-cronje)
-
-### Blogs
-
-- [Yearn Finance - Offical Blog](https://medium.com/iearn)
- - [Yinsure.finance: A new insurance primitive](https://medium.com/iearn/yinsure-finance-a-new-insurance-primitive-77d5d4217896)
- - [Delegated Vaults Explained](https://medium.com/iearn/delegated-vaults-explained-fa81f1c3fce2)
- - [Yearn.finance v2](https://medium.com/iearn/yearn-finance-v2-af2c6a6a3613?source=---------3------------------)
- - [Yearn Governance Forum](https://medium.com/iearn/yearn-governance-forum-7b7c9d0300ac?source=collection_home---6------2-----------------------)
- - [YFI rewards pool](https://medium.com/iearn/yfi-rewards-pool-810ef9256ec6)
- - [YFI](https://medium.com/iearn/yfi-df84573db81)
-
-### Logos
-
-- Can be found in the Discord under [\#media-resources](https://discord.com/channels/734804446353031319/736132884443955242/740325105904779326)
diff --git a/governance.md b/governance.md
deleted file mode 100644
index 994f69ea..00000000
--- a/governance.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Governance
-
-YFI holders govern the Yearn ecosystem and are eligble to receive a portion of protocol profits. Therefore, YFI represents a right to govern the platform and a claim on earnings. Profits are obtained from each of Yearn's products.
-
-In order to claim profits, YFI holders stake their tokens into the [Governance contract](https://etherscan.io/address/0xBa37B002AbaFDd8E89a1995dA52740bbC013D992). Profits are periodically sent to this contract from the Yearn [Treasury Vault](https://etherscan.io/address/0x93a62da5a14c80f265dabc077fcee437b1a0efde#tokentxns), which temporarily holds profits before distribution to stakeholders. Profits are sent to the Governance contract after the Treasury Vault has accrued a \$500,000 reserve; this reserve is used to pay for various operational expenses, including developer compensation and community grants. The amount retained in the Treasury contract before profits are sent to the Governance contract are subject to change by YFI holders.
-
-In order to vote on proposal changes to the ecosystem YFI holders must be staked in the governance contract. Stakeholders are **_unable to withdraw_** their deposits for 72 hours after voting. They are also unable to claim their share of accrued, but undistributed profits, unless they have voted in a recent proposal. Profits are distributed as yCRV tokens.
-
-The staking portal simplifies this process and can be found [here](https://ygov.finance/staking).
-
-
diff --git a/governance/governance-and-operations.md b/governance/governance-and-operations.md
new file mode 100644
index 00000000..c9d5321c
--- /dev/null
+++ b/governance/governance-and-operations.md
@@ -0,0 +1,95 @@
+# Governance and Operations
+
+Since [YIP-61: Governance 2.0](https://gov.yearn.finance/t/yip-61-governance-2-0/10460) passed on April 25th, 2021, Yearn began the transition into a **multi-DAO** structure, managed by **constrained delegation**. This approach allows protocol development to not be stiffened by bureaucracy while maintaining a sufficient level of decentralization.
+
+Multi-DAO refers to the fluid number of decentralized autonomous organizations (DAOs) that contribute to the protocol in some unique way. These independent groups consist of YFI holders, yTeams and the Multisig.
+
+- **YFI holders** vote for changes to the protocol or the protocols governance structure
+- **yTeams** focus on specific aspects of the protocol or relevant operations
+- **Multisig** members execute or veto any on-chain decisions
+
+Token holders have ultimate say over what yTeams exist, who is part of the Multisig, and the limitations of each group's operational control. The term 'constrained delgation' originates from token holders delegating specific powers to various groups that build and manage Yearn.
+
+A simplified flow of governance would look like this:
+
+ 1. YFI holders create, destroy and define limitations of yTeams
+ 2. yTeam notifies yTx of a decision
+ 3. yTx creates a delegated transaction and send it to the Multisig
+ 4. Multisig executes or vetos the transaction
+
+## DAO Responsibilities
+
+
+
+### Token Holders
+
+it is the [YFI token](https://docs.yearn.finance/governance/yfi) holder's duty to create and vote for proposals that improve the protocol.
+
+| Proposals | Descriptions |
+|-----------|--------------|
+|Yearn Improvement Proposal (YIP)|A proposal to execute on any power delegated to YFI holders or outside the scope of enumerated powers|
+|Yearn Delegation Proposal (YDP)|A proposal to change where any discrete decision-making power is delegated|
+|Yearn Signaling Proposal (YSP)|A non-binding proposal to signal community feelings or intent on any issue|
+
+Specifically, these proposals allow token holders to make the following decisions:
+
+| Power | Description |
+|-------|-------------|
+|Manage Powers|YFI holders can vote to create, assign, or revoke discrete powers to or from yTeams|
+|Change YFI Token Contract|Any interaction with the YFI token contract, such as to mint YFI or burn the minting keys, remains under the control of YFI holders.|
+|Set Fees|Set the standard fee structures in the Yearn Protocol|
+|Change Multisig Signers|As the Multisig will continue to hold critical powers over the near term, only YFI holders can vote to change its signers|
+|Ratify yTeams|Formally ratify or deratify yTeams to control which yTeams can hold delegated powers|
+|Change yOps Signers|As yOps has the power to change signers of other yTeams, this is a special power to change the signers of yOps|
+|Spend Treasury Funds|Spend funds from the treasury|
+|YIP Power|YFI Holders have the power to propose a YIP on anything not already delegated|
+### yTeams
+
+Each yTeam has an objective and discrete powers which are defined by token holders. They can be broken further into membership pools, which are separate groups of contributors working towards similar goals as the overarching team. Additionally, one membership pool can be a part of multiple yTeams.
+
+| yTeam | Objective | Membership Pool |
+|-------|-----------|-----------------|
+|yGuard|Protect the vaults|YFI Protocol Dev, YFI Strategists, YFI Mechanics, YFI Secret Admirers|
+|yBrain|Manage the strats|YFI Strategists|
+|yDev|Manage the protocol|YFI Protocol Dev|
+|yPeople|Curate the team|YFI Compensation Working Group, YFI Advisors|
+|yBudget|Spend money well|YFI Finances, YFI Advisors|
+|yFarm|Grow the treasury|YFI Secret Admirers, YFI Secret Entrance|
+|yTx|Write transactions|YFI Doers|
+|yOps|Coordinate contributors|YFI Ops|
+
+Each yTeam is assigned specific decision-making powers, defined by YIP-61:
+
+| yTeam | Power | Description |
+|-------|-------|-------------|
+|yGuard|Emergency Powers|Immediately intervene in case of attack or bug to shutdown or rollback strategies or vaults|
+|yBrain|Manage Strategies|Activate, deactivate, tune, and maintain strategies|
+|yDev|Define Yearn Protocol|Decide what code is considered part of yearn and what isn’t|
+|yDev|Manage Protocol|Maintain and improve the Yearn Protocol|
+|yDev|Add Strategies|Add new strategies to vaults|
+|yTx|Delegate Transactions|Create delegated transactions for the multisig to sign and execute|
+|yPeople|Pay Team|Create, deploy, modify, or terminate Yearn compensation packages|
+|yBudget|Set Budgets|Create budgets for coordinape, grants, hiring, operations, or other workstreams|
+|yFarm|Farm Treasury|Farm with the treasury and make decisions on airdrops|
+|yOps|Ratify yTeam Signers|Formally approve or remove signers for each yTeam|
+
+### Multisig
+
+Decisions issued by yTeams will be executed on-chain by the Multisig until a more decentralized system is approved for implimentation. In the mean time, the [Multisig](https://docs.yearn.finance/resources/faq#who-is-on-the-multisig) controls the following:
+
+
+| Power | Description |
+|-------|-------------|
+|Execution Power|The power to execute decisions made by YFI holders and yTeams on-chain|
+|Veto Power|This power allows the Multisig to veto any decision and ideally should not be needed|
+|Transitionary Power|A temporary power enabling the Multisig to operate under the mandate of YIP-41 until the set of decision-making powers covers all needed transactions|
+
+
+## Future Implementations
+
+Yearn is continuously paving the way towards an ideal balance of DAO decentralization and productivity. The current phase of efforts impliment changes mostly on the social layer, and in the future we will be moving towards software implementations such as:
+
+- Multisig consensus mechanisms that allows each yTeam to have execution power
+- Move from proxy voting to on-chain voting
+- tokenize decision-making powers as NFTs
+- Utilize [Coordinape](https://coordinape.com/) for things like budget allocation and compensation
diff --git a/governance/proposal-process.md b/governance/proposal-process.md
new file mode 100644
index 00000000..61ba361b
--- /dev/null
+++ b/governance/proposal-process.md
@@ -0,0 +1,66 @@
+# Proposal Process
+
+The Yearn ecosystem is controlled by YFI token holders who submit and vote on off-chain proposals that govern the ecosystem. Proposals that generate a majority support (>50% of the vote) are implemented by a 9 member multi-signature wallet.
+
+Changes must be signed by 6 out of the 9 wallet signers in order to be implemented. The [members of the multi-signature wallet](https://docs.yearn.finance/resources/faq#who-is-on-the-multisig) were voted in by YFI holders and are subject to change from future governance votes.
+# Discussion
+
+Discussion regarding changes in the protocol happen on a variety of platforms such as:
+
+ - [Governance Forum](https://gov.yearn.finance/)
+ - [Discord](https://discord.yearn.finance)
+ - [Telegram](https://t.me/yearnfinance)
+
+It is recommended to get as much feedback as possible from the various channels of communication before introducing a formal proposal. The governance forum and Discord server have dedicated channels for specific topics.
+
+# Proposal
+
+## Types of proposals
+
+**Yearn Improvement Proposals** (YIPs) are an all-encompassing vehicle for exercising power that token holders are granted. After [YIP-61](https://gov.yearn.finance/t/yip-61-governance-2-0/10460), **Yearn Delegation Proposals** (YDPs) were introduced, which allow token holders to change where any discrete decision-making power is delegated.
+
+
+
+### Previous and current proposals
+- Previous: [Proposal Repository](https://docs.yearn.finance/governance/proposal-repository)
+- Current: [Snapshot](https://snapshot.page/#/yearn)
+
+### Requirements to pass proposals
+- 3 day discussion on the [forum](https://gov.yearn.finance/)
+ - At least 25% vote 'for' the change
+- 1 YFI in possession to submit to snapshot
+- 5 day [snapshot](https://snapshot.org/#/ybaby.eth) with over 50% passing votes
+
+## Making a proposal
+
+Anyone can post a proposal on the forum for discussion within the community. If it's promoted to off-chain votation (via [Snapshot](https://snapshot.page/#/yearn)), only someone holding 1 YFI can submit it to Snapshot. In case your proposal made it to off-chain votation and you don't have enough YFI, mods will help you.
+
+The default template for proposals can be found on [Github](https://github.com/yearn/YIPS/blob/master/yip-X.md) + on the [forum](https://gov.yearn.finance) if you make a post under proposals or discussion it will auto-fill in the template as well.
+
+**Resources**:
+- [Proposal How-To](https://gov.yearn.finance/t/proposal-how-to/106)
+- [YIP 0: YIP Purpose and Guidelines](https://yips.yearn.finance/YIPS/yip-0)
+- [YIP 44: Improve YIP Categories](https://yips.yearn.finance/YIPS/yip-44)
+- [YIP 55: Formalize the YIP Introduction and Voting Process](https://gov.yearn.finance/t/yip-55-formalize-the-yip-process/7959)
+
+# Voting
+
+## How do I vote?
+
+- Holding or staking YFI in the following places will enable you to vote on Yearn's [Snapshot](https://snapshot.page/#/yearn) page:
+ - Your wallet
+ - YFI yVault V2 (equivalent to holding the yvYFI token)
+ - Balancer YFI/WETH LP token
+ - Uniswap YFI/WETH LP token
+ - Sushiswap YFI/WETH LP token staked in MasterChef
+ - MakerDAO YFI collateral
+ - Unit Protocol YFI collateral
+ - Bancor
+
+## What’s the difference between voting for a poll on the forum and an off-chain vote?
+
+- A poll just gauges the sentiment of what the community is feeling on the proposal while an off-chain vote (via [Snapshot](https://snapshot.page/#/yearn)) will be binding and will take effect if it passes.
+
+# Implementation
+
+Once a Snapshot votes have passed, changes will be implemented by Yearn's protocol or operations team and signed by the multi-sig, if necessary.
diff --git a/governance/proposal-repository.md b/governance/proposal-repository.md
new file mode 100644
index 00000000..e6c4b2fd
--- /dev/null
+++ b/governance/proposal-repository.md
@@ -0,0 +1,52 @@
+# Proposal Repository
+
+Yearn Improvement Proposals (YIPs), Yearn Delegation Proposals (YDPs) and Yearn Signaling Proposals (YSPs) are all tools that token holders use to maintain and grow the protocol.
+
+## Approved
+
+|Number|Title|Author|
+|------|-----|------|
+|[34](https://yips.yearn.finance/YIPS/yip-34)|Add Synthetix (SNX) to yVaults|[Substreight](https://github.com/substreight)|
+|[52](https://yips.yearn.finance/YIPS/yip-52)|Make Strategist Skin in Game Partner for Make Benefit of Glorious Brain of Yearn|[banteg](https://github.com/banteg), [lehnberg](https://github.com/lehnberg), [milkyklim](https://github.com/milkyklim)|
+
+## Implemented
+
+|Number|Title|Author|
+|------|-----|------|
+|[0](https://yips.yearn.finance/YIPS/yip-0)|YIP Purpose and Guidelines|Yearn Community|
+|[1](https://yips.yearn.finance/YIPS/yip-1)|Minting more YFI|[Andre Cronje](https://github.com/andrecronje)|
+|[10](https://yips.yearn.finance/YIPS/yip-10)|Transitionary YFI Only Voting|[Rewkang](https://github.com/rewkang)|
+|[12](https://yips.yearn.finance/YIPS/yip-12)|Reducing the quorum for accepting proposal|[cp287](https://github.com/illlefr4u)|
+|[32](https://yips.yearn.finance/YIPS/yip-32)|Remove YFI burning|[Sunil Srivatsa](https://github.com/alphastorm)|
+|[33](https://yips.yearn.finance/YIPS/yip-33)|Add LINK to yVaults|[franklin](https://github.com/franklin501)|
+|[35](https://yips.yearn.finance/YIPS/yip-35)|Distribute Donations vs Purchase YFI|[Andre Cronje](https://github.com/andrecronje),[Klim K](https://github.com/milkyklim)|
+|[36](https://yips.yearn.finance/YIPS/yip-36)|System rewards as operational capital|[Andre Cronje](https://github.com/andrecronje), iTo, [n00b](https://github.com/jchi18), [Artem K](https://github.com/banteg)|
+|[37](https://yips.yearn.finance/YIPS/yip-37)|Participate in CRV governance and 2.5x CRV reward boost|[Andre Cronje](https://github.com/andrecronje), [Artem K](https://github.com/banteg)|
+|[38](https://yips.yearn.finance/YIPS/yip-38)|Distribute / Keep Balancer Rewards|[Klim K](https://github.com/milkyklim)|
+|[39](https://yips.yearn.finance/YIPS/yip-39)|Add Curve sBTC Pool LP-Tokens yVault|[uhmpeps](https://github.com/az)|
+|[40](https://yips.yearn.finance/YIPS/yip-40)|Replace inactive multisig signers|[cp287](https://github.com/illlefr4u), [Artem K](https://github.com/banteg)|
+|[41](https://yips.yearn.finance/YIPS/yip-41)|Temporarily Empower Multisig|[tracheopteryx](https://github.com/tracheopteryx), [Joe Mahon](https://github.com/Substreight), [franklin501](https://github.com/franklin501), Michael Anderson, Vance Spencer|
+|[44](https://yips.yearn.finance/YIPS/yip-44)|Improve YIP categories|[sam bacha](sam@freighttrust.com)|
+|[45](https://yips.yearn.finance/YIPS/yip-45)|Add a bounty for proposing YIPs that are implemented|[Sunil Srivatsa](https://github.com/alphastorm)|
+|[51](https://yips.yearn.finance/YIPS/yip-51)|Set Vault v2 Fee Structure|[banteg](https://github.com/banteg), [lehnberg](https://github.com/lehnberg), [milkyklim](https://github.com/milkyklim), [tracheoptery](https://github.com/tracheopteryx)|
+|[54](https://yips.yearn.finance/YIPS/yip-54)|Formalize Operations Funding|[banteg](https://github.com/banteg), [lehnberg](https://github.com/lehnberg), [lex_node](https://github.com/lex-node)|[milkyklim](https://github.com/milkyklim), [tracheopteryx](https://github.com/tracheopteryx)|
+|[55](https://gov.yearn.finance/t/yip-55-formalize-the-yip-process/7959/7)|Formalize the YIP Process|[franklin](https://github.com/franklin501)|
+|[56](https://snapshot.org/#/yearn/proposal/Qmb6gBzjvgLMazSrQQGVcjutLNdkVyM2Lh6yckMzdoaHWZ)|BABY: Buyback and Build|[lex_node](https://github.com/lex-node), [tracheopteryx](https://github.com/tracheopteryx), [Artem K](https://github.com/banteg), [Klim K](https://github.com/milkyklim), [Ryan Watkins](https://twitter.com/RyanWatkins_), [lehnberg](https://github.com/lehnberg)|
+|[57](https://snapshot.org/#/yearn/proposal/QmX8oYTSkaXSARYZn7RuQzUufW9bVVQtwJ3zxurWrquS9a)| Funding Yearn's Future| [aleks-blockchaincap](https://gov.yearn.finance/u/aleks-blockchaincap/summary), [Artem K](https://github.com/banteg), [dudesahn](https://twitter.com/dudesahn), [ekrenzke](https://gov.yearn.finance/u/ekrenzke), [lehnberg](https://github.com/lehnberg), [Klim K](https://github.com/milkyklim), [Ryan Watkins](https://twitter.com/RyanWatkins_), [srs-parafi](https://gov.yearn.finance/u/srs-parafi/summary), [tracheopteryx](https://github.com/tracheopteryx), [vooncer](https://gov.yearn.finance/u/vooncer/summary), [yfi-cent](https://gov.yearn.finance/u/yfi-cent/summary)|
+|[59](https://snapshot.org/#/yearn/proposal/QmdRCXH6BQpNcucoZqAtS5hQKjckE2428qiZoWjxmJXbs3)|Temporarily extend Multisig empowerment|[lehnberg](https://github.com/lehnberg)|
+|[60](https://snapshot.org/#/ybaby.eth/proposal/QmNqAqRKMFcoRjaRYAKCVETij6sjJ4S1293kbpYDMVvcjB)|Airdrops to Yearn Vaults|[lehnberg](https://github.com/lehnberg)|
+|[61](https://snapshot.org/#/ybaby.eth/proposal/QmSMyYeKrRpnA7Xn56o2NtbCUzxmhzCupL7LxMA1reXxq4)|Governance 2.0|[tracheopteryx](https://github.com/tracheopteryx), [lex_node](https://github.com/lex-node)|
+|[62](https://snapshot.org/#/ybaby.eth/proposal/QmddCbGYbkooZ1zp8oYnbBz6frXLRc9xbkapXcuZcdzmMF)|Change Two Multisig Signers|[lehnberg](https://github.com/lehnberg), [tracheopteryx](https://github.com/tracheopteryx), [Klim K](https://github.com/milkyklim), [banteg](https://github.com/banteg)|
+
+## Rejected
+
+|Number|Title|Author|
+|------|-----|------|
+|[2](https://yips.yearn.finance/YIPS/yip-2)|Burn YFI for fees |[Andre Cronje](https://github.com/andrecronje)|
+|[5](https://yips.yearn.finance/YIPS/yip-5)|Reducing YFI weekly supply|[Damir Bandalo](https://github.com/sikiriki12)|
+|[8](https://yips.yearn.finance/YIPS/yip-8)|Halving YFI weekly supply the same as bitcoin|steamer.eth|
+|[14](https://yips.yearn.finance/YIPS/yip-14)|Yearn Rewards Reserve |[YieldBouncer](https://github.com/yieldbouncer)|
+|[30](https://yips.yearn.finance/YIPS/yip-30)|YFI Inflation Schedule|[Substreight](https://github.com/substreight), [DeltaTiger](https://github.com/deltatigernz), [Hannes Graah](https://github.com/Graadient), [Daryl lau](https://github.com/Daryllautk), yfi_whale|
+|[31](https://yips.yearn.finance/YIPS/yip-31)|YFI Inflation Distribution|[Substreight](https://github.com/substreight), [DeltaTiger](https://github.com/deltatigernz), [Hannes Graah](https://github.com/Graadient), [Daryl lau](https://github.com/Daryllautk)|
+|[42](https://yips.yearn.finance/YIPS/yip-42)|Add RenBTC to yVaults|[Azeem](https://github.com/zu-ctrl)|
+|[43](https://yips.yearn.finance/YIPS/yip-43)|Improve YIP categories|[sam bacha](sam@freighttrust.com)|
diff --git a/governance/yfi.md b/governance/yfi.md
new file mode 100644
index 00000000..707e84fb
--- /dev/null
+++ b/governance/yfi.md
@@ -0,0 +1,46 @@
+# YFI
+
+El token YFI es una herramienta para coordinar a los contribuidores de Yearn, la comunidad y los protocolos asociados. Fue creado para descentralizar la gerencia y desarrollo de los productos de Yearn proveyendo a la vez de un ambiente para la innovación acelerada.
+
+### Detalles
+
+**Contrato del token:** [0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e](https://etherscan.io/address/0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e)
+
+**Suministro:** 36,666 / 36,666 tokens creados
+
+
+## La evolución de YFI
+
+La responsabilidad de los holders del token YFI así como el papel que juega el mismo en Yearn esta creado para ser dinámico. Todas las funciones pueden ser modificadas por la comunidad en cualquier momento y han habido múltiples ocasiones en las que esto ha sucedido.
+
+Desde la semana de la creación de YFI, se ha discutido de forma extensa sobre la emisión, suministro y los poderes de los holders del token.
+
+### Distribución
+
+Cuando el token YFI fue desplegado, los usuarios de varios protocolos de DeFi han sido capaces de [obtenerlo](https://www.youtube.com/watch?v=kjv-sW2PBS4&ab_channel=DeFiTutorialswithDeFiDad) al proveer liquidez a fondos de liquidez específicos. 30.000 tokens han sido dados como recompensa de forma proporcional a los proveedores de liquidez de Curve Finance, el fondo de liquidez de YFI/DAI en Balancer y el pool de liquidez del token YFI/yPool LP de Balancer. Se ha hecho staking de los tokens resultantes de depositar en estos fondos de liquidez a través de una interface descontinuada de Yearn, y los usuarios que han realizado este staking han sido recompensados con YFI por un aproximado de 7 días hasta que se ha agotado el suministro.
+
+### Emisiones descontinuadas
+
+YFI ha sido creado con una función para crear tokens. Originalmente, esta función era controlado solo por Andre Cronje, pero poco después de comenzar las emisiones, el control ha sido otorgado a una cartera multifirma.
+
+Debido a que la intención por la cual ha sido creado YFI es el ser controlado de forma totalmente descentralizada, na había un plan concreto para la emisión del token a partir de la distribución de los 30.000 tokens iniciales. En el [YIP-1](https://yips.yearn.finance/YIPS/yip-1) se ha aprobado la distribución semanal de YFI, pero para la ejecución de la propuesta se requiere una segunda decisión sobre el cómo se distribuirá y la misma no se ha llevado a cabo.
+
+### Faseando los ingresos por staking de YFI
+
+Empezando con el [YIP-36](https://yips.yearn.finance/YIPS/yip-36), una porción de las recompensas por staking fueron redirigidos a la cartera multifirma con el fin de financiar gastos operativos. Cuando la cartera multifirma pudo mantener un colchón de 500.000$, se han distribuido recompensas a los holders de YFI.
+
+Con el [YIP-56](https://snapshot.org/#/yearn/proposal/Qmb6gBzjvgLMazSrQQGVcjutLNdkVyM2Lh6yckMzdoaHWZ) se dejo disolvió el sistema de staking del todo y se optó por el sistema de recompra. Esto dirigió mas capital a la tesorería de Yearn beneficiando a los token holders sacando YFI del mercado abierto. Con esto, la vault de gobernanza fue retirada y se les permite a los holders participar en la gobernanza al holdear YFI en cualquier lugar.
+
+### Creando tokens de YFI
+
+Los holders de YFI han votado para crear 6.666 tokens de YFI. 1/3 de los tokens creados se darán a los colaboradores principales y 2/3 de los YFI creados irá a la tesorería para ser desplegados y controlados por la gobernanza.
+
+Después de la aprobación [YIP-57](https://snapshot.org/#/yearn/proposal/QmX8oYTSkaXSARYZn7RuQzUufW9bVVQtwJ3zxurWrquS9a) todos los tokens fueron creados en un solo día.
+
+### Poderes definidos en la gobernanza 2.0
+
+La gobernanza 2.0, descrita en el [YIP-61](https://snapshot.org/#/ybaby.eth/proposal/QmSMyYeKrRpnA7Xn56o2NtbCUzxmhzCupL7LxMA1reXxq4), expandieron las responsabilidades de los holders del token, de crear y votar en las propuestas de mejora de Yearn (YIP), a crear y votar en las propuestas delegaciones de Yearn (YDPs).
+
+Los YSPs permiten a los holders crear solicitudes formales para que un yTeam ejecute una decisión con el poder requerido para la misma. Esto da una voz a los token holders evitando pasar por el proceso de un YIP. yTeams pueden elegir respetar la sugerencia o no, y si no lo hacen, puede convertirse en una YIP formal.
+
+Las YDPs son propuestas que cambian donde cualquier poder de decisión discreto es delegado. Esto es relevante en la gobernanza 2.0 ya que es la introducción a los yTeams, los cuales tienen un objetivo y ciertos poderes los cuales pueden ser modificados por los holders del token YFI.
diff --git a/how-to-guides/how-to-mint-yusd.md b/how-to-guides/how-to-mint-yusd.md
deleted file mode 100644
index 5383e100..00000000
--- a/how-to-guides/how-to-mint-yusd.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# How to Mint yUSD
-
-This visual guide will walk you through every step in minting yUSD at [https://vaults.finance](https://vaults.finance/).
-
-You can learn more about yUSD here: [https://docs.yearn.finance/yusd](https://docs.yearn.finance/yusd)
-
-## Prerequisites
-
-- You must have DAI, USDC, USDT, TUSD, or yCRV to use for buying yUSD.
-- You must use a supported wallet, either Metamask, Trustwallet, Trezor, or Torus.
-
-## Visual Walkthrough
-
-1\) Go to [https://vaults.finance](https://vaults.finance/) and click `Connect`
-
-
-
-2\) Click on the wallet you are using, for this demo we'll use MetaMask
-
-
-
-3\) If you have multiple addresses in your wallet, select the one you're planning to use to mint yUSD then click `Next`
-
-
-
-4\) Click `Connect`
-
-
-
-5\) You will now see your address in the upper right corner \(this is the address mapped to my ens tracheopteryx.eth\). You will also see your balance of compatible tokens on the left.
-
-
-
-6\) Click `Depost All` to deposit all the tokens shown on the left into the yCRV vault to mint yUSD.
-
-
-
-7\) Click `Confirm` to approve your deposit or click `Edit` to increase the gas fee if Ethereum is busy \(check [https://ethgasstation.info](https://ethgasstation.info/) for current rates\). If you are depositing more than one type of token \(e.g. DAI and USDC\) you will need to do this step to approve each one.
-
-
-
-8\) You will see this screen as the Ethereum blockchain processes your approval transaction.
-
-
-
-9\) Once the approval is processed, click `Confirm` to actually make the depost \(or edit the gas fee first as before if you want to increase it\).
-
-
-
-10\) You will see this screen as your transaction is processing. If this takes too long, you may not have set a high enough gas fee or you may have a stuck transaction, check our [FAQ page](https://docs.yearn.finance/faq#i-sent-my-eth-transaction-but-it-says-pending-how-do-i-fix-this) for how to resolve slow or stuck transactions.
-
-
-
-11\) Your deposit was successful!
-
-
-
-12\) Now you can see your balance of yUSD here and in your wallet!
-
-
-
-13\) Go to [https://addyearn.finance](https://addyearn.finance/) and click `Add Token` to add yUSD to MetaMask then `Add Token` again in the MetaMask window.
-
-
-
-## That's it!
-
-If you have any further questions or get stuck somewhere, ask for help on the Support channel in our discord: [http://discord.yearn.finance](http://discord.yearn.finance)
diff --git a/how-to-guides/how-to-participate-in-a-yvault.md b/how-to-guides/how-to-participate-in-a-yvault.md
deleted file mode 100644
index 4ad4fa36..00000000
--- a/how-to-guides/how-to-participate-in-a-yvault.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# How To Participate in a yVault
-
-This visual guide will walk you through every step in depositing funds in a [yVault](https://docs.yearn.finance/products/yvaults).
-
-## Prerequisites
-
-- You must have the yVault's underlying token. For DAI yVault, you must have DAI.
-- You must use a supported wallet, either Metamask, Trustwallet, Trezor, or Torus.
-
-## Walkthrough
-
-### 1. Go to [Vaults page](https://yearn.finance/vaults) and click on “Connect your wallet”
-
-
-
-### 2. Choose your favorite wallet
-
-
-
-### 3. Enter your password and click “Unlock”
-
-
-
-### 4. Choose which Vault you want to deposit into, for example, the DAI Vault
-
-
-
-### 5. Enter the amount of DAI that you want to deposit
-
-
-
-### 6. Click “Deposit”
-
-
-
-Click on **25%, 50%, 75% or 100%** to deposit the corresponding proportion of your wallet into the Vault.
-
-Or click “Deposit All” if you would like to **deposit 100%** of the chosen digital asset from your wallet into the Vault.
-:::info
-Please note before you make a deposit that there is a **0.5% withdrawal fee**. The longer you leave the deposit to earn returns in the Vault, the more likely your returns will exceed the withdrawal fee.
-:::
-
-### 7. Approve yearn.finance to spend your DAI token (first time only) and then click “Confirm” again to approve the deposit
-
-
-
-You need to pay a **transaction fee in Ether (ETH)** to approve yearn.finance to spend your DAI.
-
-Make sure there is **enough ETH in your wallet**.
-
-### 8. Receive your yToken (in this case it would be yDAI)
-
-The yDAI you receive is your **share of the DAI Vault**. The amount of yDAI in your wallet will **remain constant** over time but the value of it will increase as the DAI Vault earns returns.
-
-The amount of yDAI you receive will be less than 1 per DAI you deposited because yDAI is worth more than 1 DAI.
-
-For example, at block number 10611372 yDAI was equal to 1.044 DAI. Therefore had you deposited 100 DAI, you would have received 95.78 yDAI (100 / 1.044).
-
-### 9. Track your earnings
-
-[Yearn Party](https://yearn.party/) shows an approximate running total for how much you have earned in the Vault.
diff --git a/mlc_config.json b/mlc_config.json
new file mode 100644
index 00000000..127ae8b5
--- /dev/null
+++ b/mlc_config.json
@@ -0,0 +1,12 @@
+{
+ "ignorePatterns": [
+ {
+ "pattern": ""$"
+ }
+ ],
+ "timeout": "20s",
+ "retryOn429": true,
+ "retryCount": 5,
+ "fallbackRetryDelay": "30s",
+ "aliveStatusCodes": [200, 206]
+}
diff --git a/package.json b/package.json
index 40110088..2189da21 100644
--- a/package.json
+++ b/package.json
@@ -12,11 +12,11 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/iearn-finance/docs.git"
+ "url": "git+https://github.com/yearn/yearn-docs.git"
},
"license": "GPL-3.0-only",
"bugs": {
- "url": "https://github.com/iearn-finance/docs/issues"
+ "url": "https://github.com/yearn/yearn-docs/issues"
},
"homepage": "https://docs.yearn.finance/",
"devDependencies": {
diff --git a/products/yinsure.md b/products/yinsure.md
deleted file mode 100644
index 8984d30d..00000000
--- a/products/yinsure.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# yInsure
-
-[yInsure](https://yinsure.finance/), also referred to as **Cover**, is a smart contract cover underwritten by [Nexus Mutual](https://nexusmutual.io/). It is decentralised and there is no KYC required to obtain cover. It consists of three components:
-
-- **Cover Vaults** hold assets that are used to provide payment in the event of a claim;
-- **Covered Vaults** hold assets that the "cover holder" desires to be covered, and;
-- **Claim Governance** which represents the claim arbitration process
-
-The system consists of many market participants, including:
-
-- **Cover providers:** Deposits funds into the Cover Vaults
-- **Cover holders:** Pays premiums in order to obtain cover for their Covered Vaults
-- **Claimants:** Cover holders who have an approved claim and are entitled to payment
-
-While smart contract cover can provide some protection against smart contract risks, it is **not** insurance.
-
-## Cover Vaults
-
-Contains the assets used in the capital pool, which can provide payment in the event of a claim. The Cover Vaults works as follows:
-
-- Cover providers deposit USDC to the vault, and in return receive yiUSDC.
-- yiUSDC represents cover provider's original deposit and ultimately the cover capital pool.
-- Cover providers receive initiation fees and weekly premiums paid by the cover holder.
-- If a claim is approved, USDC will be paid out of the cover vault to the cover holder \(claimant\).
-
-## Covered Vaults
-
-Contains the assets that cover holders desire to obtain insurance on. The Covered Vaults work as follows:
-
-- If a cover holder wishes to obtain cover on USDT, he/she would deposit USDT to the Covered Vault, and in return receive yiUSDT.
-- yiUSDT represents the cover holder's deposit and can be withdrawn at any time.
-- The covered sum is the value of the asset in dollars at deposit. The cover holder is charged a 0.1% initiation fee at deposit and ongoing 0.1% weekly fees.
-
-The intention is that [yVaults](https://yearn.finance/vaults) \(such as yUSD\) can be Covered Vaults.
-
-## Claim Governance
-
-Represents the claim arbitration process. This process works as follows:
-
-- Cover holders submit claims by staking the asset they received during deposit \(yiUSDT\).
-- Cover providers vote with the assets they received during deposit \(i.e., yiUSDC\) on whether the claim is valid or not.
-- If a claim is approved, the cover holder receives the USDC and the cover provider receives the yiUSDT from the cover holder.
-- The voting period is three days, requires 33% approvals to pass, and can be vetoed with 25% of the voting power.
-- Any tokenized ERC-20 token can be covered. Base assets \(LINK, ETH, etc.\) or composite assets such as aLINK or yaLINK can also be covered.
-- If cover providers deny valid claims, cover holders will no longer use the system and ultimately make it unprofitable for cover providers.
-
-{% hint style="info" %}
-
-### **A Common Misconception: Not Insurance**
-
-The smart contract cover underwritten by Nexus Mutual is not a contract of insurance. It is a discretionary cover provided by members of the mutual to each other. Members have full discretion on which claims payments are made. Members are putting trust in the economic incentive model rather than an insurance company. Learn more on [Understanding Nexus Mutual](https://medium.com/nexus-mutual/understanding-nexus-mutual-bb2946dad919).
-{% endhint %}
-
-## Resources
-
-- [yInsure Homepage](http://yinsure.finance/)
-- Medium article: [yinsure.finance a new insurance primitive](https://medium.com/iearn/yinsure-finance-a-new-insurance-primitive-77d5d4217896)
diff --git a/products/yvaults.md b/products/yvaults.md
deleted file mode 100644
index 04726a8e..00000000
--- a/products/yvaults.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# yVaults
-
-The goal of the Vaults program is to empower the community to quickly and safely create and utilize the most effective yield farming robots created by the industry's best strategists.
-
-yVaults have a 0.5% withdrawal fee and a 5% fee on additional yield whenever the `harvest()` function is called, [see the FAQ](https://docs.yearn.finance/faq#what-are-the-fees) for more details. Individual profits are allocated on a pro-rata basis determined by the share each depositor contributes to the pool.
-
-### Available yVaults
-
-There are currently nine yVaults. You can access them here: [https://yearn.finance/vaults](https://yearn.finance/vaults) 1. ETH/WETH 2. YFI 3. yDAI+yUSDC+yUSDT+yTUSD \(yCRV\) 4. crvBUSD 5. crvBTC 6. DAI 7. TUSD 8. USDC 9. USDT
-
-The tokens identified above are deposited into their respective yVaults and used to yield farm using current opportunities in the market.
-
-The vaults are created and maintained by a Controller, who oversees the strategy execution. Profits generated from each respective vault are used to purchase more of the underlying asset in each vault \(e.g., the YFI vault's profits are used to purchase additional YFI\); therefore, _the vaults represent a a continuous buy-and-hold strategy._
-
-### yETH Vault Mechanics
-
-The Controller opens a colleratlized debt position \(CDP\) at MakerDAO using ETH as collateral and mints DAI. The DAI is deposited into the yDAI vault. The collateralization ratio—a metric of financial leverage—is targeted to always be at least 200%. Automated bots periodically pay down the DAI debt if the ratio falls below 200%. The DAI is redeemed from [Curve](http://curve.fi/) and is not purchased from the open market \(i.e., yDAI is burned and redeemed for DAI\). Excess DAI earned from yield farming are used to purchase additional ETH, which is deposited into the yETH vault.
-
-
-
-### Delegated yVaults
-
-Volatile assets can also particpate in yield farming strategies as part of the delegated yVault product. Currently, there is only one delegated yVault: aLINK.
-
-Profits generated from the delegated yVault are used to purchase more of the underlying asset. Once again representing _a continuous buy-and-hold strategy_, allowing the depositor to remain 100% exposed to the asset. Depositors can withdraw their initial deposits and accrued profits, if any, at any time after a 0.5% fee taken on deposit.
-
-#### Mechanics
-
-The Controller deposits LINK into AAVE and borrows stablecoins. If at any time the health factor drops below the vault's configured value \(currently set to 2\), the Controller repays a portion of the debt in order to maintain a health factor above its configured value.
-
-The stablecoins borrowed \(e.g., USDC, DAI, USDT, etc.\) depend on the strategy selected by the Controller. After obtaining stablecoins the Controller will deposit them into one of the yVaults identified above.
-
-
-
-## Resources
-
-- [Vaults Homepage](https://yearn.finance/vaults)
-- Medium Article: [yETH vault explained](https://medium.com/iearn/yeth-vault-explained-c29d6b93a371)
-- Medium Article: [Delegated Vaults Explained](https://medium.com/iearn/delegated-vaults-explained-fa81f1c3fce2)
diff --git a/resources/audits.md b/resources/audits.md
new file mode 100644
index 00000000..26d9e8fb
--- /dev/null
+++ b/resources/audits.md
@@ -0,0 +1,127 @@
+# Security Audits
+
+Yearn Finance prioritizes user security. Before any vault is enabled on Yearn's primary website, it is tested and reviewed by industry leading developers and auditors.
+
+## Earn Protocol
+
+### Earn DAI Pool Audit
+
+Author: CertiK
+Date: 02/19/2020
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202002_Certik_itoken/Certik%20-%20itoken-finance-audit-report-1.1.0.pdf)
+
+### Earn Protocol Audit
+
+Author: CryptoManiacs
+Date: 12/04/2020
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202000_Mixed_yearn-finance/CryptoManiacs%20%20-%20Audit%20of%20iearn.finance%20by%20CryptoManiacs%20-%20HackMD.pdf)
+
+## Yearn Vaults V1
+
+### Yearn Finance V1 Audit
+
+Author: Quantstamp
+Date: 07/24/2020
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202007_Quantstamp_yearn-finance/Quantstamp%20-%20Yearn.Finance%20Security%20Review.pdf)
+
+### Yearn Finance V1 Audit
+
+Author: MixBytes
+Date: 11/05/2020
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202011_MixBytes_vaultsv1/MixBytes%20-%20Yearn.Finance%20protocol%20v.1%20Smart%20Contracts%20Audit%20Security%20Audit%20Report.pdf)
+
+## Yearn Vaults V2
+
+### Yearn Vault V2 (Vyper) Audit
+
+Author: MixBytes
+Date: 12/02/2020
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202012_MixBytes_yearn-vaults/MixBytes_Yearn_Vault_v_2_Smart_Contract_Audit_Report_Vyper_part.pdf)
+
+### Yearn Vault V2 (Solidity) Audit
+
+Author: MixBytes
+Date: 12/03/2020
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202012_MixBytes_yearn-vaults/MixBytes_Yearn_Vault_v_2_Smart_Contract_Audit_Report_Solidity_part.pdf)
+
+### Yearn V2 Audit
+
+Author: Martinet Lee and Jun-You Liu
+Date: 12/04/2020
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202000_Mixed_yearn-finance/YearnV2_%20our%20gotcha%20notes%20-%20HackMD.pdf)
+
+### Yearn v2 Vaults Security Assessment
+
+Author: Trail of Bits
+Date: 04/30/2021
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/20210719_ToB_yearn_vaultsv2/ToB_-_Yearn_Vault_v_2_Smart_Contracts_Audit_Report.pdf)
+
+## Yearn Vault Strategies
+
+### Yearn Vault V2 yCRV Strategy
+
+Date: 12/04/2020
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202000_Mixed_yearn-finance/StrategyCurveYCRV.sol%20-%20HackMD.pdf)
+
+### Yearn Vault V2 Hegic Strategies
+
+Author: PeckShield
+Date: 01/17/2021
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202101_Peckshield_yearn-strategies/PeckShield_Yearn_Strategies_v_2_Hegic_and_Dai_Smart_Contracts_Audit_Report.pdf)
+
+### Yearn Vault V2 Generic Lender Strategy
+
+Author: MixBytes
+Date: 02/19/2021
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202102_MixBytes_yearn-generic-lender/MixBytes_YearnV2_generic_lender_strat_Smart_Contracts_Security_Audit_Report.pdf)
+
+### Yearn Vault V2 3pool Strategy
+
+Author: MixBytes
+Date: 03/24/2021
+[Report](https://github.com/yearn/yearn-security/blob/master/audits/202103_MixBytes_yearn-ypool-3pool/MixBytes_-_Yearn_Stablecoins_3pool_Contracts_Audit_Report.pdf)
+
+### Yearn Vault V2 Ypool Strategy
+
+Author: MixBytes
+Date: 03/27/2021
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202103_MixBytes_yearn-ypool-3pool/MixBytes_-_Yearn_Stablecoins_Ypool_Contracts_Audit_Report.pdf)
+
+### Yearn yveCRV Strategy
+
+Author: MixBytes
+Date: 04/06/2021
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202104_MixBytes_yearn-yvboost/MixBytes_-_Yearn_Yvboost_Contracts_Audit_Report.pdf)
+
+### Yearn Curve-Voter-Proxy Strategy
+
+Author: MixBytes
+Date: 04/15/2021
+[Report](https://github.com/yearn/yearn-security/blob/master/audits/20210423_MixBytes_yearn_curve_voter_proxy/MixBytes_-_Curve_Voter_Proxy_Security_Audit_Report.pdf)
+
+### Yearn Generic Aave Strategy
+
+Author: MixBytes
+Date: 04/23/2021
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/20210428_MixBytes_yearn_generic_lender_aave/MixBytes_-_Yearn_Generic_Lender_Aave_Contracts_Audit_Report.pdf)
+
+### Yearn SNX Staking Strategy
+
+Author: MixBytes
+Date: 05/24/2021
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/20210526_MixBytes_yearn_strategies_snx/MixBytes_-_Yearn_Strategies_SNX_Contracts_Audit_Report.pdf)
+
+### Yearn Liquity Stability Pool Strategy
+
+Author: MixBytes
+Date: 06/02/2021
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/20210616_MixBytes_yearn_liquity_stabily_pool/MixBytes_-_Yearn_Liquity_stability_pool_Security_Audit_Report.pdf)
+
+
+## Other Contracts
+
+### Yearn Affiliate Wrapper Contract
+
+Author: MixBytes
+Date: 04/09/2021
+[Report](https://github.com/yearn/yearn-security/raw/master/audits/202104_MixBytes_yearn-v3-wrapper/MixBytes_-_Yearn_Vault_v.3_Wrapper_Smart_Contracts_Audit_Report.pdf)
diff --git a/defi-glossary.md b/resources/defi-glossary.md
similarity index 100%
rename from defi-glossary.md
rename to resources/defi-glossary.md
diff --git a/resources/faq.md b/resources/faq.md
new file mode 100644
index 00000000..a2289f73
--- /dev/null
+++ b/resources/faq.md
@@ -0,0 +1,151 @@
+# FAQ
+
+## Products
+
+### yVaults
+
+#### How can I deposit?
+
+- [yVaults](https://docs.yearn.finance/using-yearn)
+
+#### What are the implications of depositing or withdrawing with an asset that isn't native to the vault?
+
+- You can potentially [lose value](https://docs.yearn.finance/using-yearn#if-you-dont-have-the-required-token-for-the-vault-that-you-would-like-to-deposit-in) to slippage.
+
+#### Where can I go to see how my deposit is performing?
+
+- [Tools to track your funds](https://docs.yearn.finance/using-yearn#tools-to-track-your-funds)
+
+#### When do I realize profits from a vault?
+
+- Your profits [are compounded](https://docs.yearn.finance/using-yearn#tools-to-track-your-funds) into the vault token overtime, which can be withdrawn for your principal plus profit.
+
+#### Can I deposit and any token into any vault?
+
+- [Zap](https://docs.yearn.finance/yearn-finance/yvaults/overview#zap-in-with-any-asset)
+
+#### What is the fee structure?
+
+- [Fees](https://docs.yearn.finance/yearn-finance/yvaults/overview#yvault-fee-structure)
+
+#### How is vault growth calculated?
+
+- [Vault Returns](https://docs.yearn.finance/resources/guides/how-to-understand-yvault-roi#roi-calculation)
+
+#### How can I migrate vaults?
+
+- When it is announced that you need to migrate vaults, there will be a popup on the user interface that gives you the option of withdrawing or migrating your funds.
+
+#### Why is gas so expensive?
+
+- Gas prices fluctuate and can be monitored with tools like [Etherscan](https://ethereumprice.org/gas/) and [Gas Now](https://www.gasnow.org/).
+
+#### What is yveCRV?
+
+- [How to understand yveCRV](https://docs.yearn.finance/resources/guides/how-to-understand-yvecrv)
+
+### Vault Strategies
+
+#### What is a Vault Strategy?
+
+- [Strategies](https://docs.yearn.finance/yearn-finance/yvaults/vaults-and-strategies)
+
+#### Where can I find strategy descriptions?
+
+- [Yearn State of the Vaults](https://medium.com/yearn-state-of-the-vaults/the-vaults-at-yearn-9237905ffed3)
+
+#### Where can I find current strategy contracts?
+
+- [yearn.watch](https://yearn.watch/)
+
+#### Does anyone monitor strategy performance?
+
+- [Strategists and Guardians](https://docs.yearn.finance/yearn-finance/yvaults/vaults-and-strategies)
+
+#### What is the process for getting my strategy onto Yearn?
+
+- [Protocol Contributors](https://docs.yearn.finance/contributors/contributors/#build)
+
+#### My strategy hasn't been harvested in a while. Is that normal?
+
+- Strategies don't have a set time period in which they harvest. Even if your strategy has created profit, harvest timing is still optimized with fees taken into account.
+
+#### How do I check which strategy my funds are in?
+
+- On [yearn.watch](https://yearn.watch), find your vault and click on the name. Click on the 'Allocation' tab to see what strategies are being utilized by the vaults. The debt percent allocation reflects the percent of vault funds allocated to each strategy.
+
+
+
+## Governance
+
+#### Who is on the multisig?
+
+- [Yearn's Multisig](https://gov.yearn.finance/t/yip-62-change-two-multisig-signers/10758/)
+
+#### What is a YIP?
+
+- [Yearn Improvement Proposals](https://docs.yearn.finance/governance/proposal-process#proposal)
+
+#### How do I vote?
+
+- [Voting Details](https://docs.yearn.finance/governance/proposal-process#voting)
+
+## Security
+
+#### Is it safe to invest money in Yearn?
+
+- Please do your own research and decide for yourself.
+
+#### Is Yearn audited?
+
+- [Security Audit Repository](https://docs.yearn.finance/resources/audits)
+
+#### Where should I report a bug?
+
+- [File a bug](https://docs.yearn.finance/contributors/contributors/#file-a-bug) — create a new issue in the relevant repository.
+
+## Support
+
+#### I deposited into a vault, but the vault token isn't showing in my wallet? How do I make it appear?
+
+- On the [yearn.finance](https://yearn.finance) user interface, click the name of the vault that you deposited in. This will take you to to the Etherscan page for the vault. Click on the "Tracker" link in the "More Info" box to find the vault token page. Copy the address from there and follow your wallet's instructions on [adding a custom token](https://docs.yearn.finance/resources/guides/how-to-add-a-custom-token-to-metamask)
+- Alternatively, most vault tokens are supported on [Zapper.fi](https://zapper.fi) shortly after their release.
+
+#### I'm getting an error that says "SafeERC20: low-level call failed". How do I resolve this?
+
+- This most often occurs when submitting a duplicate transaction. If you want to deposit $100 into a vault, you can submit that deposit as many times you want until one of those transactions is executed. Afterwards, the rest will show this error because you no longer have that $100 in your wallet.
+
+#### I'm getting an error that says "ALERT: Transaction Error. Exception thrown in contract code." What does that mean?
+
+- There may be a bug in the contract that you are interacting with. bring this up with the team of [Discord](https://discord.gg/baBJSHFH).
+
+- If you have any questions about using the protocol, it's best to ask in either [Discord](http://discord.yearn.finance) or [Telegram](https://t.me/yearnfinance)
+
+#### I paid gas for a deposit, but it didn't go through, why is that?
+
+- You pay gas even if a transaction fails. This can happen if the price of gas increased shortly after the transaction was submitted
+
+#### I'm having issues with yearn.fi
+
+- This website is one of many front-ends maintained by separate groups of developers. Consider getting in touch with the yearn.fi development team via their website or through social media channels.
+
+## Careers and contributors
+
+#### Does yearn hire or pay contributors?
+
+- [Contributors](https://docs.yearn.finance/contributors/contributors#how-to-contribute)
+
+## Related Projects
+
+- [Curve Finance](https://curve.fi)
+- [CREAM Finance](https://cream.finance)
+- [SushiSwap](https://www.sushi.com)
+- [Akropolis](https://www.akropolis.io)
+- [Pickle Finance](https://pickle.fyi)
+- [Keep3r](https://keep3r.network)
+
+## Resources
+
+#### Where can I learn more about Yearn?
+
+- [Informational Resources](https://docs.yearn.finance/resources/links)
diff --git a/resources/financials.md b/resources/financials.md
new file mode 100644
index 00000000..8e43852e
--- /dev/null
+++ b/resources/financials.md
@@ -0,0 +1,9 @@
+# Financials
+
+## 2020
+
+[Yearn Finance Quarterly Report Q3-2020](https://github.com/yearn/yearn-pm/raw/master/financials/reports/2020Q3-yearn-quarterly-report.pdf)
+
+## 2021
+
+[Yearn Finance Quarterly Report Q1-2021](https://github.com/yearn/yearn-pm/raw/master/financials/reports/2021Q1-yearn-quarterly-report.pdf)
diff --git a/how-to-guides/README.md b/resources/guides/README.md
similarity index 61%
rename from how-to-guides/README.md
rename to resources/guides/README.md
index d229a319..fcff53e9 100644
--- a/how-to-guides/README.md
+++ b/resources/guides/README.md
@@ -1,11 +1,12 @@
# How-To Guides
-{% page-ref page="how-to-mint-yusd.md" %}
-
{% page-ref page="how-to-add-a-custom-token-to-metamask.md" %}
-{% page-ref page="how-to-participate-in-a-yvault.md" %}
+{% page-ref page="how-to-make-a-yip.md" %}
+
+{% page-ref page="how-to-understand-crv-vote-locking.md" %}
{% page-ref page="how-to-understand-yvault-roi.md" %}
-{% page-ref page="how-to-make-a-yip.md" %}
+{% page-ref page="how-to-understand-yvecrv.md" %}
+
diff --git a/how-to-guides/how-to-add-a-custom-token-to-metamask.md b/resources/guides/how-to-add-a-custom-token-to-metamask.md
similarity index 100%
rename from how-to-guides/how-to-add-a-custom-token-to-metamask.md
rename to resources/guides/how-to-add-a-custom-token-to-metamask.md
diff --git a/how-to-guides/how-to-make-a-yip.md b/resources/guides/how-to-make-a-yip.md
similarity index 93%
rename from how-to-guides/how-to-make-a-yip.md
rename to resources/guides/how-to-make-a-yip.md
index d086ce59..ccd7c660 100644
--- a/how-to-guides/how-to-make-a-yip.md
+++ b/resources/guides/how-to-make-a-yip.md
@@ -6,10 +6,10 @@ The yEarn Improvement Proposals \(`YIP`s\) describe standards for the yEarn plat
## Contributing
-1. Review [YIP-0](https://github.com/iearn-finance/YIPS/blob/master/YIPS/yip-0.md).
+1. Review [YIP-0](https://github.com/yearn/YIPS/blob/master/YIPS/yip-0.md).
2. Fork the repository by clicking "Fork" in the top right.
-3. Add your YIP to your fork of the repository. There is a [template YIP here](https://github.com/iearn-finance/YIPS/blob/master/yip-X.md).
-4. Submit a Pull Request to yEarn's [YIPs repository](https://github.com/iearn-finance/YIPS/).
+3. Add your YIP to your fork of the repository. There is a [template YIP here](https://github.com/yearn/YIPS/blob/master/yip-X.md).
+4. Submit a Pull Request to yEarn's [YIPs repository](https://github.com/yearn/YIPS/).
Your first PR should be a first draft of the final YIP. It must meet the formatting criteria enforced by the build \(largely, correct metadata in the header\). An editor will manually review the first PR for a new YIP and assign it a number before merging it. Make sure you include a `discussions-to` header with the URL to a new thread on [gov.yearn.finance](https://gov.yearn.finance/) where people can discuss the YIP as a whole.
diff --git a/how-to-guides/how-to-understand-crv-vote-locking.md b/resources/guides/how-to-understand-crv-vote-locking.md
similarity index 73%
rename from how-to-guides/how-to-understand-crv-vote-locking.md
rename to resources/guides/how-to-understand-crv-vote-locking.md
index 191c0625..650b37b1 100644
--- a/how-to-guides/how-to-understand-crv-vote-locking.md
+++ b/resources/guides/how-to-understand-crv-vote-locking.md
@@ -16,7 +16,7 @@ veCRV enables its holders to:
### Trading fees
-50% of all Curve trading fees from September 19 2020 and onwards will be distributed to veCRV holders, in the form of CRV tokens.
+50% of all Curve trading fees from September 19 2020 onwards will be distributed to veCRV holders, in the form of CRV tokens.
### Reward boosting
@@ -24,7 +24,7 @@ Vote locking CRV into veCRV allows boosting of rewards earned by providing liqui
The actual boost multiplier is determined by a formula that depends on the current pool gauge liquidity as a fraction out of the total amount of liquidity provided, and the fraction of voting power that the veCRV constitutes out of the total.
-See the [Curve Guide](https://guides.curve.fi/how-to-boost-your-crv-rewards-by-vote-locking/) for more details on the formula and its calculation.
+See the [Curve Guide](https://resources.curve.fi/guides/boosting-your-crv-rewards) for more details on the formula and its calculation.
## CRV Vote Locking in Yearn
@@ -45,18 +45,18 @@ Actual veCRV distribution has not yet begun, with a date for this still to be an
Based on Yearn's share of the total veCRV, 50% of trading fees will be claimed as CRV, out of which 10% will in turn be locked into the Curve DAO for more veCRV.
-### Bosting liquidity rewards
+### Boosting liquidity rewards
Actual boost provided by Curve vote locking will be determined by a formula as [described above](#Reward-boosting), but will crucially be depending on the total amount of liquidity provided in Curve pools by Yearn and its relative voting power, i.e. its share of the current total of veCRV issued.
-A "Yearn boost" tool displaying Yearn's current active and potential boost is in development and will be released once available.
+A "Yearn boost" tool displaying Yearn's current active and potential boost is available [here](https://crv.ape.tax/).
## More information
-- Use CRV: https://www.curve.fi/usecrv
-- Curve Guide for staking CRV: https://resources.curve.fi/guides/staking-your-crv
-- Curve Guide for vote locking: https://guides.curve.fi/how-to-boost-your-crv-rewards-by-vote-locking/
-- Curve FAQ: https://resources.curve.fi/faq/vote-locking-boost
-- deFinn Infographic on CRV Voting Boost and formula: https://drive.google.com/uc?export=download&id=1DvytXXS0WXmJ65X4jg8vfuT-zWXFxxSk
-- Boost calculator: https://dao.curve.fi/minter/calc
-- Yearn CurveDAO proxy strategy diagram: https://twitter.com/bantg/status/1308680661801340929
+- [curve.fi](https://www.curve.fi/usecrv) webpage
+- Curve [Guide](https://resources.curve.fi/guides/staking-your-crv) for staking CRV
+- Curve [Guide](https://resources.curve.fi/guides/boosting-your-crv-rewards) for vote locking
+- Curve [FAQ](https://resources.curve.fi/faq/vote-locking-boost)
+- deFinn [Infographic](https://drive.google.com/uc?export=download&id=1DvytXXS0WXmJ65X4jg8vfuT-zWXFxxSk) on CRV Voting Boost and formula
+- Boost [calculator](https://dao.curve.fi/minter/calc)
+- Yearn CurveDAO proxy strategy [diagram](https://twitter.com/bantg/status/1308680661801340929)
diff --git a/how-to-guides/how-to-understand-yvault-roi.md b/resources/guides/how-to-understand-yvault-roi.md
similarity index 92%
rename from how-to-guides/how-to-understand-yvault-roi.md
rename to resources/guides/how-to-understand-yvault-roi.md
index 91154e8e..309ccac5 100644
--- a/how-to-guides/how-to-understand-yvault-roi.md
+++ b/resources/guides/how-to-understand-yvault-roi.md
@@ -2,20 +2,20 @@
### ROI
-Are you an advanced user trying to understand how ROI is calculated? Skip directly to "[_Why we can't use compound or linear interest formulas to estimate yVaults returns_](https://docs.yearn.finance/how-to-guides/how-to-understand-yvault-roi#why-cant-we-use-compound-or-linear-interest-formulas-to-estimate-yvaults-returns)"
+Are you an advanced user trying to understand how ROI is calculated? Skip directly to "[_Why we can't use compound or linear interest formulas to estimate yVaults returns_](https://docs.yearn.finance/resources/guides/how-to-understand-yvault-roi#why-cant-we-use-compound-or-linear-interest-formulas-to-estimate-yvaults-returns)"
If you are a beginner in DeFi or new to Yearn keep on reading.
#### ROI definition:
-> Return on investment \(ROI\) is a ratio between net profit \(over a period\) and cost of investment \(resulting from an investment of some resources at a point in time\). A high ROI means the investment's gains compare favorably to its cost. As a performance measure, ROI is used to evaluate the efficiency of an investment or to compare the efficiencies of several different investments.\[1\] In economic terms, it is one way of relating profits to capital invested. Source: [Wikipedia](https://https://en.wikipedia.org/wiki/Return_on_investment)
+> Return on investment \(ROI\) is a ratio between net profit \(over a period\) and cost of investment \(resulting from an investment of some resources at a point in time\). A high ROI means the investment's gains compare favorably to its cost. As a performance measure, ROI is used to evaluate the efficiency of an investment or to compare the efficiencies of several different investments.\[1\] In economic terms, it is one way of relating profits to capital invested. Source: [Wikipedia](https://en.wikipedia.org/wiki/Return_on_investment)
- ROI is a key performance indicator \(KPI\) available in all Yearn Vaults \(yVaults\) located here: [https://yearn.finance/vaults](https://yearn.finance/vaults).
- ROI is useful when comparing and assessing vault performance.
- ROI presented in Yearn is a **yearly ROI**. You deposit X and 1 year later you receive X + \(X \* ROI\).
- The ROI presented is a _current estimation_ based on data since the yVault's inception. If performance remains constant, after 1 year you will receive the displayed ROI. Rates are unstable currently, and fluctuate based on market/strategy.
-yVaults have different yield farming [strategies](https://docs.yearn.finance/faq#vault-strategies), which determine how assets are moved between liquidity pools. Strategies are created by the `Controller` who manages the yVault.
+yVaults have different yield farming [strategies](https://docs.yearn.finance/resources/faq#where-can-i-find-current-strategies), which determine how assets are moved between liquidity pools. Strategies are created by the `Controller` who manages the yVault.
New strategies are also voted by the community through [governance proposals](https://gov.yearn.finance). A new strategy creates a new challenge in terms of ROI calculation.
@@ -145,7 +145,7 @@ At this point, she could withdraw and receive her initial yCRV deposit and an ad
1. The short-term ROI data is a suitable estimation for the short-term \(i.e. if we compare the % from the last two days, it's likely that the following two days are going go be similar\).
2. Short-term ROI data is _**absolutely not accurate**_ when extrapolated in the long-term.
-3. Long-term data \(say today and [inception of vault](https://docs.yearn.finance/faq#lists-of-smart-contracts)\) is a good overall estimation of the vaults performance and should be used when comparing different investment opportunities.
+3. Long-term data \(say today and [inception of vault](https://docs.yearn.finance/resources/faq#where-can-i-find-current-strategies)\) is a good overall estimation of the vaults performance and should be used when comparing different investment opportunities.
In other words, if your goal is to approximate returns in the short-term, you should use datasets that are recent \(daily/weekly\).
@@ -156,5 +156,4 @@ If you would like to make a crude estimation on how returns may look like in a y
The community has been actively creating tools and guides on this topic.
- [https://github.com/thegismar/yearn_roi/blob/master/yearn_vaults_ROI_calc.ipynb](https://github.com/thegismar/yearn_roi/blob/master/yearn_vaults_ROI_calc.ipynb) provides a mathemathical explanation on how ROI is calculated with some caveats. \(This repository is no longer being maintained\).
-- [Statistics FAQ](https://docs.yearn.finance/faq#statistics)
-- [yVault ROI performance over time graph](https://py-earn.herokuapp.com/graph)
+- [Statistics FAQ](https://docs.yearn.finance/resources/faq#where-can-i-find-current-strategies)
diff --git a/resources/guides/how-to-understand-yveCRV.md b/resources/guides/how-to-understand-yveCRV.md
new file mode 100644
index 00000000..e62ff5b1
--- /dev/null
+++ b/resources/guides/how-to-understand-yveCRV.md
@@ -0,0 +1,87 @@
+# How to Understand yveCRV
+
+On February 6th 2021 Yearn Finance launched its latest product, yveCRV.
+
+## Why is it called yveCRV?
+
+yveCRV stands for veCRV-DAO yVault and is [listed on CoinGecko](https://www.coingecko.com/en/coins/vecrv-dao-yvault).
+
+### List of tokens
+
+* **CRV** - Curve DAO Token
+* **veCRV** - voting escrow CRV tokens \(the longer it’s locked up for, the greater the rewards\), you can read more about CRV vote locking [here](how-to-understand-crv-vote-locking.md).
+* **yveCRV** - the “y” prefix is used for all of Yearn’s vaults
+
+## How do I participate?
+
+Deposit CRV into the yveCRV vault: [https://yearn.finance/vaults](https://yearn.finance/vaults)
+
+As with all vaults, if you are depositing for the first time two transactions are required. First you need to approve the transaction. This allows CRV to be deposited into Yearn vaults. And then you decide how much CRV you would like to deposit. Pleas refer to the [general guide](how-to-participate-in-a-yvault.md) for more information.
+
+Alternatively, you can buy yveCRV directly on [Sushiswap](https://app.sushi.com/swap?inputCurrency=ETH&outputCurrency=0xc5bDdf9843308380375a611c18B50Fb9341f502A). The contract address is [0xc5bddf9843308380375a611c18b50fb9341f502a](https://etherscan.io/address/0xc5bddf9843308380375a611c18b50fb9341f502a).
+
+
+
+## What are the benefits of depositing into this vault?
+
+Depositing CRV in this vault allows you to earn:
+
+* Trading fees from Curve Finance
+* Additional CRV rewards
+* A boost to your CRV rewards that you cannot get elsewhere
+
+Rewards are shown here: [https://crv.ape.tax/](https://crv.ape.tax/)
+
+## How is this vault different from the other vaults?
+
+Other vaults increase your holding in the token that you deposit. For example, the yETH vault increases your ETH holdings.
+
+The yveCRV vault pays weekly rewards in LP 3pool Curve \(3CRV\). 3CRV is a combination of DAI+USDT+USDC. Please refer to [Curve's website](https://www.curve.fi/3pool) for current weights. DAI, USDT and USDC are USD stablecoins therefore 3CRV is expected to maintain a price close to $1.
+
+The other key difference is that **deposited CRV is locked forever**. It **cannot be withdrawn**, as the vault perpetually re-locks CRV upon their expiration. Instead you earn a stream of 3CRV rewards for as long as people continue to trade on the Curve Finance protocol.
+
+## Where do the rewards come from?
+
+yveCRV earns rewards from trading fees, CRV rewards and “boosties”. Holding CRV in your wallet gives you exposure to the price of CRV. You want the price of Crv to increase. Depositing CRV on Curve Finance means that you receive a share of the trading fees on Curve Finance.
+
+Curve Finance introduced extra rewards, called “boosties”, if the CRV is locked in Curve Finance for a minimum of 1 week and a maximum of 4 years. Please refer to the [CRV vote locking guide](how-to-understand-crv-vote-locking.md) for more information.
+
+Rewards are paid weekly.
+
+## What if I don’t claim my weekly rewards?
+
+They continue to accrue so don’t worry if you forget or don’t want to pay gas fees every week.
+
+## What are the risks?
+
+* You have to determine the risks for yourself.
+* You are exposed to smart contract risk from Yearn vaults and Curve Finance.
+* Any losses that occur due to the Curve Finance protocol can be mitigated by [purchasing Cover](https://yearn.finance/cover).
+* yveCRV earns trading fees from trading that occurs on Curve Finance. If trading fees are lower than expected then your returns will be lower than expected. Trading volume data on Curve Finance is available from [Coingecko](https://www.coingecko.com/en/exchanges/curve#statistics).
+
+## Is it true that I can earn even more rewards from Sushi and Pickle?
+
+With yveCRV you’re already earning the highest return on your CRV.
+
+However, we’re making the most of Yearn’s ecosystem by partnering with Sushiswap and Pickle to give you even more rewards.
+
+### How can I earn extra Sushi rewards?
+
+You can provide [yveCrv/ETH liquidity on Sushiswap](https://app.sushi.com/add/ETH/0xc5bDdf9843308380375a611c18B50Fb9341f502A) to earn extra rewards. Note that if you earn Sushi rewards you will not be able to claim the 3Pool rewards as well. By providing yveCRV-WETH liquidity to Sushiswap, you may be exposed to [impermanent loss](https://medium.datadriveninvestor.com/impermanent-loss-in-defi-the-risks-involved-in-providing-liquidity-67c54fdf1cfc).
+
+### What are the latest Sushi rewards?
+
+Search for “yveCRV” on [Sushiswap analytics](https://analytics.sushiswap.fi/) to find the latest rewards. [WETH-yveCRV-DAO pool data](https://analytics.sushiswap.fi/pools/132) is also available. As the WETH-yveCRV LP grows in size, Sushi rewards per LP units held will decrease. Sushi rewards are determined by governance.
+
+### How can I earn extra Pickle rewards?
+
+Deposit your Sushiswap LP into the [Pickle jar](https://app.pickle.finance/jars).
+
+## How can I stay up-to-date with vaults?
+
+Subscribe to Yearn’s weekly [state of the vaults](https://medium.com/yearn-state-of-the-vaults) newsletter.
+
+## Still have questions?
+
+Please visit [Telegram or discord](../#communication_channels) and ask away!
+
diff --git a/resources/guides/how-to-understand-yvecrv.md b/resources/guides/how-to-understand-yvecrv.md
new file mode 100644
index 00000000..e62ff5b1
--- /dev/null
+++ b/resources/guides/how-to-understand-yvecrv.md
@@ -0,0 +1,87 @@
+# How to Understand yveCRV
+
+On February 6th 2021 Yearn Finance launched its latest product, yveCRV.
+
+## Why is it called yveCRV?
+
+yveCRV stands for veCRV-DAO yVault and is [listed on CoinGecko](https://www.coingecko.com/en/coins/vecrv-dao-yvault).
+
+### List of tokens
+
+* **CRV** - Curve DAO Token
+* **veCRV** - voting escrow CRV tokens \(the longer it’s locked up for, the greater the rewards\), you can read more about CRV vote locking [here](how-to-understand-crv-vote-locking.md).
+* **yveCRV** - the “y” prefix is used for all of Yearn’s vaults
+
+## How do I participate?
+
+Deposit CRV into the yveCRV vault: [https://yearn.finance/vaults](https://yearn.finance/vaults)
+
+As with all vaults, if you are depositing for the first time two transactions are required. First you need to approve the transaction. This allows CRV to be deposited into Yearn vaults. And then you decide how much CRV you would like to deposit. Pleas refer to the [general guide](how-to-participate-in-a-yvault.md) for more information.
+
+Alternatively, you can buy yveCRV directly on [Sushiswap](https://app.sushi.com/swap?inputCurrency=ETH&outputCurrency=0xc5bDdf9843308380375a611c18B50Fb9341f502A). The contract address is [0xc5bddf9843308380375a611c18b50fb9341f502a](https://etherscan.io/address/0xc5bddf9843308380375a611c18b50fb9341f502a).
+
+
+
+## What are the benefits of depositing into this vault?
+
+Depositing CRV in this vault allows you to earn:
+
+* Trading fees from Curve Finance
+* Additional CRV rewards
+* A boost to your CRV rewards that you cannot get elsewhere
+
+Rewards are shown here: [https://crv.ape.tax/](https://crv.ape.tax/)
+
+## How is this vault different from the other vaults?
+
+Other vaults increase your holding in the token that you deposit. For example, the yETH vault increases your ETH holdings.
+
+The yveCRV vault pays weekly rewards in LP 3pool Curve \(3CRV\). 3CRV is a combination of DAI+USDT+USDC. Please refer to [Curve's website](https://www.curve.fi/3pool) for current weights. DAI, USDT and USDC are USD stablecoins therefore 3CRV is expected to maintain a price close to $1.
+
+The other key difference is that **deposited CRV is locked forever**. It **cannot be withdrawn**, as the vault perpetually re-locks CRV upon their expiration. Instead you earn a stream of 3CRV rewards for as long as people continue to trade on the Curve Finance protocol.
+
+## Where do the rewards come from?
+
+yveCRV earns rewards from trading fees, CRV rewards and “boosties”. Holding CRV in your wallet gives you exposure to the price of CRV. You want the price of Crv to increase. Depositing CRV on Curve Finance means that you receive a share of the trading fees on Curve Finance.
+
+Curve Finance introduced extra rewards, called “boosties”, if the CRV is locked in Curve Finance for a minimum of 1 week and a maximum of 4 years. Please refer to the [CRV vote locking guide](how-to-understand-crv-vote-locking.md) for more information.
+
+Rewards are paid weekly.
+
+## What if I don’t claim my weekly rewards?
+
+They continue to accrue so don’t worry if you forget or don’t want to pay gas fees every week.
+
+## What are the risks?
+
+* You have to determine the risks for yourself.
+* You are exposed to smart contract risk from Yearn vaults and Curve Finance.
+* Any losses that occur due to the Curve Finance protocol can be mitigated by [purchasing Cover](https://yearn.finance/cover).
+* yveCRV earns trading fees from trading that occurs on Curve Finance. If trading fees are lower than expected then your returns will be lower than expected. Trading volume data on Curve Finance is available from [Coingecko](https://www.coingecko.com/en/exchanges/curve#statistics).
+
+## Is it true that I can earn even more rewards from Sushi and Pickle?
+
+With yveCRV you’re already earning the highest return on your CRV.
+
+However, we’re making the most of Yearn’s ecosystem by partnering with Sushiswap and Pickle to give you even more rewards.
+
+### How can I earn extra Sushi rewards?
+
+You can provide [yveCrv/ETH liquidity on Sushiswap](https://app.sushi.com/add/ETH/0xc5bDdf9843308380375a611c18B50Fb9341f502A) to earn extra rewards. Note that if you earn Sushi rewards you will not be able to claim the 3Pool rewards as well. By providing yveCRV-WETH liquidity to Sushiswap, you may be exposed to [impermanent loss](https://medium.datadriveninvestor.com/impermanent-loss-in-defi-the-risks-involved-in-providing-liquidity-67c54fdf1cfc).
+
+### What are the latest Sushi rewards?
+
+Search for “yveCRV” on [Sushiswap analytics](https://analytics.sushiswap.fi/) to find the latest rewards. [WETH-yveCRV-DAO pool data](https://analytics.sushiswap.fi/pools/132) is also available. As the WETH-yveCRV LP grows in size, Sushi rewards per LP units held will decrease. Sushi rewards are determined by governance.
+
+### How can I earn extra Pickle rewards?
+
+Deposit your Sushiswap LP into the [Pickle jar](https://app.pickle.finance/jars).
+
+## How can I stay up-to-date with vaults?
+
+Subscribe to Yearn’s weekly [state of the vaults](https://medium.com/yearn-state-of-the-vaults) newsletter.
+
+## Still have questions?
+
+Please visit [Telegram or discord](../#communication_channels) and ask away!
+
diff --git a/resources/links.md b/resources/links.md
new file mode 100644
index 00000000..c8a3af9a
--- /dev/null
+++ b/resources/links.md
@@ -0,0 +1,63 @@
+# Links
+
+### Community
+
+- [Discord](https://discord.yearn.finance)
+- [Telegram](https://t.me/yearnfinance)
+- [Reddit](https://www.reddit.com/r/yearn_finance/)
+- [Github](https://github.com/yearn)
+- [TG Price Chat](https://t.me/yearncommunity)
+- [TG ANN](https://t.me/yearnupdates)
+
+### Updates
+
+- [Twitter](https://twitter.com/iearnfinance)
+- [Medium](https://medium.com/iearn)
+- [Yearn Newsletter](https://yearn.substack.com/)
+- [Weekly Governance Newsletter](https://medium.com/yearn-governance-roundup)
+- [Weekly Vault Updates Newsletter](https://medium.com/yearn-state-of-the-vaults)
+
+### Collaborate
+
+- [Github](https://github.com/yearn)
+- [Governance Forum](https://gov.yearn.finance)
+- [Yearn Contribute](https://contribute.yearn.rocks/)
+
+### Learn
+
+- [Learn Yearn](https://www.learnyearn.finance/)
+- [yCosystem](https://ycosystem.info/)
+- [Yearn FAQ](https://docs.yearn.finance/resources/faq)
+
+### Vaults Detail Reference
+
+- [Vaults at Yearn](https://medium.com/yearn-state-of-the-vaults/the-vaults-at-yearn-9237905ffed3)
+- [yVaults v2 Strategies](https://yearn-hub.vercel.app/)
+- [Risk Dashboard](https://yearn-finance.vercel.app/system)
+
+### Statistics
+
+- [Yearn Dashboard](https://yearn.vision)
+- [Yearn TVL](https://yearn.science/)
+- [Initial Distribution Dashboard](https://explore.duneanalytics.com/dashboard/yearn)
+- [Voting Stats Dashboard](https://explore.duneanalytics.com/public/dashboards/Lqnxzm7fa8NVhKC4kc37DDFPZgqXryaIjyLRYAYp)
+- [Vaults Stats Dashboard](https://explore.duneanalytics.com/public/dashboards/g0bGfgloeXBd9C18jpBjdXi5KkQjR7IXYqFRUnHk)
+- [Yearn API](https://vaults.finance/all)
+
+### General Websites
+- [yCosystem](https://yfi.fyi/)
+- [Dune Analytics](https://duneanalytics.com/projects/yearn)
+- [CoinGecko](https://www.coingecko.com/en/coins/yearn-finance)
+- [Defi Market Cap](https://defimarketcap.io/protocol/yearn-vault)
+
+### Community Calculators
+- [Feel the Yearn](https://feel-the-yearn.app/vaults)
+- [yVault ROI Calc](https://yvault-roi.netlify.app/)
+- [Yearn ROI Calc](https://yearn-roi.xyz/)
+- [Yearn Party](https://yearn.party/)
+- [Yieldfarming](https://yieldfarming.info/)
+- [Track a Vault](https://trackavault.com/)
+
+### Media Resources
+
+- Can be found in the Discord under [\#media-resources](https://discord.com/channels/734804446353031319/736132884443955242/740325105904779326)
diff --git a/resources/risks/README.md b/resources/risks/README.md
new file mode 100644
index 00000000..25171d31
--- /dev/null
+++ b/resources/risks/README.md
@@ -0,0 +1,7 @@
+# Risks
+
+{% page-ref page="protocol-risks.md" %}
+
+{% page-ref page="strategy-risks.md" %}
+
+{% page-ref page="vault-risks.md" %}
diff --git a/resources/risks/protocol-risks.md b/resources/risks/protocol-risks.md
new file mode 100644
index 00000000..52988403
--- /dev/null
+++ b/resources/risks/protocol-risks.md
@@ -0,0 +1,77 @@
+# Protocol Risks
+
+Yearn’s core products are the vaults. Each vault runs at least one strategy, and each strategy is exposed to at least one protocol. Strategy and protocol risks are described [here](https://docs.yearn.finance/resources/risks/strategy-risks) and [here](https://docs.yearn.finance/resources/risks/protocol-risks) respectively.
+
+The key protocols to which Yearn’s vaults are exposed are lending protocols, AMMs and protocols that enable leverage.
+
+## Lending Protocols
+
+One of the simplest strategies is collateralized lending which involves lending assets on lending protocols to earn a yield. For example, the optimized lending strategy used by the Dai vault lends Dai on the highest yielding lending protocol.
+
+Yearn’s vaults are exposed to the lending protocols Aave, Compound Finance, dYdX and Alpha Homora.
+
+|Risk|Description|
+|----|-----------|
+|Governance|Admin key holders (or token holders) change the lending protocol adversely, e.g. accept risky assets with lenient risk parameters|
+|Technological|Smart contract risk from interacting with lending protocols|
+||Liquidations do not occur as expected|
+|Market|The value of the loans exceed the value of the collateral|
+||Low demand for borrowing leads to low yields|
+||Accepted assets become impaired|
+|Oracle|Incorrect price feed causes the collateral to go to such a value that the loan is liquidated|
+
+## Automated Market Makers
+
+AMMs are used in Yearn’s vault strategies to earn trading fees (and liquidity mining rewards if available) and to exchange liquidity mined tokens for the Want token.
+
+Examples of the AMMs to which Yearn’s vaults are exposed are Curve Finance, Sushiswap and Uniswap. Curve Finance is predominantly used to earn trading fees and farm CRV rewards, whereas Sushiswap and Uniswap are used to exchange liquidity mined tokens for the Want token.
+
+
+|Risk|Description|
+|----|-----------|
+|Market|Lack of liquidity for the token being exchanged|
+||Trading volumes reduce leading to lower fees|
+||Impermanent loss due to the pool’s token prices changing relative to each other|
+|Technological|Smart contract risk from interacting with AMMs|
+|Governance|Token holders vote to change the AMM adversely|
+
+## Leverage-enabling protocols
+
+Leverage-enabling protocols are used in Yearn’s vault strategies to increase the yield. This is possible when a non-leveraged strategy earns a higher return than the cost of borrowing.
+
+Examples of the leverage-enabling protocols to which Yearn’s vaults are exposed are Maker, Unit Protocol, Aave, dYdX and Cream.Finance.
+
+Maker and Unit Protocol enable the minting of stablecoins against collateral. The stablecoins can then be invested in yield-bearing strategies.
+
+Aave and dYdX offer flash loans which allows Yearn’s strategies to take out a loan, deploy the capital in a strategy and repay the loan in one transaction.
+
+Cream.Finance, in combination with Ironbank, allows strategies to increase yield with protocol-to-protocol uncollateralized borrowing. This is because Yearn’s strategies have been white-listed by Cream.Finance allowing them to borrow depositors’ funds that have not been lent out, in order to deploy in strategies that have a greater return than the cost of borrowing.
+
+
+|Risk|Description|
+|----|-----------|
+|Governance|Multi-sig or token holders vote to change the protocol adversely|
+||Poorly chosen risk parameters for onboarded collateral of Maker or Unit Protocol, e.g. collateralization ratios that are too low|
+|Technological|Smart contract risk|
+|Market|Liquidations are not processed correctly on Maker or Unit Protocol|
+||Stablecoin peg is not maintained (Dai and USDP for Maker and Unit Protocol respectively)|
+||Cost of uncollateralized borrowing from Cream.Finance increases such that Yearn’s strategies cannot utilize it|
+|Oracle|Incorrect price feed leads to incorrect liquidation of positions (Maker and Unit Protocol)|
+
+## Liquidity mining protocols
+
+
+A core strategy for Yearn’s vaults is to liquidity mine (or yield farm) protocols.
+Liquidity mining involves interacting with a protocol to earn the protocol’s native tokens. The interaction can be as simple as staking an asset in a protocol’s staking contract, or it can be more complicated such as staking SNX to mint sUSD in Synthetix to earn SNX rewards.
+In most cases the liquidity mined token is exchanged for the Want token on an AMM. For example, in the Dai vault the COMP token is farmed by supplying Dai to Compound Finance to earn COMP rewards, which are exchanged for more Dai.
+
+
+|Risk|Description|
+|----|-----------|
+|Governance|Admin key holders change protocol adversely, e.g. introduce penalties for withdrawals or steal funds|
+|Technological|Smart contract risk of protocol or rewards contract|
+|Market|Fall in price of token being farmed reducing the APY|
+||Liquidity of liquidity mined token on AMM is reduced or removed |
+|Oracle|Delays or inability to withdraw liquidity in an emergency|
+
+The [Safe Farming Committee](https://gov.yearn.finance/t/introducing-yearn-safe-farming-committee/10533) considers these risks in detail and decides which protocols are secure.
diff --git a/resources/risks/strategy-risks.md b/resources/risks/strategy-risks.md
new file mode 100644
index 00000000..f1885d5b
--- /dev/null
+++ b/resources/risks/strategy-risks.md
@@ -0,0 +1,65 @@
+# Strategy Risks
+
+Yearn earns income from lending, liquidity mining and trading fees. This income is often increased using leverage.
+
+## Lending
+
+Collateralized lending is when an asset is lent in return for a yield paid by the borrower. The borrower has to lock up a greater amount of collateral than the value of the loan to incentivize the repayment of the loan.
+
+|Risk|Description|
+|----|-----------|
+|Governance|Admin key holders change lending protocol adversely, e.g. change the interest rate model in such a way that discourages borrowing|
+|Technological|Smart contract risk of interacting with lending protocols|
+|Market|Low demand for borrowing the asset causes low lending yields|
+||Collateral price falls causing the lending protocol to become undercollateralized |
+||Lent assets become unavailable to withdraw because the utilization ratio becomes too high|
+|Operational|Delays or inability to withdraw assets from the lending protocol in an emergency|
+
+## Liquidity Mining
+
+Liquidity mining involves interacting with a protocol to earn the protocol’s native tokens. The interaction can be as simple as staking an asset in a protocol’s staking contract, or more complicated such as staking SNX to mint sUSD in Synthetix to earn SNX rewards.
+
+In most cases the liquidity mined token is exchanged for the Want token on an AMM.
+
+
+|Risk|Description|
+|----|-----------|
+|Governance|Admin key holders change protocol adversely, e.g. introduce penalties for withdrawals|
+|Technological|Smart contract risk of rewards contract|
+||Smart contract risk of AMM used to exchange the liquidity mined token for the Want token|
+|Market|Fall in price of token being farmed|
+||Liquidity of liquidity mined token on AMM is reduced or removed|
+|Operational Risk|Delays or inability to withdraw liquidity in an emergency|
+
+The [Safe Farming Committee](https://gov.yearn.finance/t/introducing-yearn-safe-farming-committee/10533) decides which protocols are secure.
+
+## Trading Fees
+
+Trading fees are earned in Automated Market Makers (AMMs) by providing liquidity.
+
+
+|Risk|Description|
+|----|-----------|
+|Governance|Admin key holders change protocol adversely, e.g. reduce rewards paid to liquidity providers|
+|Technological|Smart contract risk of AMM (e.g. Curve Finance, Sushiswap or Uniswap)|
+|Market|Trading volumes reduce leading to lower fees|
+||Impermanent loss](https://academy.binance.com/en/articles/impermanent-loss-explained) due to the pool’s token prices changing relative to each other|
+|Operational Risk|Delays or inability to withdraw liquidity from the AMM in an emergency|
+
+## Leverage
+
+|Risk|Description|
+|----|-----------|
+|Governance|Admin key holders change the lending protocol adversely|
+|Technological|Smart contract risk of lending protocol (Aave, Compound Finance, Maker, Unit protocol)|
+|Market|Risk that the debt is liquidated due to a price fall|
+||Risk that income is lower than the cost of the flash loan|
+|Oracle|Incorrect price feed|
+||liquidation penalties|
+|Operational Risk|Operational risk of managing debt positions
+|
+
+
+## Strategy Scoring System
+
+[Initial attempt](https://docs.google.com/document/d/18M2eJNsshKJlIAD_dSVGfMvTkIgZYJzXjT538QSmALo/edit?usp=sharing) at a strategy scoring system.
diff --git a/resources/risks/vault-risks.md b/resources/risks/vault-risks.md
new file mode 100644
index 00000000..726c4c53
--- /dev/null
+++ b/resources/risks/vault-risks.md
@@ -0,0 +1,18 @@
+# Vault Risks
+
+Yearn’s vaults can be exposed to multiple strategies. Each additional strategy increases diversification but also increases the probability that a strategy could lead to capital losses.
+
+|Risk|Description|
+|----|-----------|
+|Governance|Multi-sig approves a strategy that leads to losses|
+|Technological|Smart contract risks increase with the number of strategies and protocols|
+|Market|Liquidation of leveraged strategies due to sudden price falls|
+||Lower token prices lead to lower yields in naked liquidity mining strategies|
+||High gas fees to deposit or withdraw adversely impact yield|
+||High gas fees cause yield on strategies to be less than expected|
+||Deposits too low to benefit from multiple strategies|
+|Operational|Optimal mix of strategies not maintained|
+||Liquidations because debt positions were managed incorrectly|
+||Safe Farming Committee interprets code incorrectly in new yield farm|
+||Yearn website suffers outage|
+|Oracle|Incorrect price feed leads to liquidation in leveraged strategy|
diff --git a/using-yearn.md b/using-yearn.md
new file mode 100644
index 00000000..c610320c
--- /dev/null
+++ b/using-yearn.md
@@ -0,0 +1,109 @@
+# Using Yearn
+
+Thanks to a feature called 'zap', it's extremely easy to deposit into any vault with almost any token.
+
+Here's how it works:
+
+First, **Connect your wallet** using the button at the top right corner. Multiple types of wallets are supported, but most people use [MetaMask](https://metamask.io/), which can be downloaded for free as a Chrome extension or through the Apple and Android app stores. Make sure that your wallet is connected to the Ethereum network.
+
+
+ 
+
+
+## If you **already have the required token** for the vault that you would like to deposit in:
+
+1\. Select the vault that you would like to deposit into.
+
+2\. Enter the amount of tokens you want to deposit into the vault. If you are depositing ETH, make sure you have enough ETH left over to pay for future transactions that you might need to make.
+
+
+ 
+
+
+3\. Click 'Approve' or 'Deposit' button, depending on if you have previously approved.
+
+4\. Your wallet will ask you to confirm the transaction. This will take about 3 minutes, but you can speed it up by [paying a higher gas fee to the network](https://blog.leverj.io/how-to-set-the-gas-limit-and-gas-price-in-metamask-1b33c38c32fd). If your transaction gets stuck, see [this guide](https://metamask.zendesk.com/hc/en-us/articles/360015489251-How-to-Speed-Up-or-Cancel-a-Pending-Transaction) on speeding up or cancelling the transaction.
+
+
+ 
+
+
+5\. When your transaction succeeds, you will see your deposited balance in the vault's interface, which should appear at the top of the vault list.
+
+
+ 
+
+
+When you're ready to withdraw:
+
+1\. Select the vault that you would like to withdraw from.
+
+2\. Enter the amount you want to withdraw, or click 'Max' to withdraw the entire balance.
+
+
+ 
+
+
+3\. Click 'Withdraw'.
+
+4\. Your wallet will ask you to confirm the transaction. See step 4 above for more details.
+
+5\. When your transaction succeeds, the tokens will show up in your wallet again.
+
+## If you **don't have the required token** for the vault that you would like to deposit in:
+
+This can be a common occurrence, because many of Yearn's vaults generate yield by using [Curve Finance](http://curve.finance/) liquidity provider (LP) tokens, which are acquired through depositing into a Curve pool.
+
+So for instance, if you would rather deposit into the crvSTETH vault instead of the ETH vault, and accept the additional risk that comes with the curve pool and an ETH derivative (stETH) in return for higher yield, but you only have ETH in your wallet, your ETH will need to be converted to a crvSTETH token before it is accepted in the vault.
+
+Thankfully, due to Yearn's 'zap' feature, this can all be done in the same transaction as your deposit. Here's how it works using the crvSTETH vault as an example:
+
+**NOTE:** Zapping a token into a vault will require more transactions than depositing the native token. This means you will be paying more in gas and potentially lose value to slippage when the token is swapped or deposited into a pool. Yearn limits slippage to 1% and the transaction will fail if slippage exceeds that, in which case you will have to swap or deposit the tokens manually. See our [zap](https://docs.yearn.finance/yearn-finance/yvaults/overview#zap-in-with-any-asset) section for more details.
+
+1\. Select the crvSTETH vault.
+
+2\. Click the dropdown box by the 'Approve' or 'Deposit' button.
+
+3\. Select which token you would like to be converted into crvSTETH. It will only display the tokens that are in your wallet.
+
+
+ 
+
+
+4\. Enter the amount of tokens you would like to deposit and click 'Approve' or 'Deposit' depending on whether or not you have previously approved the token.
+
+5\. Confirm the transaction through your wallet. See step 4 in the section above for more details.
+
+6\. When your transaction succeeds, you will see your deposited balance in the vault's interface, which should appear at the top of the vault list.
+
+When you're ready to withdraw:
+
+1\. Select the crvSTETH vault.
+
+2\. Click the dropdown box by the 'Withdraw' button.
+
+
+ 
+
+
+3\. Select which asset you would like to receive upon withdrawal. Your options will be the crvSTETH, ETH, BTC, DAI, USDC or USDT.
+
+4\. Enter the amount you want to withdraw, or click 'Max' to withdraw the entire balance.
+
+5\. Confirm the approval if needed, and then approve the withdrawal transaction.
+
+6\. When your transaction succeeds, the tokens will show up in your wallet again.
+
+## Tools to track your funds
+
+If you would like to see how your USD balance changes while your assets are in a vault, connect your wallet to [zapper.fi](https://zapper.fi) or a similar portfolio tracking product.This is also the easiest way to tell how much profit the vault has made for you.
+
+Your balance WILL NOT increase continuously. Profit will be distributed to your share of the vault when the harvest() function is called, which happens on a fluctuating basis.
+
+Community resources to monitor your returns:
+
+- [Zapper](https://zapper.fi/)
+- [Zerion](https://app.zerion.io/)
+- [Yearn Vault ROI Calculator](https://yearn-roi.xyz/#/)
+- [yVault ROI](https://yvault-roi.netlify.app/)
+- [https://trackavault.com/](https://trackavault.com/)
diff --git a/yearn-ecosystem/collaborative-releases/README.md b/yearn-ecosystem/collaborative-releases/README.md
new file mode 100644
index 00000000..5090d2c4
--- /dev/null
+++ b/yearn-ecosystem/collaborative-releases/README.md
@@ -0,0 +1,3 @@
+# Collaborative Releases
+
+{% page-ref page="zap.md" %}
\ No newline at end of file
diff --git a/products/zap.md b/yearn-ecosystem/collaborative-releases/zap.md
similarity index 100%
rename from products/zap.md
rename to yearn-ecosystem/collaborative-releases/zap.md
diff --git a/yearn-ecosystem/r-and-d/README.md b/yearn-ecosystem/r-and-d/README.md
new file mode 100644
index 00000000..47200eaa
--- /dev/null
+++ b/yearn-ecosystem/r-and-d/README.md
@@ -0,0 +1,17 @@
+---
+description: Not recommended for retail use
+---
+
+# Research and Development
+
+{% page-ref page="stablecredit.md" %}
+
+{% page-ref page="yborrow.md" %}
+
+{% page-ref page="yliquidate.md" %}
+
+{% page-ref page="yswap.md" %}
+
+{% page-ref page="ytrade.md" %}
+
+{% page-ref page="delegated-funding-dao-vaults.md" %}
\ No newline at end of file
diff --git a/r-and-d/delegated-funding-dao-vaults.md b/yearn-ecosystem/r-and-d/delegated-funding-dao-vaults.md
similarity index 86%
rename from r-and-d/delegated-funding-dao-vaults.md
rename to yearn-ecosystem/r-and-d/delegated-funding-dao-vaults.md
index db2d5490..5c0d4280 100644
--- a/r-and-d/delegated-funding-dao-vaults.md
+++ b/yearn-ecosystem/r-and-d/delegated-funding-dao-vaults.md
@@ -4,7 +4,7 @@ description: In development
# Delegated Funding DAO Vaults
-YFI holders can provide capital to DAOs approved to accept funding in the DAO vault ecosystem. DAOs wishing to receive funding are required to setup [Gitcoin Grants](https://gitcoin.co/grants/) page and apply for funding via the [Yearn governance forum](https://gov.yearn.finance/). If there is sufficient interest to approve the DAO for funding an off-chain vote will be conducted \([https://vote.yearn.finance](https://vote.yearn.finance/)\). If voting is successful the DAO will be added to the DAO vault ecosystem.
+YFI holders can provide capital to DAOs approved to accept funding in the DAO vault ecosystem. DAOs wishing to receive funding are required to setup [Gitcoin Grants](https://gitcoin.co/grants/) page and apply for funding via the [Yearn governance forum](https://gov.yearn.finance/). If there is sufficient interest to approve the DAO for funding an off-chain vote will be conducted \([https://vote.yearn.finance](https://yearn.snapshot.page/#/)\). If voting is successful the DAO will be added to the DAO vault ecosystem.
Governance determines weekly, monthly, and yearly credit limits that the DAO can access via the [DAO vault](https://yborrow.finance/). The DAO is free to repay the credit line on their own terms, and in tokens or other collateral options accepted in the yearn ecosystem. Any profits are shared between vault LPs.
diff --git a/r-and-d/stablecredit.md b/yearn-ecosystem/r-and-d/stablecredit.md
similarity index 100%
rename from r-and-d/stablecredit.md
rename to yearn-ecosystem/r-and-d/stablecredit.md
diff --git a/r-and-d/yborrow.md b/yearn-ecosystem/r-and-d/yborrow.md
similarity index 100%
rename from r-and-d/yborrow.md
rename to yearn-ecosystem/r-and-d/yborrow.md
diff --git a/r-and-d/yliquidate.md b/yearn-ecosystem/r-and-d/yliquidate.md
similarity index 54%
rename from r-and-d/yliquidate.md
rename to yearn-ecosystem/r-and-d/yliquidate.md
index 38a72ed7..e8c8ca8b 100644
--- a/r-and-d/yliquidate.md
+++ b/yearn-ecosystem/r-and-d/yliquidate.md
@@ -4,4 +4,4 @@ description: Not recommended for retail use
# yLiquidate
-{% embed url="https://yliquidate.finance/" caption="" %}
+{% embed url="https://yliquidate.finance" caption="" %}
diff --git a/r-and-d/yswap.md b/yearn-ecosystem/r-and-d/yswap.md
similarity index 100%
rename from r-and-d/yswap.md
rename to yearn-ecosystem/r-and-d/yswap.md
diff --git a/r-and-d/ytrade.md b/yearn-ecosystem/r-and-d/ytrade.md
similarity index 100%
rename from r-and-d/ytrade.md
rename to yearn-ecosystem/r-and-d/ytrade.md
diff --git a/yearn-ecosystem/ygift.md b/yearn-ecosystem/ygift.md
new file mode 100644
index 00000000..0f90f72b
--- /dev/null
+++ b/yearn-ecosystem/ygift.md
@@ -0,0 +1,43 @@
+# yGift
+
+Brighten someone's day by sending a virtual gift. yGift is an NFT (Non-Fungible Token) that can be used to reward someone for their work, or to simply share some love.
+
+## How to send a yGift
+
+Anyone can create and send a yGift. It is possible to add an image or mp4 video, a nice message and even a monetary reward:
+
+1. Access [yGift](https://ygift.to/) website and click on "**create gift**"
+2. Add an image or mp4 video that means something to you both, then upload it to IPFS
+
+
+
+4. Add a receiver **ETH or ENS address**. Make sure it is the correct Ethereum wallet address, or the yGift will be lost
+5. In case you want to add funds to your yGift, choose the token and amount. **Adding funds is optional**
+6. Choose a name and write a nice message for your yGift
+7. **Locking period**: Optionally set a period of days to lock tokens added to the yGift when you create it. You may send the yGift immediately and although it will be available to the recipient, **the tokens will be locked until this period ends**
+8. **Vesting period**: Optionally set a period of days for the tokens to vest. If a locking period has been set, tokens will start vesting immediately after unlocking. Tokens will **vest linearly** until all become available after this period of days expires.
+
+
+
+## How to Tip a yGift
+
+After a yGift has been sent, people can add more funds to it by tipping it! Are you feeling generous? Tip contributor's gift and share some love!
+
+1. Access the page of the yGift you want to tip;
+2. Click on "tip". Set amount and write a nice message
+
+
+
+You can only tip a yGift on the **previous chosen token**. If the yGift was minted with yUSD being the token (even if initial amount was set to 0), then the tips have to be in yUSD.
+
+Tips are always **immediately available** and not subject to locking or vesting.
+
+## Collecting your yGift funds
+
+Received a yGift? Congratulations! If the gift contains a non-zero "Gift Amount" you can collect your unlocked funds. Just click on "Collect" on the top right corner of your gift.
+
+
+
+## Contribute!
+
+yGift is a Yearn project built by the community, for the community! Want to be part of it? Check out [yGift Github](https://github.com/yearn/ygift) and [yGift Discord](https://discord.gg/a7A7QGNzGk) and share your ideas!
diff --git a/products/earn.md b/yearn-finance/earn.md
similarity index 97%
rename from products/earn.md
rename to yearn-finance/earn.md
index a8a428d6..ae83932e 100644
--- a/products/earn.md
+++ b/yearn-finance/earn.md
@@ -14,4 +14,4 @@ As of September 2020, the YTD annualized return for yPool liquidity providers is
## Resources
-- [Earn Homepage](https://yearn.finance/earn)
+- [Earn Homepage](https://v1.yearn.finance/earn)
diff --git a/yearn-finance/woofy.md b/yearn-finance/woofy.md
new file mode 100644
index 00000000..49585e22
--- /dev/null
+++ b/yearn-finance/woofy.md
@@ -0,0 +1,30 @@
+# Woofy Finance
+
+El token de Woofy Finance es el perro azul de compañía del token YFI. utilizando una tecnología especial de Woofy Finance, permite la conversión de dos vías entre ambos tokens, permitiendo a los holders la exposición a YFI en un paquete más esponjoso.
+
+WOOFY resuelve dos problemas: Que YFI no tenga un tema perruno y que su precio sea muy alto en términos de dólar americano.
+
+**1 YFI = 1,000,000 WOOFY**. YFI y WOOFY podrán ser siempre intercambiados el uno por el otro a un cambio fijo utilizando, o bien el [contrato de WOOFY](https://etherscan.io/address/0xd0660cd418a64a1d44e9214ad8e459324d8157f1#code), o la [Web de Woofy](https://woofy.finance/).
+
+## Como hacer y deshacer WOOFY
+
+
+
+[WOOFY](https://etherscan.io/address/0xd0660cd418a64a1d44e9214ad8e459324d8157f1) puede ser creado ("woofed") depositando YFI en la [Web de Woofy](https://woofy.finance/). Puede ser redimido ("unwoofed") por su equivalente en YFI en cualquier momento.
+
+#### Convirtiendo YFI a WOOFY
+
+- **Paso 1**: Visita https://woofy.finance
+- **Paso 2**: Selecciona 'Woof' en la parte superior de la interfaz de swap
+- **Paso 3**: Ingresa el importe de YFI que quieres convertir
+- **Paso 4**: Aprueba el YFI
+- **Paso 5**: Haz clic en 'Woof' en la parte inferior de la interfaz de swap
+
+#### Convirtiendo WOOFY a YFI
+
+- **Paso 1**: Visita https://woofy.finance
+- **Paso 2**: Selecciona 'Unwoof' en la parte superior de la interfaz de swap
+- **Paso 3**: Ingresa el importe de WOOFY que quieres convertir
+- **Paso 4**: Haz clic en 'Unwoof' en la parte inferior de la interfaz de swap
+
+Si es la primera vez que lo haces, asegurate de hacer clic en "add token" sobre el logo de cada token para agregarlos a tu wallet.
diff --git a/yearn-finance/yvaults/README.md b/yearn-finance/yvaults/README.md
new file mode 100644
index 00000000..a9fb9c01
--- /dev/null
+++ b/yearn-finance/yvaults/README.md
@@ -0,0 +1,9 @@
+# yVaults
+
+{% page-ref page="overview.md" %}
+
+{% page-ref page="vault-tokens.md" %}
+
+{% page-ref page="vaults-and-strategies.md" %}
+
+{% page-ref page="yvault-advantages.md" %}
diff --git a/yearn-finance/yvaults/overview.md b/yearn-finance/yvaults/overview.md
new file mode 100644
index 00000000..2cd66344
--- /dev/null
+++ b/yearn-finance/yvaults/overview.md
@@ -0,0 +1,41 @@
+# Overview
+
+## What are yVaults?
+
+[yVaults](https://yearn.finance/vaults) are like savings accounts for your crypto assets. They accept your deposit, then route it through a strategies which seek out the highest yield available in DeFi.
+
+
+
+## Zap in with any asset
+
+Thanks to [Zapper](https://zapper.fi/), yVaults are extremely easy to deposit into. As long as you hold a token that can be swapped on Uniswap with less than 1% slippage, the vault will accept the token, convert it into what's required for the vault, and deposit all in the same transaction.
+
+When withdrawing, users will be able to zap back into one of the following tokens:
+- ETH, WETH, DAI, USDT, USDC, WBTC
+
+## yVault Fee Structure
+
+|yVault Version|Withdrawal Fee|Performance Fee|Management Fee|
+|--------------|:-----------:|:-------------:|:------------:|
+|v1|0.5%|5%|-|
+|v2|-|20%|2%|
+
+**Withdrawal Fee**: One time fee charged to your balance upon withdrawal. This has been turned off for all vaults and only existed in the v1 iteration.
+
+**Performance Fee**: Deducted from yield earned every time a vault harvests a strategy.
+
+**Management Fee**: Flat rate taken from vault deposits over a year. The fee is extracted by minting new shares of the vault, thereby diluting vault participants. This is done at the time of harvest, and calculated based off of time since the previous harvest.
+
+For example, a vault takes about .0055% of deposits per day on average (2 (percent)/365 (days)):
+- It would dilute vault tokens by 5 * .0055% after 5 days without harvesting
+- It would dilute vault tokens by 7 * .0055% on the next harvest if it had not happened for 7 days
+- Vaults will only harvest if it is profitable after fees so that users won't withdraw less than their deposit
+
+On the [yearn.finance](https://yearn.finance/) user interface, yield is displayed as net APY. This means that both fees and compounding returns are taken into consideration in the rates presented. Since harvests don't occur on a set basis, yield is estimated based off of historical data. For more information, see [How to Understand yVault ROI](https://docs.yearn.finance/resources/guides/how-to-understand-yvault-roi)
+
+## v2 yVault Improvements
+
+- **Up to 20 strategies per vault:** This will increase the flexibility to manage capital efficiently during different market scenarios. Each strategy has a capital cap. This is useful to avoid over allocating funds to a strategy which cannot increase APY anymore.
+- **Strategist and Guardian are the new Controllers:** The Controller concept is not available in V2 yVaults and has been replaced by a Guardian and the Strategy creator \(strategist\). These 2 actors oversee strategy performance and are empowered to take action to improve capital management or act on critical situations.
+- **Automated vault housekeeping \(Keep3r network\):** `harvest()` and `earn()` calls are now automated through the Keep3r bots network. These 2 function calls are used to purchase new underlying collateral by selling the earned tokens while moving the profits back to the vault and later into strategies. The keep3r network takes the heavy lifting of doing these calls and running with the gas costs in exchange for keep3r tokens. This approach unloads humans from these housekeeping tasks.
+- **Bouncers and Guest lists**: Yearn has created an unique development process for new vaults. All vaults are launched as Test Vaults \(tyvToken\) to start with. Test vaults have a cap and therefore their strategies as well. Also, the Bouncer has a guest list of wallets which can interact by depositing and withdrawing funds in the Test Vaults. This approach prevents uninformed users from potentially losing funds in a not production ready product.
\ No newline at end of file
diff --git a/yearn-finance/yvaults/vault-tokens.md b/yearn-finance/yvaults/vault-tokens.md
new file mode 100644
index 00000000..132e426c
--- /dev/null
+++ b/yearn-finance/yvaults/vault-tokens.md
@@ -0,0 +1,60 @@
+# Vault Tokens
+
+[yVault Tokens](https://docs.yearn.finance/resources/defi-glossary#ytoken) are like a deposit receipt. They represent a user's share of the yVault that they are participating in.
+
+**For example**, if you deposit YFI in a yVault you will receive yvYFI in return. yvYFI would be the yVault Token.
+
+If your yVault generates profit, the share price of your yVault tokens will increase. This happens because there are more underlying tokens in the yVault to redeem upon withdrawal.
+
+
+
+*The yvYFI token at [Etherscan](https://etherscan.io/token/0xE14d13d8B3b85aF791b2AADD661cDBd5E6097Db1#readContract), showing its name, total assets and price per share.*
+
+Once a user's liquidity is withdrawn from the yVault, their yVault Token will be burned. yVault Tokens are [ERC20](https://docs.ethhub.io/built-on-ethereum/erc-token-standards/erc20/), meaning they can be transferred and traded as any other common Ethereum token.
+
+## V2 yVault Tokens
+
+| Vault | Input Token | Output Token |
+| :--- | :--- | :--- |
+| YFI | [YFI](https://etherscan.io/token/0x0bc529c00c6401aef6d220be8c6ea1667f6ad93e) | [yvYFI](https://etherscan.io/token/0xE14d13d8B3b85aF791b2AADD661cDBd5E6097Db1) |
+| 1INCH | [1INCH](https://etherscan.io/token/0x111111111117dc0aa78b770fa6a738034120c302) | [yv1INCH](https://etherscan.io/token/0xB8C3B7A2A618C552C23B1E4701109a9E756Bab67) |
+| WETH | [WETH](https://etherscan.io/token/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2) | [yvWETH](https://etherscan.io/token/0xa9fE4601811213c340e850ea305481afF02f5b28) |
+| USDC | [USDC](https://etherscan.io/token/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48) | [yvUSDC](https://etherscan.io/token/0x5f18c75abdae578b483e5f43f12a39cf75b973a9) |
+| HEGIC | [HEGIC](https://etherscan.io/token/0x584bC13c7D411c00c01A62e8019472dE68768430) | [HEGIC](https://etherscan.io/token/0x584bC13c7D411c00c01A62e8019472dE68768430) |
+| DAI | [DAI](https://etherscan.io/token/0x6b175474e89094c44da98b954eedeac495271d0f) | [yvDAI](https://etherscan.io/token/0x19d3364a399d251e894ac732651be8b0e4e85001) |
+| WBTC | [WBTC yVault](https://etherscan.io/address/0xcb550a6d4c8e3517a939bc79d0c7093eb7cf56b5) | [WBTC yVault](https://etherscan.io/address/0xcb550a6d4c8e3517a939bc79d0c7093eb7cf56b5) |
+| USDT | [WBTC yVault](https://etherscan.io/address/0xcb550a6d4c8e3517a939bc79d0c7093eb7cf56b5) | [yvUDST](https://etherscan.io/token/0x7Da96a3891Add058AdA2E826306D812C638D87a7) |
+| crvIB | [Curve Iron Bank Pool yVault](https://etherscan.io/address/0x27b7b1ad7288079A66d12350c828D3C00A6F07d7) | [yCurve-IronBank](https://etherscan.io/token/0x27b7b1ad7288079A66d12350c828D3C00A6F07d7) |
+| crvSETH | [Curve sETH Pool yVault](https://etherscan.io/address/0x986b4AFF588a109c09B50A03f42E4110E29D353F) | [yvCurve-sETH](https://etherscan.io/token/0x986b4AFF588a109c09B50A03f42E4110E29D353F) |
+| crvstETH | [Curve stETH Pool yVault](https://etherscan.io/address/0xdcd90c7f6324cfa40d7169ef80b12031770b4325) | [yvCurve-stETH](https://etherscan.io/token/0xdcd90c7f6324cfa40d7169ef80b12031770b4325) |
+| crvSBTC | [Curve sBTC Pool yVault](https://etherscan.io/address/0x8414Db07a7F743dEbaFb402070AB01a4E0d2E45e) | [yvCurve-sBTC](https://etherscan.io/token/0x8414Db07a7F743dEbaFb402070AB01a4E0d2E45e) |
+| crvRENBTC | [Curve renBTC Pool yVault](https://etherscan.io/address/0x7047F90229a057C13BF847C0744D646CFb6c9E1A) | [yvCurve-renBTC](https://etherscan.io/token/0x7047F90229a057C13BF847C0744D646CFb6c9E1A) |
+| crvOBTC | [Curve oBTC Pool yVault](https://etherscan.io/address/0xe9Dc63083c464d6EDcCFf23444fF3CFc6886f6FB) | [yvCurve-oBTC](https://etherscan.io/token/0xe9Dc63083c464d6EDcCFf23444fF3CFc6886f6FB) |
+| crvPBTC | [Curve pBTC Pool yVault](https://etherscan.io/address/0x3c5DF3077BcF800640B5DAE8c91106575a4826E6) | [yvCurve-pBTC](https://etherscan.io/token/0x3c5DF3077BcF800640B5DAE8c91106575a4826E6) |
+| crvTBTC | [Curve tBTC Pool yVaut](https://etherscan.io/address/0x23D3D0f1c697247d5e0a9efB37d8b0ED0C464f7f) | [yvCurve-tBTC](https://etherscan.io/token/0x23D3D0f1c697247d5e0a9efB37d8b0ED0C464f7f) |
+| crvFRAX | [Curve FRAX Pool yVault](https://etherscan.io/address/0xB4AdA607B9d6b2c9Ee07A275e9616B84AC560139#code) | [yvCurve-FRAX](https://etherscan.io/token/0xB4AdA607B9d6b2c9Ee07A275e9616B84AC560139) |
+| crvLUSD | [Curve LUSD Pool yVault](https://etherscan.io/address/0x5fA5B62c8AF877CB37031e0a3B2f34A78e3C56A6#code) | [yvCurve-LUSD](https://etherscan.io/token/0x5fA5B62c8AF877CB37031e0a3B2f34A78e3C56A6) |
+| crvSAAVE | [Curve sAave Pool yVault](https://etherscan.io/address/0xb4D1Be44BfF40ad6e506edf43156577a3f8672eC#code) | [yvCurve-sAave](https://etherscan.io/token/0xb4D1Be44BfF40ad6e506edf43156577a3f8672eC) |
+| crvBBTC | [Curve BBTC Pool yVault](https://etherscan.io/address/0x8fA3A9ecd9EFb07A8CE90A6eb014CF3c0E3B32Ef) | [yvCurve-BBTC](https://etherscan.io/token/0x8fA3A9ecd9EFb07A8CE90A6eb014CF3c0E3B32Ef) |
+| yvBOOST | [Yearn Compounding veCRV yVault](https://etherscan.io/address/0x9d409a0A012CFbA9B15F6D4B36Ac57A46966Ab9a) | [yvBOOST](https://etherscan.io/token/0x9d409a0A012CFbA9B15F6D4B36Ac57A46966Ab9a) |
+
+## V1 yVault Tokens
+
+| Vault | Input Token | Output Token |
+| :--- | :--- | :--- |
+| crvLINK | [linkCRV](https://etherscan.io/token/0xcee60cfa923170e4f8204ae08b4fa6a3f5656f3a) | [yvlinkCRV](https://etherscan.io/token/0x96Ea6AF74Af09522fCB4c28C269C26F59a31ced6) |
+| crvUSDP | [usdp3CRV](https://etherscan.io/token/0x7Eb40E450b9655f4B3cC4259BCC731c63ff55ae6) | [yvusdp3CRV](https://etherscan.io/token/0x1B5eb1173D2Bf770e50F10410C9a96F7a8eB6e75) |
+| crvANKR | [ankrCRV](https://etherscan.io/token/0xaA17A236F2bAdc98DDc0Cf999AbB47D47Fc0A6Cf) | [yvankrCRV](https://etherscan.io/token/0xE625F5923303f1CE7A43ACFEFd11fd12f30DbcA4) |
+| yCRV\(yUSD\) | [yDAI+yUSDC+yUSDT+yTUSD](https://etherscan.io/token/0xdF5e0e81Dff6FAF3A7e52BA697820c5e32D806A8) | [yyDAI+yUSDC+yUSDT+yTUSD](https://etherscan.io/token/0x5dbcf33d8c2e976c6b560249878e6f1491bca25c) |
+| crvMUSD | [musd3CRV](https://etherscan.io/token/0x1AEf73d49Dedc4b1778d0706583995958Dc862e6) | [yvmusd3CRV](https://etherscan.io/token/0x0FCDAeDFb8A7DfDa2e9838564c5A1665d856AFDF) |
+| crvGUSD | [gusd3CRV](https://etherscan.io/token/0xD2967f45c4f384DEEa880F807Be904762a3DeA07) | [yvgusd3CRV](https://etherscan.io/token/0xcC7E70A958917cCe67B4B87a8C30E6297451aE98) |
+| crvDUSD | [dusd3CRV](https://etherscan.io/token/0x3a664Ab939FD8482048609f652f9a0B0677337B9) | [yvdusd3CRV](https://etherscan.io/address/0x8e6741b456a074F0Bc45B8b82A755d4aF7E965dF#code) |
+| crvUSDN | [usdn3CRV](https://etherscan.io/token/0x4f3E8F405CF5aFC05D68142F3783bDfE13811522) | [yvusdn3CRV](https://etherscan.io/token/0xFe39Ce91437C76178665D64d7a2694B0f6f17fE3) |
+| crvUSDT | [ust3CRV](https://etherscan.io/token/0x94e131324b6054c0D789b190b2dAC504e4361b53) | [yvusdt3CRV](https://etherscan.io/token/0xF6C9E9AF314982A4b38366f4AbfAa00595C5A6fC) |
+| crvHUSD | [husd3CRV](https://etherscan.io/token/0x5B5CFE992AdAC0C9D48E05854B2d91C73a003858) | [yvhusd3CRV](https://etherscan.io/token/0x39546945695DCb1c037C836925B355262f551f55) |
+| crvBUSD | [yDAI+yUSDC+yUSDT+yBUSD \(bCrv\)](https://etherscan.io/token/0x3B3Ac5386837Dc563660FB6a0937DFAa5924333B) | [yyDAI+yUSDC+yUSDT+yBUSD](https://etherscan.io/token/0x2994529C0652D127b7842094103715ec5299bBed) |
+| crvSUSD | [crvPlain3andSUSD \(sCrv\)](https://etherscan.io/token/0xC25a3A3b969415c80451098fa907EC722572917F) | [yvcrvPlain3andSUSD](https://etherscan.io/token/0x5533ed0a3b83F70c3c4a1f69Ef5546D3D4713E44) |
+| 3Crv | [3Crv](https://etherscan.io/token/0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490) | [y3Crv](https://etherscan.io/token/0x9cA85572E6A3EbF24dEDd195623F188735A5179f) |
+| crvEURS | [eursCRV](https://etherscan.io/token/0x194eBd173F6cDacE046C53eACcE9B953F28411d1) | [yveursCRV](https://etherscan.io/token/0x98B058b2CBacF5E99bC7012DF757ea7CFEbd35BC) |
+| crvHBTC | [hCRV](https://etherscan.io/token/0xb19059ebb43466C323583928285a49f558E572Fd) | [yvhCRV](https://etherscan.io/token/0x46AFc2dfBd1ea0c0760CAD8262A5838e803A37e5) |
+
diff --git a/yearn-finance/yvaults/vaults-and-strategies.md b/yearn-finance/yvaults/vaults-and-strategies.md
new file mode 100644
index 00000000..dbdcf53e
--- /dev/null
+++ b/yearn-finance/yvaults/vaults-and-strategies.md
@@ -0,0 +1,7 @@
+# Vaults and Strategies
+
+After depositing, your funds first go to the vault contract and then are deployed to one or more strategy contracts. Guardians and strategists monitor deposits in order ensure optimal returns and to be available during critical situations.
+
+**Vault and strategy descriptions:** [The Vaults at Yearn](https://medium.com/yearn-state-of-the-vaults/the-vaults-at-yearn-9237905ffed3)
+
+**Vault and strategy contracts:** [Yearn Watch](https://yearn.watch/)
diff --git a/yearn-finance/yvaults/yvault-advantages.md b/yearn-finance/yvaults/yvault-advantages.md
new file mode 100644
index 00000000..f146046e
--- /dev/null
+++ b/yearn-finance/yvaults/yvault-advantages.md
@@ -0,0 +1,52 @@
+# How Yearn increases your yield
+
+Almost everything that yVaults interact with is available to the public. So how is Yearn able to offer users better yield than they'd be able to achieve on their own?
+
+## Curve Finance Synergy
+
+Many of Yearn's strategies utilize Curve Finance's liquidity mining program. [Curve Finance](https://curve.fi/) has a 300 year token distribution program for those who provide liquidity for their low slippage decentralized exchange.
+
+### veCRV Boosts
+
+CRV is distributed continuously to users who stake certain liquidity provider tokens in Curve's [gauge](https://resources.curve.fi/base-features/understanding-gauges). Those CRV rewards can be increased when the user locks up their CRV in the [Locker](https://dao.curve.fi/locker). This locker gives the staker veCRV in return, which bears the right to vote in governance and to claim a portion of the protocol's fees.
+
+Locking CRV allows users to boost the CRV rewards they are receiving when providing liquidity in eligible pools. The amount of the boost is determined by how much CRV was locked and their relative stake in the pool.
+
+
+
+Using the Backscratcher yVault, Yearn locks up a significant amount of CRV indefinitely, and distributes the boosts to various yVaults.
+
+### Backscratcher yVault
+
+The Backscratcher yVault capitalizes on liquidity mining in a way that's beneficial to both Curve and Yearn.
+
+Users deposit CRV into the yVault which is locked infinitely. In return they receive a token that represents a share of the Backscratcher pool. Revenue earned from the curve through curve fee sharing is distributed in the Backscratcher pool and can be redeemed by depositors on a weekly basis.
+
+Additionally, 10% of all CRV earned by Yearn Finance is deposited into Backscratcher and locked infinitely. Because of this, people who want to stake CRV will always receive a higher share of the Backscratcher yVault's revenue than staking directly through Curve. They also can earn emissions of tokens like SUSHI and PICKLE for providing liquidity.
+
+
+
+Users will never be able to withdraw their original CRV, but because of the incentives on yveCRV liquidity and the value that the token accrues from various sources of revenue, they will be able to swap it for another asset for some price.
+
+In return, control over the locked CRV's boosts is given to Yearn, and utilized throughout various yVaults.
+
+## Auto-compounding yield
+
+Compounding yield requires transaction fees to be paid to the Ethereum blockchain. This can be expensive and cut into returns.
+
+Because yVaults batch your transaction with many other depositors, it is cumulatively lower cost and higher return to earn yield using the vaults. Currently, gas costs are covered by the Keep3r network, meaning that users are compounding returns while bearing no cost.
+
+## Leverage
+
+Yearn utilizes the Iron Bank (C.R.E.A.M. Finance) to access credit that is used to enhance yVault yields. Only white-listed addresses have this feature available to them, meaning that typically, individuals are not able to do this on their own.
+
+Some strategies also implement [flash loans](https://docs.yearn.finance/resources/defi-glossary#flash-loan), which is typically a back-end service that requires development experience to take advantage of.
+
+## Partnerships
+
+The Backscratcher yVault is only possible due to synergistic relationships with protocols like Curve, SushiSwap and Pickle Finance. Our relationships across DeFi allow yVault depositors benefits that they cannot get elsewhere.
+
+Yearn actively collaborates on development with protocols like the ones mentioned in order to create new opportunities for yield and further DeFi as an industry.
+
+
+
diff --git a/yfi-and-ytokens.md b/yfi-and-ytokens.md
deleted file mode 100644
index 832bec76..00000000
--- a/yfi-and-ytokens.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# YFI and yTokens
-
-## YFI
-
-- Yearn Governance token
-- Only 30,000 minted and already fully distributed
- - Governance can mint more, if proposal to do so passes.
-
-## yTokens
-
-- When you deposit into any yearn service your deposit is wrapped and returned as a yToken representing the liquidity provided
-- For example, if you deposit DAI in y.curve.fi you will receive yDAI in return
-- Amounts of yToken and deposited token will differ since the yToken represents a share of a pool that is increasing in value
-- If you deposit a yToken into another yearn service you will get a yyToken back
-
-## yUSD
-
-- See our [doc on yUSD](https://docs.yearn.finance/yusd) for detailed info
-- LP token for yearn's yCRV yVault
-- aka `yyCRV` or `yyDAI+yUSDC+yUSDT+yTUSD`
-- When you deposit yCRV into the yVault you receive yUSD\*\*\*\* LP tokens
-- earns interest via yCRV, fees and yield farming rewards via the vault strategy
-
-## yCRV
-
-- LP token for yearn's Y pool at Curve.fi/y
-- Aka `yDAI+yUSDC+yUSDT+yTUSD`
-- Interest earning token representing your share of the Y pool composed of DAI, USDT, USDC, and TUSD
diff --git a/yusd.md b/yusd.md
deleted file mode 100644
index 05ca57ec..00000000
--- a/yusd.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# yUSD
-
-yUSD is an ERC-20 token issued by Yearn that **represents shares** in the most popular vault: the yCRV Vault \(listed as `curve.fi/y LP` on [vaults page](https://yearn.finance/vaults)\).
-
-yUSD makes DeFi simple by automatically maximizing yield and minimizing risk for depositors. On the backend, the yCRV Vault implements modular, autonomous, yield-aware strategies.
-
-These are created and regularly updated by Yearn's community, all under the **control of Yearn governance.**
-
-## How to Get yUSD
-
-Full visual walkthrough here: [How to Mint yUSD](how-to-guides/how-to-mint-yusd.md).
-
-_Supported wallets: Metamask, Trustwallet, Trezor, or Torus._
-
-1. Load your wallet with DAI, USDC, USDT, TUSD, or yCRV.
-2. Go to [vaults.finance](https://vaults.finance/).
-3. Connect your wallet.
-4. Deposit your coins into the vault, receive yUSD.
-
-## yUSD in Detail
-
-You may also see yUSD referred to as `yyCRV` and `yyDAI+yUSDC+yUSDT+yTUSD` – both of these names are accurate and describe yUSD's composition.
-
-yUSD accrues earnings from **three tiers** of Yearn's modular strategies:
-
-### Tier 1: Money Markets
-
-At the base level, DAI, USDC, USDT, and TUSD are each wrapped into our 3rd generation yield-aware tokens: yDAI, yUSDC, yUSDT, and yTUSD. These tokens autonomously seek out the **highest single-asset ROI** from Aave, Compound, and dydx.
-
-### Tier 2: Y Curve Pool
-
-At the next level up, yDAI, yUSDC, yUSDT, and yTUSD provide liquidity in the **Curve and Yearn partnership pool** \(curve.fi/y\). yCRV – the [LP token](https://docs.yearn.finance/defi-glossary#liquidity-providers) for this pool grows in value from fees charged on stablecoin swaps within the pool.
-
-It also generates CRV rewards which are harvested in the next tier up.
-
-### Tier 3: Sustainable Yield
-
-At the highest level, yUSD accesses community developed yield strategies to take advantage of emergent opportunities in the DeFi space.
-
-Created by developers who are rewarded for their efforts, these strategies are assessed and voted on before being incorporated into the Yearn system.
-
-At this tier the current strategy sits on top of the lower two tiers and **harvests CRV rewards to recycle them back into yCRV**—increasing the vault's base asset and the value of yUSD.
-
-## Resources
-
-- yUSD
- - CoinGecko: [https://www.coingecko.com/en/coins/yusd](https://www.coingecko.com/en/coins/yusd)
- - yUSD Token contract: [0x5dbcF33D8c2E976c6b560249878e6F1491Bca25c](https://etherscan.io/address/0x5dbcF33D8c2E976c6b560249878e6F1491Bca25c)
-- Code
- - The vaults.finance source code on [GitHub](https://github.com/banteg/yearn-recycle)
- - The current strategy: [StrategyCurveYCRVVoter](https://etherscan.io/address/0xc999fb87AcA383A63D804A575396F65A55aa5aC8#code)
-- FAQ
- - [https://docs.yearn.finance/faq\#vaults](https://docs.yearn.finance/faq#vaults)