Merge branch 'main' into pahor/updateDelegateeCount

celo-org · Apr 4, 2024 · 89ddec9 · 89ddec9
2 parents 028ce45 + 80bc453
commit 89ddec9
Show file tree

Hide file tree

Showing 31 changed files with 1,863 additions and 46 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js,json,yml}]
+charset = utf-8
+indent_style = space
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+/.yarn/**            linguist-vendored
+/.yarn/releases/*    binary
+/.yarn/plugins/**/*  binary
+/.pnp.*              binary linguist-generated
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,50 @@
+name: ci
+
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  install:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: |
+            **/node_modules
+            .yarn/cache
+          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('./yarn.lock') }}
+
+      - name: yarn-install
+        # Check out the lockfile from main, reinstall, and then
+        # verify the lockfile matches what was committed.
+        run: |
+            yarn install --immutable
+            CHANGES=$(git status -s)
+            if [[ ! -z $CHANGES ]]; then
+              echo "Changes found: $CHANGES"
+              git diff
+              exit 1
+            fi
+
+  validate:
+    runs-on: ubuntu-latest
+    needs: [install]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: |
+            **/node_modules
+            .yarn/cache
+          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('./yarn.lock') }}
+
+      - name: cgp-validation
+        run: yarn run validate 
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,10 @@
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+cache/
+.yarn/install-state.gz
 
+# misc
 .DS_Store
+*.pem
diff --git a/.yarn/releases/yarn-4.1.1.cjs b/.yarn/releases/yarn-4.1.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,5 @@
+compressionLevel: mixed
+enableGlobalCache: false
+enableScripts: false
+nodeLinker: node-modules
+yarnPath: .yarn/releases/yarn-4.1.1.cjs
diff --git a/CGPs/cgp-0039.md b/CGPs/cgp-0039.md
@@ -3,7 +3,7 @@ cgp: 39
 title: Increase Block Target Density
 date-created: 2021-09-06
 author: 'Mariano Cortesi (@mcortesi), Or Neeman (@oneeman)'
-discussionts-to: https://forum.celo.org/t/discussion-for-cgp-0039-incre/1333
+discussions-to: https://forum.celo.org/t/discussion-for-cgp-0039-incre/1333
 status: EXECUTED
 date-executed:
 governance-proposal-id: 39

diff --git a/CGPs/cgp-0045.md b/CGPs/cgp-0045.md
@@ -1,7 +1,7 @@
 ---
 cgp: 45
 title: cREAL Activation
-date-created: 13-10-2021
+date-created: 2021-10-13
 author: '@luisgj (Bitso), @martinvol (cLabs)'
 status: EXECUTED
 governance-proposal-id: 50
@@ -13,15 +13,15 @@ discussions-to: https://forum.celo.org/t/cbrl-stable-asset/1281
 
 CGP 45 - cREAL Activation
 
-This proposal is the third and final governance proposal needed launch cREAL. It was preceeded by [CGP-42](https://github.com/celo-org/governance/blob/main/CGPs/cgp-0042.md) and [CGP-46](https://github.com/celo-org/governance/blob/main/CGPs/cgp-0046.md).
+This proposal is the third and final governance proposal needed launch cREAL. It was preceded by [CGP-42](https://github.com/celo-org/governance/blob/main/CGPs/cgp-0042.md) and [CGP-46](https://github.com/celo-org/governance/blob/main/CGPs/cgp-0046.md).
 
 
 ### Status
 
 This proposal should not be executed until at least one oracle report for cREAL has been submitted on-chain. At this point, cREAL should already be deployed and initialized, but frozen and un-usable.
 
 
-Please note `cREAL` was formelly called `cBRL`.
+Please note `cREAL` was formerly called `cBRL`.
 
 ## Proposed Changes
 

diff --git a/CGPs/cgp-0057.md b/CGPs/cgp-0057.md
@@ -6,7 +6,7 @@ author: 'Martin Volpe (@martinvol, volpe@clabs.co)'
 status: EXECUTED
 discussions-to: https://forum.celo.org/t/decentralized-oracles/3610
 governance-proposal-id: 69
-date-executed: 2022-9-11
+date-executed: 2022-09-11
 ---
 ## Overview
 

diff --git a/CGPs/cgp-0060.md b/CGPs/cgp-0060.md
@@ -5,8 +5,8 @@ date-created: 2022-08-02
 author: 'Juan (@juancamp1987#4903)'
 status: DRAFT 
 discussions-to: https://forum.celo.org/t/proposal-to-introduce-colombian-peso-ccop-stable-coin/3200/15
-governance-proposal-id: TBD
-date-executed: TBD
+governance-proposal-id:
+date-executed:
 ---
 
 ## Overview

diff --git a/CGPs/cgp-0073.md b/CGPs/cgp-0073.md
@@ -1,7 +1,7 @@
 ---
 cgp: 73
 title: Establish and Fund Bug Bounty Program on Immunefi
-date-created: 2023-3-5
+date-created: 2023-03-05
 author: '@vissequ, @keccakdog'
 status: DRAFT
 discussions-to: https://forum.celo.org/t/proposal-establish-and-fund-a-bug-bounty-program-for-celo-on-immunefi/5060

diff --git a/CGPs/cgp-0087.md b/CGPs/cgp-0087.md
@@ -1,12 +1,11 @@
 ---
 cgp: 87
 title: Temperature Check - Celo transition to an Ethereum L2
-date created: 2023-07-21
+date-created: 2023-07-21
 author: productmatt
 discussions-to: https://forum.celo.org/t/clabs-proposal-for-celo-to-transition-to-an-ethereum-l2/6109
 status: EXECUTED
 governance-proposal-id: 116
-type: Temparature Check
 ---
 
 # Abstract

diff --git a/CGPs/cgp-0117.md b/CGPs/cgp-0117.md
@@ -3,10 +3,10 @@ cgp: 117
 title: Celo Core Contracts Release 11
 date-created: 2024-02-22
 author: "Martin Volpe (@martinvol), Pavel Hornak (@pahor167)"
-status: Proposed
+status: PROPOSED
 discussions-to: https://forum.celo.org/t/core-contracts-release-11/
 governance-proposal-id: 159
-date-executed: TBD
+date-executed:
 ---
 
 ## Overview

diff --git a/CGPs/cgp-0118.md b/CGPs/cgp-0118.md
@@ -3,11 +3,10 @@ cgp: 118
 title: Minting 10m cUSD from Mento Reserve in six tranches
 date-created: 2024-02-23
 author: 'LuukDAO (@LuukDAO)'
-status: PROPOSED
 discussions-to: https://forum.celo.org/t/minting-10m-cusd-from-mento-reserve-in-six-tranches/7458/1
-status: DRAFT 
-governance-proposal-id: TBA
-date-executed: TBA
+status: DRAFT
+governance-proposal-id:
+date-executed:
 ---
 
 ## Background

diff --git a/CGPs/cgp-0119.md b/CGPs/cgp-0119.md
@@ -6,7 +6,7 @@ author: 'Upright Ventures (@upright)'
 status: DRAFT 
 discussions-to: https://forum.celo.org/t/celo-camp-2024-grant-the-minipay-launchpad-and-startup-pathway-program-final/7210/1
 governance-proposal-id: 119
-date-executed: TBA
+date-executed:
 ---
 
 ## Overview

diff --git a/CGPs/cgp-0120.md b/CGPs/cgp-0120.md
@@ -1,11 +1,12 @@
 ---
-cgp: '120'
+cgp: 120
 title: 'Celo Europe H1 2024 | Regional DAO  | CeloPG: Regional DAO'
 date-created: '2024-02-16'
 author: 'Joan de Ramón (@joan_ethichub), Luuk Weber, Niko da Costa Gomez' 
 discussions-to: 'https://forum.celo.org/t/celo-europe-h1-2024-regional-dao-final/7450'
-governance-proposal-id: 'TBA'
-date-executed: 'TBA'
+status: DRAFT
+governance-proposal-id: 
+date-executed:
 ---
 
 ## Overview

diff --git a/CGPs/cgp-0121.md b/CGPs/cgp-0121.md
@@ -1,11 +1,12 @@
 ---
-cgp: '121'
+cgp: 121
 title: 'Prezenti H1 2024 | Celo Grants  | CPG Funding Request - Grants & RPFs'
 date-created: '2024-03-05'
 author: 'Wade @0xzoz , Maya @Maya-R-B , Aaron @aaronmboyd' 
 discussions-to: 'https://forum.celo.org/t/final-prezenti-h1-2024-celo-grants'
-governance-proposal-id: 'TBA'
-date-executed: 'TBA'
+status: DRAFT
+governance-proposal-id:
+date-executed:
 ---
 
 ## Summary

diff --git a/CGPs/cgp-0122.md b/CGPs/cgp-0122.md
@@ -5,8 +5,8 @@ date-created: 2024-03-06
 author: 'Roman Croessmann (@rcroessmann)'
 status: DRAFT
 discussions-to: 'https://forum.celo.org/t/adding-usdt-and-eurt-to-the-mento-reserve/7490'
-governance-proposal-id: 'TBA'
-date-executed: 'TBA'
+governance-proposal-id:
+date-executed:
 ---
 ## Overview
 

diff --git a/CGPs/cgp-0123.md b/CGPs/cgp-0123.md
@@ -1,12 +1,12 @@
 ---
 cgp: 123
 title: MU05 - Add native USDC pools to Mento v2
-date-created: 2024-03-007
+date-created: 2024-03-07
 author: "Nelson Taveras <nelson.taveras@mentolabs.xyz>, Philip Rätsch <philip.raetsch@mentolabs.xyz>"
 status: DRAFT
 discussions-to: https://forum.celo.org/t/proposal-mento-upgrade-mu05-native-usdc-integration/7545
-governance-proposal-id: "TBA"
-date-executed: "TBA"
+governance-proposal-id: 163
+date-executed:
 ---
 
 ## Overview