Skip to content

Commit

Permalink
Merge branch 'main' into martinvol/renameToCelo
Browse files Browse the repository at this point in the history
  • Loading branch information
martinvol authored Nov 19, 2024
2 parents 13b2743 + cb88946 commit 1006a8f
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CGPs/cgp-0150.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ cgp: 150
title: Adding oracles to support cCOP
date-created: 2024-10-17
author: "Bayo Sodimu ([email protected])"
status: PROPOSED
status: EXECUTED
discussions-to: https://forum.celo.org/t/launch-of-ccop-colombia-s-first-decentralized-stablecoin/9211
governance-proposal-id: 190
date-executed:
date-executed: 2024-10-30
---

## Overview
Expand Down
4 changes: 2 additions & 2 deletions CGPs/cgp-0151.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ cgp: 151
title: Launch of the cCOP Stablecoin
date-created: 2024-10-17
author: "Bayo Sodimu ([email protected]), @nvtaveras"
status: PROPOSED
status: EXECUTED
discussions-to: https://forum.celo.org/t/launch-of-ccop-colombia-s-first-decentralized-stablecoin/9211
governance-proposal-id: 191
date-executed:
date-executed: 2024-10-31
---

## Overview
Expand Down
6 changes: 3 additions & 3 deletions CGPs/cgp-0153.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ cgp: 0153
title: CeloColombia DAO - Funding and Operations Proposal
date-created: 2024-10-24
author: '@CeloColombiano & Team'
status: DRAFT
status: EXECUTED
discussions-to: https://forum.celo.org/t/celocolombia-dao-funding-and-operations-proposal
governance-proposal-id:
date-executed:
governance-proposal-id: 193
date-executed: 2024-11-13
---

## Overview
Expand Down
4 changes: 2 additions & 2 deletions CGPs/cgp-0154.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ cgp: 154
title: 'Funding for cLabs blockchain L2 project'
date-created: 2023-10-31
author: 'Marek Olszewski (@marekolszewski)'
status: PROPOSED
status: EXECUTED
discussions-to: 'https://forum.celo.org/t/follow-on-funding-proposal-funding-for-remaining-clabs-celo-l2-development/9354'
governance-proposal-id: 194
date-executed:
date-executed: 2024-11-17
---

## Overview
Expand Down
20 changes: 20 additions & 0 deletions CGPs/cgp-0155/alfajores.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[
{
"contract": "Registry",
"function": "setAddressFor",
"args": [
"CeloToken",
"0xF194afDf50B03e69Bd7D057c1Aa9e10c9954E4C9"
],
"value": "0"
},
{
"contract": "Registry",
"function": "setAddressFor",
"args": [
"LockedCelo",
"0x6a4CC5693DC5BFA3799C699F3B941bA2Cb00c341"
],
"value": "0"
}
]

0 comments on commit 1006a8f

Please sign in to comment.