From 2a749e688fd46e252d2a4e5447930feda073c390 Mon Sep 17 00:00:00 2001 From: J M Rossy Date: Mon, 24 Jun 2024 16:57:57 -0400 Subject: [PATCH 1/3] Updates for executed proposals --- CGPs/cgp-0103.md | 2 +- CGPs/cgp-0132.md | 2 +- CGPs/cgp-0133.md | 6 +++--- CGPs/cgp-0134.md | 6 +++--- CGPs/cgp-0135.md | 5 +++-- CGPs/cgp-0136.md | 4 ++-- CGPs/cgp-0138.md | 6 +++--- CGPs/cgp-0139.md | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/CGPs/cgp-0103.md b/CGPs/cgp-0103.md index 2160c4ba..dddb7a54 100644 --- a/CGPs/cgp-0103.md +++ b/CGPs/cgp-0103.md @@ -5,7 +5,7 @@ date-created: 2023-09-29 author: "Serge Kiema , Serge Ouedraogo " discussions-to: https://forum.celo.org/t/dunia-launching-exof-on-celo/6261/1 status: EXECUTED -governance-proposal-id: 140 +governance-proposal-id: 139 date-executed: 2023-10-20 --- diff --git a/CGPs/cgp-0132.md b/CGPs/cgp-0132.md index f2538478..785a17f1 100644 --- a/CGPs/cgp-0132.md +++ b/CGPs/cgp-0132.md @@ -3,7 +3,7 @@ cgp: 132 title: Proposal for Funding Stabila - Driving Stablecoin Adoption on Celo date-created: 2024-04-26 author: "Kevin Tharayil (@KevinTharayil)" -status: PROPOSED +status: EXPIRED discussions-to: https://forum.celo.org/t/final-proposal-for-funding-stabila-driving-stablecoin-adoption-on-celo/7810 governance-proposal-id: 173 date-executed: diff --git a/CGPs/cgp-0133.md b/CGPs/cgp-0133.md index 7d78d023..612976e5 100644 --- a/CGPs/cgp-0133.md +++ b/CGPs/cgp-0133.md @@ -1,12 +1,12 @@ --- -cgp: 0133 +cgp: 133 title: Cel2 Proposal Temperature Check - Using Optimism Stack for Cel2 date-created: 2024-05-03 author: Mariano Cortesi (@mcortesi), cLabs Blockchain & Primitives teams -status: PROPOSED +status: EXECUTED discussions-to: https://forum.celo.org/t/clabs-proposes-migrating-celo-to-an-ethereum-l2-leveraging-the-op-stack/7902 governance-proposal-id: 174 -date-executed: +date-executed: 2024-05-11 --- ## Overview diff --git a/CGPs/cgp-0134.md b/CGPs/cgp-0134.md index 78066862..a6981d31 100644 --- a/CGPs/cgp-0134.md +++ b/CGPs/cgp-0134.md @@ -1,12 +1,12 @@ --- -cgp: 0134 +cgp: 134 title: "Validators rewards - changes in epoch parameters" date-created: 2024-05-04 author: '@Thylacine @Patrick @Dee>' -status: PROPOSED +status: EXECUTED discussions-to: https://forum.celo.org/t/draft-validators-rewards-change-in-epoch-parameters/7702 governance-proposal-id: 178 -date-executed: +date-executed: 2024-05-23 --- ## Overview diff --git a/CGPs/cgp-0135.md b/CGPs/cgp-0135.md index 08189cda..8080f6da 100644 --- a/CGPs/cgp-0135.md +++ b/CGPs/cgp-0135.md @@ -3,9 +3,10 @@ cgp: 135 title: Kenyan Shilling & USDT/USD Oracle Rates date-created: 2024-05-08 author: "@nvtaveras, @bayological" -status: DRAFT +status: EXECUTED +discussions-to: https://forum.celo.org/t/draft-launch-of-a-kenyan-shilling-stablecoin/7964 governance-proposal-id: 175 -date-executed: +date-executed: 2024-05-15 --- ## Overview diff --git a/CGPs/cgp-0136.md b/CGPs/cgp-0136.md index d8efd9ee..3dbd4b39 100644 --- a/CGPs/cgp-0136.md +++ b/CGPs/cgp-0136.md @@ -3,10 +3,10 @@ cgp: 136 title: Launch of Kenyan Shilling (cKES) Stablecoin date-created: 2024-05-13 author: "@bayological" -status: DRAFT +status: EXECUTED discussions-to: https://forum.celo.org/t/draft-launch-of-a-kenyan-shilling-stablecoin/7964 governance-proposal-id: 177 -date-executed: +date-executed: 2024-05-21 --- ## Overview diff --git a/CGPs/cgp-0138.md b/CGPs/cgp-0138.md index ab511d50..9a2dbec7 100644 --- a/CGPs/cgp-0138.md +++ b/CGPs/cgp-0138.md @@ -3,10 +3,10 @@ cgp: 138 title: MU06 - Native USDT integration on Mento v2 date-created: 2024-05-23 author: "@philbow61, @nvtaveras" -status: DRAFT +status: EXECUTED discussions-to: https://forum.celo.org/t/proposal-mento-upgrade-mu06-native-usdt-integration/ -governance-proposal-id: -date-executed: +governance-proposal-id: 179 +date-executed: 2024-05-30 --- ## Overview diff --git a/CGPs/cgp-0139.md b/CGPs/cgp-0139.md index 0662b4d9..572dc39b 100644 --- a/CGPs/cgp-0139.md +++ b/CGPs/cgp-0139.md @@ -3,10 +3,10 @@ cgp: 139 title: Mento Spin-off and Launch of the MENTO token date-created: 2024-05-23 author: "Bogdan Dumitru , Roman Croessmann , Markus Franke , Oleksiy Novykov " -status: PROPOSED +status: EXECUTED discussions-to: https://forum.celo.org/t/mento-spin-off-and-launch-of-the-mento-token/7747 governance-proposal-id: 180 -date-executed: +date-executed: 2024-05-31 --- ## Summary From 19c45befd7687ac33625592d7e779bb3d13dedca Mon Sep 17 00:00:00 2001 From: J M Rossy Date: Mon, 24 Jun 2024 17:12:48 -0400 Subject: [PATCH 2/3] Test for duplicate proposal IDs --- CGPs/cgp-0001.md | 4 ++-- CGPs/cgp-0044.md | 4 ++-- scripts/validate.js | 9 +++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CGPs/cgp-0001.md b/CGPs/cgp-0001.md index 04450343..5865fae2 100644 --- a/CGPs/cgp-0001.md +++ b/CGPs/cgp-0001.md @@ -4,8 +4,8 @@ title: Enable validator elections, epoch rewards and carbon offsetting date-created: 2020-04-27 author: '@aslawson' status: EXECUTED -governance-proposal-id: 2 +governance-proposal-id: 1 date-executed: 2020-05-02 --- -NA -- Do not use this as an exxample GCP. This was generated retroactively before this process was defined and proposal details for this governance proposal can be found [here](https://gist.github.com/aslawson/a1f693f0e4c5fd391eac463237c4182a). +NA -- Do not use this as an example GCP. This was generated retroactively before this process was defined and proposal details for this governance proposal can be found [here](https://gist.github.com/aslawson/a1f693f0e4c5fd391eac463237c4182a). diff --git a/CGPs/cgp-0044.md b/CGPs/cgp-0044.md index 277a55ba..9492371b 100644 --- a/CGPs/cgp-0044.md +++ b/CGPs/cgp-0044.md @@ -3,9 +3,9 @@ cgp: 44 title: Increasing Mento Bucket Sizes for cUSD and cEUR date-created: 2021-10-28 author: '@martinvol, @rcroessmann' -status: EXECUTED +status: REJECTED discussions-to: https://forum.celo.org/t/economic-parameters-bucket-sizes-and-reserve-allocation-cgp-40-cgp-43/1997 -governance-proposal-id: 55 +governance-proposal-id: 45 date-executed: --- diff --git a/scripts/validate.js b/scripts/validate.js index d2b0af10..f71b411a 100644 --- a/scripts/validate.js +++ b/scripts/validate.js @@ -10,6 +10,8 @@ const CGP_FOLDER_REGEX = /^cgp-(\d+)$/; const CGP_FILENAME_REGEX = /^cgp-(\d+)\.md$/; const CGP_TEMPLATE_FILENAME = "cgp-template.md"; +const proposalIds = new Set(); + function validateCGPs() { console.log("Validating CGPs"); @@ -118,6 +120,13 @@ function validateFrontMatter(data, filename) { ) { throw new Error(`Proposal ID required for non-draft CGPs`); } + + if (proposalIds.has(proposalId)) { + throw new Error(`Proposal ID already in use in another CGP`); + } else if (proposalId){ + proposalIds.add(proposalId); + } + if (dateCreated) validateDate(dateCreated); if (dateExecuted) validateDate(dateExecuted); } catch (error) { From ba80328a5d044a0ba8b57abb2bd18e07ea6037e3 Mon Sep 17 00:00:00 2001 From: J M Rossy Date: Mon, 24 Jun 2024 17:22:42 -0400 Subject: [PATCH 3/3] Set cgp 101 to executed --- CGPs/cgp-0101.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CGPs/cgp-0101.md b/CGPs/cgp-0101.md index 406ebbc8..32454858 100644 --- a/CGPs/cgp-0101.md +++ b/CGPs/cgp-0101.md @@ -3,7 +3,7 @@ cgp: 101 title: 'Add New Governance Approvers Temperature Check' date-created: 2023-09-26 author: 'Tim Moreton (@timmoreton)' -status: DRAFT +status: EXECUTED discussions-to: 'https://forum.celo.org/t/we-need-to-talk-about-governance/6409/4?u=tim' governance-proposal-id: 140 date-executed: 2023-10-20