Retry catch up spring2024-tokenomics before draft8 merge to main

RPIPs/RPIP-49.md

@@ -15,7 +15,7 @@ This informational RPIP provides an introduction and overview of the 2024 commun
 
 The tokenomics rework will likely be split into two protocol upgrades, Saturn 1 and Saturn 2. This RPIP describes the components that are expected to be included within each.
 
-This Informational RPIP and the tokenomics rework represent the best efforts of the Rocket Pool community contributors involved. Information within this RPIP should not be considered official word from the Rocket Pool core development team. 
+This Informational RPIP and the tokenomics rework represent the best efforts of the Rocket Pool community contributors involved. Information within this RPIP should not be considered official word from the Rocket Pool core development team.
 
 ## Explainers
 
@@ -29,57 +29,48 @@ The following explainers are being maintained by the community to help make the
 
 ## Contents
 
+### [RPIP-42: Bond curves](RPIP-42.md)
+
+The changes to bond curves allow Node Operators to provide smaller ETH bonds while maintaining the security of the Rocket Pool protocol.
+* This gives Node Operators the option of dramatically increasing their capital efficiency.
+* This allows the Rocket Pool Protocol to support a greater amount of rETH.
+
+For bonds to be lowered securely for the protocol, an initial set of bonds for a node must be larger than the minimum bond.
+
 ### [RPIP-43: Megapools](RPIP-43.md)
 
 A Megapool is a single contract that can be used as an Ethereum withdrawal address for multiple validators.
 * This allows for much more gas-efficient usage of the Rocket Pool protocol for Node Operators.
-* This allows for the application of megapool-level penalties. 
-* Importantly, this RPIP specifies that node operation no longer requires RPL staking (ETH-only node operation). 
+* This allows for the application of megapool-level penalties.
+* Importantly, this RPIP specifies that node operation no longer requires RPL staking (ETH-only node operation).
 
 Additionally, Megapools are required to facilitate the bond curve changes described in RPIP-42.
 
-### [RPIP-42: Bond curves](RPIP-42.md)
+### [RPIP-44: Forced exits](RPIP-44.md)
 
-The changes to bond curves allow Node Operators to provide smaller ETH bonds while maintaining the security of the Rocket Pool protocol. 
-* This gives Node Operators the option of dramatically increasing their capital efficiency.
-* This allows the Rocket Pool Protocol to support a greater amount of rETH. 
+This change, planned for Saturn 2, allows the Rocket Pool protocol to force-exit Node Operators under certain circumstances. It relies on the adoption of [EIP-7002](https://eips.ethereum.org/EIPS/eip-7002) by the Ethereum protocol.
+* This allows Node Operators to exit their validators easily.
+* This allows the Rocket Pool protocol to exit malicious validators.
 
-For bonds to be lowered securely for the protocol, an initial set of bonds for a node must be larger than the minimum bond. 
+The ability to force-exit misbehaving validators is a requirement for [RPIP-44](RPIP-44.md).
 
 ### [RPIP-46: Universal Adjustable Revenue Split](RPIP-46.md)
 
 This change allows the ETH revenue income from borrowed ETH (aka, rETH commission) to be split between various targets. The four targets are:
 1. The Node Operator responsible for the validator with the borrowed ETH.
 2. Vote-eligible Node Operators, proportional to their share of vote-eligible RPL.
 3. The surplus share, used to capture value to the RPL token.
-4. The rETH share, going to rETH holders. 
+4. The rETH share, going to rETH holders.
 
-Aspects of the split are managed by the pDAO, the security council, and automatically by a heuristic function. For full details of 'who can do what', please see the full RPIP. 
+Aspects of the split are managed by the pDAO, the security council, and automatically by a heuristic function. For full details of 'who can do what', please see the full RPIP.
 
 This RPIP also includes the reduction of RPL issuance from 5% to 1.5%, as RPL rewards to Node Operators have been replaced by UARS.
 
-### RPL Value Capture
-
-Some form of value capture method will be included in the tokenomics rework package. Three options are being actively debated:
-* [RPL Burn](RPIP-45.md) - Use the surplus share to buy and burn RPL.
-* [RPL Buy & LP](RPIP-50.md) - Use the surplus share to buy RPL and deposit it in a liquidity pool. 
-* Direct the surplus share to vote-eligible Node Operators, proportional to their share of vote-eligible RPL.
-
-For Saturn 1, the share will be directed based on vote-eligible RPL staked in megapools. There will be a vote prior to Saturn 1 going live to determine the preferred strategy starting at Saturn 2.
-
-### [RPIP-44: Forced exits](RPIP-44.md)
-
-This change, planned for Saturn 2, allows the Rocket Pool protocol to force-exit Node Operators under certain circumstances. It relies on the adoption of [EIP-7002](https://eips.ethereum.org/EIPS/eip-7002) by the Ethereum protocol. 
-* This allows Node Operators to exit their validators easily.
-* This allows the Rocket Pool protocol to exit malicious validators.
-
-The ability to force-exit misbehaving validators is a requirement for [RPIP-44](RPIP-44.md).
-
 ### [RPIP-47: Forced delegate upgrades](RPIP-47.md)
 
-This change allows the Rocket Pool protocol to force-upgrade Node Operators minipool delegate contracts after a grace period has expired. 
-* This reduces the compatibility debt incurred by the protocol as it is upgraded because it does not need to support all prior iterations. 
-* This means that protocol governance can make changes that benefit the protocol as a whole even if the changes do not benefit each individual Node Operator. 
+This change allows the Rocket Pool protocol to force-upgrade Node Operators minipool delegate contracts after a grace period has expired.
+* This reduces the compatibility debt incurred by the protocol as it is upgraded because it does not need to support all prior iterations.
+* This means that protocol governance can make changes that benefit the protocol as a whole even if the changes do not benefit each individual Node Operator.
 
 ### [RPIP-59: Deposit Mechanics](RPIP-59.md)
 
@@ -91,72 +82,79 @@ Here we describe the mechanics of Node Operator deposits and validator creation,
 ### [RPIP-60: Protocol Upgrade Guardrails](RPIP-60.md)
 
 This RPIP introduces a delay after protocol upgrades have been confirmed but prior to them coming into effect, and allows the security council to veto the upgrade during that delay. The veto is justified if the upgrade meets one of the following criteria:
-* It was subject to vote manipulation
-* It is a malicious action
-* It causes clear damage to the Rocket Pool project
+* It was subject to vote manipulation.
+* It is a malicious action.
+* It causes clear damage to the Rocket Pool project.
+
+### RPL Value Capture
+
+Some form of value capture method will be included in the tokenomics rework package. Three options are being actively debated:
+* [RPL Burn](RPIP-45.md) - Use the surplus share to buy and burn RPL.
+* [RPL Buy & LP](RPIP-50.md) - Use the surplus share to buy RPL and deposit it in a liquidity pool.
+* Direct the surplus share to vote-eligible Node Operators, proportional to their share of vote-eligible RP.
+
+For Saturn 1, the share will be directed based on vote-eligible RPL staked in megapools. There will be a vote prior to Saturn 1 going live to determine the preferred strategy starting at Saturn 2.
+
 
 ## Deployment Plan
 
 The tokenomics rework package will likely be split between two protocol upgrades: Saturn 1 and Saturn 2.
 
 ### Saturn 1
-
-* [RPIP-43: Megapools](RPIP-43.md)
-  * Including ETH-only validators.
-* [RPIP-42: Bond curves](RPIP-42.md)
-  * Framework
-  * 4ETH minimum bond
-* [RPIP-59: Deposit Mechanics](RPIP-59.md)
-  * Standard and express queues.
-* [RPIP-46: Universal Adjustable Revenue Split](RPIP-46.md)
-  * Splits between rETH, node operators, and vote-eligible staked RPL staked in megapools
-  * RPL issuance rewards no longer have a minimum stake required
-* RPL Value Capture - Increased share to voting Node Operators.
+* [RPIP-42: Bond curves](RPIP-42.md) - Partial Inclusion
+  * 4 ETH bond per validator
+* [RPIP-43: Megapools](RPIP-43.md) (includes ETH-only validators)
+* [RPIP-46: Universal Adjustable Revenue Split](RPIP-46.md) - Partial Inclusion
+  * UARS introduced with no_share, voter_share, and reth_commission
+  * RPL issuance rewards extended to all staked RPL (no minimum staking requirement)
 * [RPIP-47: Forced delegate upgrades](RPIP-47.md)
+* [RPIP-59: Deposit Mechanics](RPIP-59.md) (includes express queue)
 * [RPIP-60: Protocol Upgrade Guardrails](RPIP-60.md)
+* RPL Value Capture - Increased share to vote-eligible RPL staked in megapools
 
 ### Saturn 2
 
-* [RPIP-42: Bond curves](RPIP-42.md)
-  * 1.5ETH minimum bond. 
+* [RPIP-42: Bond curves](RPIP-42.md) - Remainder
+  * 1.5 ETH minimum bond
 * [RPIP-44: Forced exits](RPIP-44.md)
 * [RPIP-46: Universal Adjustable Revenue Split](RPIP-46.md)
   * Split may add a new share for all RPL, depending on outcome of Revenue Share vote
   * May add in a semi-automated system of controlling voter_share, depending on outcome of Revenue Share vote
   * RPL inflation reduced to 1.5%  (from 5%)
-  * No more RPL issuance rewards
-* RPL Value Capture based on vote outcome - [RPL Burn](RPIP-45.md) / [RPL Buy & LP](RPIP-50.md) / Increased share to vote-eligible RPL staked in megapools
+  * RPL issuance rewards to node operators end
+* RPL Value Capture based on vote outcome - Probably one of: [RPL Burn](RPIP-45.md) / [RPL Buy & LP](RPIP-50.md) / Increased share to vote-eligible RPL staked in megapools
 
 ## Current Status
-Last Updated: July 16th
+Last Updated: July 24th
 
 Current efforts are primarily focused on:
-1. Confirming the Core Team is happy with RPIP specification contents and making minor adjustments as needed.
-2. Polishing the RPIP specifications ready for vote.
+1. Polishing the RPIP specifications for vote.
+2. Forum temperature check and associated discussion.
+3. Preparing vote text for vote.
 
-A maintained list of open tasks is available via Google sheet [here](https://docs.google.com/spreadsheets/d/1KDTeFnNl3XLFO37upti6NbT2p2GDYJ4GKH4aJ51gQZA/edit?pli=1#gid=725857744). 
+A maintained list of open tasks is available via Google sheet [here](https://docs.google.com/spreadsheets/d/1KDTeFnNl3XLFO37upti6NbT2p2GDYJ4GKH4aJ51gQZA/edit?pli=1#gid=725857744).
 
 ### Still To Ratify Prior to Saturn 1
-These items are to be considered flexible until ratified explicitly, rather than ratified alongside the tokenomics rework package as a whole. 
+These items are to be considered flexible until ratified explicitly, rather than ratified alongside the tokenomics rework package as a whole.
 
 * **Saturn 2 Surplus Share Strategy** - Decide and ratify how to manage surplus share in Saturn 2 (we want to decide this before Saturn 1 launches to avoid the incumbent advantage for the voter_share option.)
-  * **Vote Eligible RPL Targets** - Decide and ratify vote-eligible RPL targets if voter_share is not chosen as the surplus share strategy. 
+  * **Vote Eligible RPL Targets** - Decide and ratify vote-eligible RPL targets if voter_share is not chosen as the surplus share strategy.
 * **Deposit Strategy** - Decide whether to take a 2TX or 3TX deposit strategy for validator creation and ratify choice.
-* **Penalty System** - Research, draft and ratify a penalty system. 
+* **Penalty System** - Research, draft and ratify a penalty system.
 * **When the security council should change node operator commission** - the proposal delegates a limited ability for the security council to make UARS changes and directs them to do so based on a specific metric. When and how the council should act is still an open area of discussion.
 
-Any other significant issues the development team identifies that impact their ability to deliver this upgrade may also be added to this list. The development team should strive to minimize this, communicate clearly if it occurs and keep as close to the spirit of the existing contents when deviation is needed. 
+Any other significant issues the development team identifies that impact their ability to deliver this upgrade may also be added to this list. The development team should strive to minimize this, communicate clearly if it occurs and keep as close to the spirit of the existing contents when deviation is needed.
 
 ### Estimated Process
 
 The below is generally agreed to be the steps to be completed before we can consider this 'decided'.
 
-1. **Done** - Complete the first draft of the full proposal specifications. 
-2. **Done** - Seek feedback from technically skilled or highly engaged community members on the draft specifications. 
+1. **Done** - Complete the first draft of the full proposal specifications.
+2. **Done** - Seek feedback from technically skilled or highly engaged community members on the draft specifications.
 3. **Done** - Create high-level explanations and informational material for the full proposal for consumption by the wider community.
 4. **Done** - Make a concerted effort to gather feedback via the forum from the wider community.
-5. **Active** - Update the proposal and specifications as needed taking into account wider community feedback.
-6. Run a forum temperature check vote on the rework package (bar the 'still-to-ratify' list above).
+5. **Done** - Update the proposal and specifications as needed taking into account wider community feedback.
+6. **Active** Run a forum temperature check vote on the rework package (bar the 'still-to-ratify' list above).
 7. Run a snapshot vote on the rework package as Living RPIPs, acknowledging the existence of the 'still-to-ratify' list above.
 8. Run one or more snapshot vote(s) as blockers are cleared from the 'still-to-ratify' list. The end state will include no remaining blockers and the status of the rework RPIPs set to Final.
 
@@ -168,11 +166,11 @@ The below components have been discussed, but are not currently considered high
 
 ## Further Links
 * This proposal was presented at Rocket Pool's "Denver Lift Off" event by Valdorff and Samus - [Presentation](https://docs.google.com/presentation/d/12WRXuZktEtViwBWxFwm8OHpwpgoOpAF01859o0jGkiw), [Powerpoint Backup](../assets/rpip-49/On%20The%20Horizon%20(backup%20version).pptx), [Recorded Presentation](https://www.youtube.com/watch?v=nyqrilFtlrc&list=PLKzACASsJiuXc0v6kZambks4cPaSVbekf&index=4)
-* A now-retired Google sheet containing notes, feedback, and TODOs which can be found [here](https://docs.google.com/spreadsheets/d/1qmGBCPAX-IqcFFjUzBib2Z_NKo_Yh5U00zKnGpyNak4). 
+* A now-retired Google sheet containing notes, feedback, and TODOs which can be found [here](https://docs.google.com/spreadsheets/d/1qmGBCPAX-IqcFFjUzBib2Z_NKo_Yh5U00zKnGpyNak4).
 * A [tokenomics Q&A video](https://www.youtube.com/watch?v=p-Q6fQsVBTY), kindly hosted by the Rocket Fuel podcast.
 
 ## Acknowledgements
-The tokenomics package is based on the [early-March proposal from Valdorff](../assets/rpip-49/readme.md). The initial drafts have seen a significant improvement as a result of discussions with many people (thanks to 🏆samus🏆, 🏆sckuzzle, 🏆epineph, 🏆LongForWisdom, 🏆knoshua, uisce, langers, NonFungibleYokem, MountainB, luominx, ArtDemocrat, and many others). 
+The tokenomics package is based on the [early-March proposal from Valdorff](../assets/rpip-49/readme.md). The initial drafts have seen a significant improvement as a result of discussions with many people (thanks to 🏆samus🏆, 🏆sckuzzle, 🏆epineph, 🏆LongForWisdom, 🏆knoshua, ramana, uisce, langers, NonFungibleYokem, MountainB, luominx, ArtDemocrat, and many others).
 
 ## Copyright
 Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).

RPIPs/RPIP-55.md

@@ -20,23 +20,18 @@ The intention of this Living Informational RPIP is to collate the release-releva
 
 ## Estimated Included RPIPs
 
-* [RPIP-30: RPL Staking Rework](RPIP-30.md) - Partial Inclusion
-  * Two-step RPL withdrawal process.
-
-
-### Tokenomics Rework Content
-The tokenomics upgrade has not yet been ratified by the Rocket Pool pDAO.
-* [RPIP-43: Megapools](RPIP-43.md) - Partial Inclusion
-  * Including ETH-only validators.
-* [RPIP-42: Bond curves](RPIP-42.md) - Partial Inclusion
-  * Framework
-  * 4ETH minimum bond
-* [RPIP-59: Deposit Mechanics](RPIP-59.md)
-  * Standard and express queues.
-* [RPIP-46: Universal Adjustable Revenue Split](RPIP-46.md) - Partial Inclusion
-  * All but heuristic adjustments.
-* RPL Value Capture - One of: [RPIP-45: RPL Burn](RPIP-45.md) / [RPIP-50: RPL Buy & LP](RPIP-50.md) / Increased share to voting Node Operators.
+* [RPIP-30: RPL Staking Rework](RPIP-30.md) - Remainder
+* [RPIP-57: Node Distributor User Fund Unbundling](RPIP-57.md) - Not yet ratified.
+* [RPIP-58: MEV Penalty Guardrail](RPIP-58.md) - Not yet ratified.
+* [RPIP-61: Balance Submission Guardrail](RPIP-61.md) - Not yet ratified.
+
+### RPIP-49 Tokenomics Rework Content
+The RPIP-49 tokenomics rework has not yet been ratified by the Rocket Pool pDAO.
+* [RPIP-42: Bond curves](RPIP-42.md) - Partial
+* [RPIP-43: Megapools](RPIP-43.md)
+* [RPIP-46: Universal Adjustable Revenue Split](RPIP-46.md) - Partial
 * [RPIP-47: Forced delegate upgrades](RPIP-47.md)
+* [RPIP-59: Deposit Mechanics](RPIP-59.md)
 * [RPIP-60: Protocol Upgrade Guardrails](RPIP-60.md)
 
 ## Key Links 

RPIPs/RPIP-56.md

@@ -20,13 +20,12 @@ The intention of this Living Informational RPIP is to collate the release-releva
 
 ## Estimated Included RPIPs
 
-### Tokenomics Rework Content
-The tokenomics upgrade has not yet been ratified by the Rocket Pool pDAO.
-* [RPIP-42: Bond curves](RPIP-42.md) - Partial Inclusion
-  * 1.5ETH minimum bond. 
+### RPIP-49 Tokenomics Rework Content
+The RPIP-49 tokenomics rework has not yet been ratified by the Rocket Pool pDAO.
+* [RPIP-42: Bond curves](RPIP-42.md) - Remainder
 * [RPIP-44: Forced exits](RPIP-44.md)
-* [RPIP-46: Universal Adjustable Revenue Split](RPIP-46.md) - Partial Inclusion
-  * Heuristic adjustments.
+* [RPIP-46: Universal Adjustable Revenue Split](RPIP-46.md) - Remainder
+* RPL Value Capture based on vote outcome - Probably one of: [RPIP-45: RPL Burn](RPIP-45.md) / [RPIP-50: RPL Buy & LP](RPIP-50.md) / Increased share to voting Node Operators
 
 ## Key Links 
 TBC - Include Audits, Code Repositories, Release Blog Posts, Upgrade contract, etc once they are posted.