Merge pull request #171 from LongForWisdom/general-updates

[FOR REVIEW] - Update RPIPs with passage of RPIP-40.
rocket-pool · Apr 18, 2024 · 2b9bd41 · 2b9bd41
2 parents bdf2e86 + 292279b
commit 2b9bd41
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/RPIPs/RPIP-26.md b/RPIPs/RPIP-26.md
@@ -4,14 +4,17 @@ title: Updating of Grants Management Committee
 description: Replaces RPIP-18, which described the guiding principles, selection of, operation of, and governance of the Grants and Bounties Management Committee.
 author: ShfRyn (@ShfRyn), Calurduran (@dafuerstman), Valdorff (@Valdorff)
 discussions-to: https://dao.rocketpool.net/t/updating-of-grants-management-committee/1968
-status: Final
+status: Obsolete
 type: Meta
 created: 2023-06-14
 vote-to: https://vote.rocketpool.net/#/proposal/0xc1ece070feeb44115dbfd79827e10e35d86c93043e807369e54ec2d62a4fcace
 vote-date: 2023-08-18
 vote-result: Passed
 ---
 
+## \>\> NOTICE <<
+This RPIP has been made obsolete by the passage of [RPIP-40](RPIP-40.md).
+
 ## Abstract
 
 RPIP-10 sets aside 30% of the pDAO budget for Grants and Bounties. The details of the mechanics of

diff --git a/RPIPs/RPIP-29.md b/RPIPs/RPIP-29.md
@@ -7,7 +7,7 @@ discussions-to: N/A
 status: Living
 type: Informational
 created: 2023-07-19
-requires: 18, 26
+requires: 18, 40
 ---
 
 ## Abstract

diff --git a/RPIPs/RPIP-34.md b/RPIPs/RPIP-34.md
@@ -174,7 +174,7 @@ This is a voted operational process (VOP) definition, see [RPIP-34](RPIP-34.md)
 * **Trigger(s):** 
   * OPTIONAL - Periodic yearly (12 months)
   * The GMC Administrator role is unfilled
-* **Other Requirements:** See RPIP-26 - Expanded GMC Administrator Role for full requirements.
+* **Other Requirements:** See RPIP-40 - Expanded GMC Administrator Role for full requirements.
 
 #### VOP-GMC-ADMINREMOVE
 This is a voted operational process (VOP) definition, see [RPIP-34](RPIP-34.md) for more information.
@@ -240,7 +240,7 @@ This is a voted operational process (VOP) definition, see [RPIP-34](RPIP-34.md)
 * **Vote Type:** Single Choice Plurality (Snapshot)
 * **Trigger(s):** Grant Announcement (within 2 weeks of announcement)
 * **Other Requirements:** 
-  * See RPIP-26 - Expanded GMC Administrator Role for full requirements.
+  * See RPIP-40 - Expanded GMC Administrator Role for full requirements.
   * Promising community sentiment per RPIP-4.
 
 #### VOP-PDAOBUDGET-SPLITCHANGE

diff --git a/RPIPs/RPIP-36.md b/RPIPs/RPIP-36.md
@@ -25,7 +25,7 @@ Currently, there is no overview of the active committees within Rocket Pool, or
 | 2022-03-17       | RPIP Editors                          | To manage and administer the RPIP process                              | [RPIP-1](RPIP-1)                       | N/A                                                                                                                                                                                        | N/A                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | 2022-08-25       | pDAO Treasurer Role                   | To update the DAOs on pDAO budget spending                             | [RPIP-10](RPIP-10)                     | N/A                                                                                                                                                                                        | [Treasury Report Sheet](https://docs.google.com/spreadsheets/d/1b8ZtXBzh2TkwrdyGYMPtjZNPB4jzErhp0z29rwb2ByQ/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | 2022-08-25       | Incentives Management Committee (IMC) | To support low slippage exchange between ETH and rETH                  | [RPIP-20](RPIP-20), [RPIP-10](RPIP-10) | [Mainnet](https://app.safe.global/home?safe=eth:0xb867EA3bBC909954d737019FEf5AB25dFDb38CB9), [Arbitrum](https://app.safe.global/home?safe=arb1:0xd7102A3744c302f167c53621453516345bC460d7) | [Tracking Sheet](https://docs.google.com/spreadsheets/d/1jLGkoiSjNr1UgG1spAH9ppBfrk_FqjJXg9CIw35nLCA/edit#gid=1325210165), [Discord Discuss](https://discord.com/channels/405159462932971535/929890788551323678), [Discord Execute](https://discord.com/channels/405159462932971535/1020537769635872808)                                                                                                                                                                                                                                                                                                                                                          |
-| 2022-10-11       | Grants Management Committee (GMC)     | To distribute funding to further the goals of the Rocket Pool protocol | [RPIP-26](RPIP-26), [RPIP-10](RPIP-10) | [Mainnet](https://app.safe.global/home?safe=eth:0x6efD08303F42EDb68F2D6464BCdCA0824e1C813a)                                                                                                | [Tracking Sheet](https://docs.google.com/spreadsheets/d/1dMtHJ4sffBidSN5RphLYC9A5HrsRNqHfqLVn-nJR104/edit#gid=1743976156), [Member Activity Sheet](https://docs.google.com/spreadsheets/d/1oxOioCXoVIqY4aFS9mEgHMgK18QLEfJcwlZk2-l6cfc/edit?usp=sharing), [Standard Operating Procedures](https://docs.google.com/document/d/1YNG0nhC04jDonO42hT_MZ0sQT-3EIU04HK9Fwrkzs30/edit#heading=h.s7ggzumy4f02), [Records RPIP](RPIP-29), [Discord Discuss](https://discord.com/channels/405159462932971535/1064611985523757067), [Discord Execute](https://discord.com/channels/405159462932971535/1140264795296256050), [Discord Channel](https://discord.gg/tZDFBbh7uM) |
+| 2022-10-11       | Grants Management Committee (GMC)     | To distribute funding to further the goals of the Rocket Pool protocol | [RPIP-40](RPIP-40), [RPIP-10](RPIP-10) | [Mainnet](https://app.safe.global/home?safe=eth:0x6efD08303F42EDb68F2D6464BCdCA0824e1C813a)                                                                                                | [Tracking Sheet](https://docs.google.com/spreadsheets/d/1dMtHJ4sffBidSN5RphLYC9A5HrsRNqHfqLVn-nJR104/edit#gid=1743976156), [Member Activity Sheet](https://docs.google.com/spreadsheets/d/1oxOioCXoVIqY4aFS9mEgHMgK18QLEfJcwlZk2-l6cfc/edit?usp=sharing), [Standard Operating Procedures](https://docs.google.com/document/d/1YNG0nhC04jDonO42hT_MZ0sQT-3EIU04HK9Fwrkzs30/edit#heading=h.s7ggzumy4f02), [Records RPIP](RPIP-29), [Discord Discuss](https://discord.com/channels/405159462932971535/1064611985523757067), [Discord Execute](https://discord.com/channels/405159462932971535/1140264795296256050), [Discord Channel](https://discord.gg/tZDFBbh7uM) |
 
 ## RPIP Editors
 

diff --git a/RPIPs/RPIP-39.md b/RPIPs/RPIP-39.md
@@ -7,7 +7,7 @@ discussions-to: https://dao.rocketpool.net/t/rpip-39-bounty-incentives/2753
 status: Final
 type: Meta
 created: 2024-02-16
-requires: 26
+requires: 40
 ---
 
 ## Abstract

diff --git a/RPIPs/RPIP-40.md b/RPIPs/RPIP-40.md
@@ -8,6 +8,9 @@ status: Final
 type: Meta
 created: 2024-02-20
 requires: 18, 26
+vote-to: https://vote.rocketpool.net/#/proposal/0xe53f98bba8797bfa6ddaf4fd20809c53fabca4aaa9b00d09557e6f270634b820
+vote-date: 2024-03-28
+vote-result: Passed
 ---
 
 ## Abstract