From 8b792efccdc8df83eb678da6d3195db27b6e95e3 Mon Sep 17 00:00:00 2001 From: Rapha RSierra Date: Wed, 19 Apr 2023 12:07:18 -0400 Subject: [PATCH 01/14] Create first-draft 1. Set minting contract for Mia and nyc to a version using pox 2 2. add treasury that uses the minting contract from 1 3. Transfer stx to treasury of 2. 4. Set pool address 5. Delegate stx to pool 6. Pay stackers that were not paid in cycle 56 due to bug Please see more details here: https://github.com/citycoins/governance/issues/13 and kindly suggest edits to this first draft. --- ccips/ccip-014/first-draft | 1 + 1 file changed, 1 insertion(+) create mode 100644 ccips/ccip-014/first-draft diff --git a/ccips/ccip-014/first-draft b/ccips/ccip-014/first-draft new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/ccips/ccip-014/first-draft @@ -0,0 +1 @@ + From b964f8f7aa574bea7636df5c43603078f36d2174 Mon Sep 17 00:00:00 2001 From: Rapha Date: Thu, 27 Apr 2023 10:26:42 -0400 Subject: [PATCH 02/14] Rename first-draft to ccips-014-upgrade-to-pox3.md renaming file --- ccips/ccip-014/{first-draft => ccips-014-upgrade-to-pox3.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ccips/ccip-014/{first-draft => ccips-014-upgrade-to-pox3.md} (100%) diff --git a/ccips/ccip-014/first-draft b/ccips/ccip-014/ccips-014-upgrade-to-pox3.md similarity index 100% rename from ccips/ccip-014/first-draft rename to ccips/ccip-014/ccips-014-upgrade-to-pox3.md From 3f1759b0c7e162614d5a5b776303399b6ee3770b Mon Sep 17 00:00:00 2001 From: Rapha Date: Thu, 27 Apr 2023 10:58:07 -0400 Subject: [PATCH 03/14] Update ccips-014-upgrade-to-pox3.md --- ccips/ccip-014/ccips-014-upgrade-to-pox3.md | 36 +++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/ccips/ccip-014/ccips-014-upgrade-to-pox3.md b/ccips/ccip-014/ccips-014-upgrade-to-pox3.md index 8b13789..91c82f3 100644 --- a/ccips/ccip-014/ccips-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccips-014-upgrade-to-pox3.md @@ -1 +1,37 @@ +# CCIP-014 +## Preamble + +| CCIP Number | 014 | +| ------------- | ------------------------------------- | +| Title | Upgrade to pox3 | +| Author(s) | Raphael R. Sierra rapha@fontainebleau-management.com | +| Consideration | Governance, Economic | +| Type | Standard | +| Status | Draft | +| Created | 2023-04-26 | +| License | BSD-2-Clause | + +## Introduction + +This CCIP will migrate to pox-3. + +## Specification + +todo + +## Backwards Compatibility + +todo + +## Activation + +This CCIP will use CCIP-015 with the following criteria: + +## Reference Implementations + +- todo + +## Footnotes + +- todo From 9a66e2447d244ece76cff0ab09f3c99a49fa7404 Mon Sep 17 00:00:00 2001 From: Rapha Date: Thu, 27 Apr 2023 11:38:33 -0400 Subject: [PATCH 04/14] Update and rename ccips-014-upgrade-to-pox3.md to ccip-014-upgrade-to-pox3.md --- ...cips-014-upgrade-to-pox3.md => ccip-014-upgrade-to-pox3.md} | 3 +++ 1 file changed, 3 insertions(+) rename ccips/ccip-014/{ccips-014-upgrade-to-pox3.md => ccip-014-upgrade-to-pox3.md} (90%) diff --git a/ccips/ccip-014/ccips-014-upgrade-to-pox3.md b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md similarity index 90% rename from ccips/ccip-014/ccips-014-upgrade-to-pox3.md rename to ccips/ccip-014/ccip-014-upgrade-to-pox3.md index 91c82f3..78d2d17 100644 --- a/ccips/ccip-014/ccips-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md @@ -35,3 +35,6 @@ This CCIP will use CCIP-015 with the following criteria: ## Footnotes - todo +[Upgrade.to.pox.3.txt](https://github.com/Rapha-btc/governance/files/11345624/Upgrade.to.pox.3.txt) + + From 63d02556f391199119c2524ce55796d9d457e24f Mon Sep 17 00:00:00 2001 From: Rapha Date: Thu, 27 Apr 2023 11:44:34 -0400 Subject: [PATCH 05/14] Update ccip-014-upgrade-to-pox3.md --- ccips/ccip-014/ccip-014-upgrade-to-pox3.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md index 78d2d17..c0f1e55 100644 --- a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md @@ -12,6 +12,8 @@ | Created | 2023-04-26 | | License | BSD-2-Clause | +On behalf of the community, see discussion details in issue https://github.com/citycoins/governance/issues/13 and in Discord channels + ## Introduction This CCIP will migrate to pox-3. @@ -35,6 +37,5 @@ This CCIP will use CCIP-015 with the following criteria: ## Footnotes - todo -[Upgrade.to.pox.3.txt](https://github.com/Rapha-btc/governance/files/11345624/Upgrade.to.pox.3.txt) From 9e7b383544ef9689ded2bfc3f7eeb90edbb8ca8e Mon Sep 17 00:00:00 2001 From: Rapha Date: Thu, 27 Apr 2023 11:47:53 -0400 Subject: [PATCH 06/14] Update ccip-014-upgrade-to-pox3.md --- ccips/ccip-014/ccip-014-upgrade-to-pox3.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md index c0f1e55..81df2b7 100644 --- a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md @@ -12,7 +12,13 @@ | Created | 2023-04-26 | | License | BSD-2-Clause | -On behalf of the community, see discussion details in issue https://github.com/citycoins/governance/issues/13 and in Discord channels +On behalf of the community, see discussion details in issue https://github.com/citycoins/governance/issues/13 and in Discord channels. + +I am passing on an issue that has been raised in the community discussion. The community has voiced their interest in upgrading Citycoins to pox-3. Based on suggestions from various community members, a CCIP could be initiated to cover the following points: + +- Migrate to .pox-3 for delegated stacking +- Implement the CCIP-011 style voting mechanism through a DAO proposal +- Provide retroactive payment of STX rewards for the stacking contract bug. ## Introduction From 19e4efc76db75ed8c63a743dfac3a51f4233f6a0 Mon Sep 17 00:00:00 2001 From: Rapha Date: Thu, 27 Apr 2023 11:55:48 -0400 Subject: [PATCH 07/14] Update ccip-014-upgrade-to-pox3.md --- ccips/ccip-014/ccip-014-upgrade-to-pox3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md index 81df2b7..5eb2266 100644 --- a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md @@ -9,7 +9,7 @@ | Consideration | Governance, Economic | | Type | Standard | | Status | Draft | -| Created | 2023-04-26 | +| Created | 2023-04-19 | | License | BSD-2-Clause | On behalf of the community, see discussion details in issue https://github.com/citycoins/governance/issues/13 and in Discord channels. From 52d4b69b9d5e28d8740459fb1ccbe5ce8cc8dea7 Mon Sep 17 00:00:00 2001 From: Jason Schrader Date: Wed, 24 May 2023 13:51:05 -0700 Subject: [PATCH 08/14] fix: cherry-pick changes from origin --- ccips/ccip-014/ccip-014-upgrade-to-pox3.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md index 5eb2266..b26cdb9 100644 --- a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md @@ -3,7 +3,7 @@ ## Preamble | CCIP Number | 014 | -| ------------- | ------------------------------------- | +| ------------- | ---------------------------------------------------- | | Title | Upgrade to pox3 | | Author(s) | Raphael R. Sierra rapha@fontainebleau-management.com | | Consideration | Governance, Economic | @@ -18,11 +18,16 @@ I am passing on an issue that has been raised in the community discussion. The c - Migrate to .pox-3 for delegated stacking - Implement the CCIP-011 style voting mechanism through a DAO proposal -- Provide retroactive payment of STX rewards for the stacking contract bug. +- Provide retroactive payment of STX rewards for the stacking contract bug. ## Introduction -This CCIP will migrate to pox-3. +On behalf of the community, based on discussion details [in this GitHub issue](https://github.com/citycoins/governance/issues/13) and in CityCoins Discord channels. + +The community has voiced their interest in upgrading CityCoins to use pox-3 with the Stacks 2.4 launch. Based on suggestions from various community members, this CCIP intends to change the following: + +- update .pox to .pox-3 for delegated stacking in city treasuries +- implement the CCIP-011 style voting mechanism as part of a DAO proposal ## Specification @@ -43,5 +48,3 @@ This CCIP will use CCIP-015 with the following criteria: ## Footnotes - todo - - From 4b96546a5b078e014d9c09e84c9325c0f517c2b8 Mon Sep 17 00:00:00 2001 From: Jason Schrader Date: Wed, 24 May 2023 14:48:58 -0700 Subject: [PATCH 09/14] fix: fill in spec based on current code --- ccips/ccip-014/ccip-014-upgrade-to-pox3.md | 78 +++++++++++++++++++--- 1 file changed, 69 insertions(+), 9 deletions(-) diff --git a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md index b26cdb9..13da359 100644 --- a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md @@ -22,29 +22,89 @@ I am passing on an issue that has been raised in the community discussion. The c ## Introduction -On behalf of the community, based on discussion details [in this GitHub issue](https://github.com/citycoins/governance/issues/13) and in CityCoins Discord channels. +On behalf of the community, based on discussion details in this GitHub issue[^1] and in CityCoins Discord channels, the community has voiced their interest in upgrading CityCoins to use pox-3 with the Stacks 2.4 release[^2]. -The community has voiced their interest in upgrading CityCoins to use pox-3 with the Stacks 2.4 launch. Based on suggestions from various community members, this CCIP intends to change the following: +Based on suggestions from various community members, this CCIP intends to: -- update .pox to .pox-3 for delegated stacking in city treasuries -- implement the CCIP-011 style voting mechanism as part of a DAO proposal +- implement the CCIP-015[^3] voting mechanism as part of a DAO proposal +- update .pox to .pox-3 for delegated stacking in city treasury contracts ## Specification -todo +### Treasury + +The current treasury contracts used with mining directly call the `.pox` contract, which was disabled in Stacks 2.1 and will be replaced with `.pox-3` in the upcoming Stacks 2.4 release[^2]. + +CCIP-014 will implement a new version of the treasury contract `ccd002-treasury-v2` that replaces `.pox` with `.pox-3`, as well as move the balances and perform the delegated stacking. + +> Note: this only affects the mining treasuries for each city, the addresses for the stacking treasuries will remain the same + +| City | Current | New | +| ---- | ------------------------ | ------------------------- | +| MIA | ccd002-treasury-mining | ccd002-treasury-mining-v2 | +| MIA | ccd002-treasury-stacking | _(no change)_ | +| NYC | ccd002-treasury-mining | ccd002-treasury-mining-v2 | +| NYC | ccd002-treasury-stacking | _(no change)_ | + +### Mining + +The current mining contract directly references the mining treasury and cannot be updated. + +CCIP-014 will implement a new version of the mining contract `ccd006-citycoin-mining-v2` that replaces the name with the new treasury described above. + +At the block height the proposal executes, miners will need to switch to mining in the `ccd006-citycoin-mining-v2` contract. + +Claims to the original and updated mining contract will function the same before and after. + +### Proposal Voting + +Proposal voting will be performed using the method described in CCIP-015[^3]. + +Voting will begin when the contract is deployed and continue for a set number of blocks. + +> Note: The end of the voting period needs to allow enough time to execute the proposal and stack the city treasuries. This will require close monitoring of the Stacks 2.4 launch plan. + +Votes will be counted two ways in the contract: a general total of yes/no votes, and the total number of votes based on the amount of CityCoins stacked in cycles 54 and 55. + +The voting code is part of the CCIP-014 smart contract proposal[^4], which tracks user votes between the voting period. + +It also restricts the `execute` function in the proposal so that it cannot run unless: + +- the vote is concluded +- the total votes are > 0 +- the yes votes > no votes + +The criteria above are in consideration of the short window to stack the treasuries for Cycle 60, and can be adjusted in future proposals. ## Backwards Compatibility -todo +This CCIP is supplemental to CCIP-012[^5] and CCIP-013[^6]. ## Activation -This CCIP will use CCIP-015 with the following criteria: +This CCIP will be voted on using a vote contract that adheres to CCIP-015[^3] using the last two active cycles from when the contract is deployed. + +Currently, this would be: + +- MIA cycles 54 and 55 +- NYC cycles 54 and 55 + +The scale factor for MIA was determined using the same formula used in CCIP-015[^3] and calculated based on the total supply at the start block of the first cycle and the end block of the last cycle. + +- MIA scale factor: 0.8760 _(prev: 0.8715)_ + +The calculations used for the scale factor are available in the supplemental spreadsheet[^7]. ## Reference Implementations -- todo +- TODO ## Footnotes -- todo +[^1]: https://github.com/citycoins/governance/issues/13 +[^2]: https://forum.stacks.org/t/stacks-2-4-is-here-stacking-to-be-re-enabled/15024 +[^3]: https://github.com/citycoins/governance/blob/feat/add-ccip-015/ccips/ccip-015/ccip-015-community-proposal-voting-process.md +[^4]: https://github.com/citycoins/protocol/blob/fix/support-pox-2/contracts/proposals/ccip014-pox-3.clar +[^5]: https://github.com/citycoins/governance/blob/main/ccips/ccip-012/ccip-012-stabilize-emissions-and-treasuries.md +[^6]: https://github.com/citycoins/governance/blob/main/ccips/ccip-013/ccip-013-stabilize-protocol-and-simplify-contracts.md +[^7]: TODO: update after upload From bf956b13e386ff12dcab0185a279a34ab1656d7f Mon Sep 17 00:00:00 2001 From: Jason Schrader Date: Wed, 24 May 2023 14:49:09 -0700 Subject: [PATCH 10/14] fix: add spreadsheet with voting calculations --- .../ccip-014-vote-calculations-per-ccip-015.ods | Bin 0 -> 21809 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ccips/ccip-014/ccip-014-vote-calculations-per-ccip-015.ods diff --git a/ccips/ccip-014/ccip-014-vote-calculations-per-ccip-015.ods b/ccips/ccip-014/ccip-014-vote-calculations-per-ccip-015.ods new file mode 100644 index 0000000000000000000000000000000000000000..a76c04311f691d2463731cc029d99183a386f097 GIT binary patch literal 21809 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 M#!otxhR1vV0_No)-~a#s literal 0 HcmV?d00001 From a742b2a9e87bc41e19662021d984283253d14d59 Mon Sep 17 00:00:00 2001 From: Jason Schrader Date: Wed, 24 May 2023 15:16:22 -0700 Subject: [PATCH 11/14] fix: update authors --- ccips/ccip-014/ccip-014-upgrade-to-pox3.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md index 13da359..9a87001 100644 --- a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md @@ -6,6 +6,8 @@ | ------------- | ---------------------------------------------------- | | Title | Upgrade to pox3 | | Author(s) | Raphael R. Sierra rapha@fontainebleau-management.com | +| | Jason Schrader jason@joinfreehold.com | +| | Tim Butterfield (TODO: email) | | Consideration | Governance, Economic | | Type | Standard | | Status | Draft | From b19e9a766cf572933d5414c1cabc879e1b18c013 Mon Sep 17 00:00:00 2001 From: Jason Schrader Date: Wed, 24 May 2023 15:17:31 -0700 Subject: [PATCH 12/14] fix: remove redundant intro text --- ccips/ccip-014/ccip-014-upgrade-to-pox3.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md index 9a87001..6f34b85 100644 --- a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md @@ -14,14 +14,6 @@ | Created | 2023-04-19 | | License | BSD-2-Clause | -On behalf of the community, see discussion details in issue https://github.com/citycoins/governance/issues/13 and in Discord channels. - -I am passing on an issue that has been raised in the community discussion. The community has voiced their interest in upgrading Citycoins to pox-3. Based on suggestions from various community members, a CCIP could be initiated to cover the following points: - -- Migrate to .pox-3 for delegated stacking -- Implement the CCIP-011 style voting mechanism through a DAO proposal -- Provide retroactive payment of STX rewards for the stacking contract bug. - ## Introduction On behalf of the community, based on discussion details in this GitHub issue[^1] and in CityCoins Discord channels, the community has voiced their interest in upgrading CityCoins to use pox-3 with the Stacks 2.4 release[^2]. From 0448a33745e8f157214e3da87c512a2cd382dcd2 Mon Sep 17 00:00:00 2001 From: Jason Schrader Date: Wed, 24 May 2023 15:46:26 -0700 Subject: [PATCH 13/14] fix: add author email --- ccips/ccip-014/ccip-014-upgrade-to-pox3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md index 6f34b85..0a2bea2 100644 --- a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md @@ -7,7 +7,7 @@ | Title | Upgrade to pox3 | | Author(s) | Raphael R. Sierra rapha@fontainebleau-management.com | | | Jason Schrader jason@joinfreehold.com | -| | Tim Butterfield (TODO: email) | +| | Tim Butterfield tim@timbutterfield.com | | Consideration | Governance, Economic | | Type | Standard | | Status | Draft | From 37990f98c42e13371276ceb758420f843cfaa13c Mon Sep 17 00:00:00 2001 From: Jason Schrader Date: Thu, 31 Aug 2023 14:34:22 -0700 Subject: [PATCH 14/14] fix: update ccip status and fill in remaining fields --- ccips/ccip-014/ccip-014-upgrade-to-pox3.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md index 0a2bea2..05f4c7e 100644 --- a/ccips/ccip-014/ccip-014-upgrade-to-pox3.md +++ b/ccips/ccip-014/ccip-014-upgrade-to-pox3.md @@ -4,15 +4,16 @@ | CCIP Number | 014 | | ------------- | ---------------------------------------------------- | -| Title | Upgrade to pox3 | +| Title | Upgrade to pox-3 | | Author(s) | Raphael R. Sierra rapha@fontainebleau-management.com | | | Jason Schrader jason@joinfreehold.com | | | Tim Butterfield tim@timbutterfield.com | | Consideration | Governance, Economic | | Type | Standard | -| Status | Draft | +| Status | Ratified | | Created | 2023-04-19 | | License | BSD-2-Clause | +| Supplements | CCIP-012, CCIP-013 | ## Introduction @@ -91,7 +92,11 @@ The calculations used for the scale factor are available in the supplemental spr ## Reference Implementations -- TODO +- [ccip-014-pox-3](https://explorer.hiro.so/txid/SP8A9HZ3PKST0S42VM9523Z9NV42SZ026V4K39WH.ccip014-pox-3?chain=mainnet) +- [ccip-014-pox-3-v2](https://explorer.hiro.so/txid/SP8A9HZ3PKST0S42VM9523Z9NV42SZ026V4K39WH.ccip014-pox-3-v2?chain=mainnet) +- [ccd002-treasury-mining-mia-v2](https://explorer.hiro.so/txid/SP8A9HZ3PKST0S42VM9523Z9NV42SZ026V4K39WH.ccd002-treasury-mia-mining-v2?chain=mainnet) +- [ccd002-treasury-mining-nyc-v2](https://explorer.hiro.so/txid/SP8A9HZ3PKST0S42VM9523Z9NV42SZ026V4K39WH.ccd002-treasury-nyc-mining-v2?chain=mainnet) +- [ccd006-citycoin-mining-v2](https://explorer.hiro.so/txid/SP8A9HZ3PKST0S42VM9523Z9NV42SZ026V4K39WH.ccd006-citycoin-mining-v2?chain=mainnet) ## Footnotes @@ -101,4 +106,4 @@ The calculations used for the scale factor are available in the supplemental spr [^4]: https://github.com/citycoins/protocol/blob/fix/support-pox-2/contracts/proposals/ccip014-pox-3.clar [^5]: https://github.com/citycoins/governance/blob/main/ccips/ccip-012/ccip-012-stabilize-emissions-and-treasuries.md [^6]: https://github.com/citycoins/governance/blob/main/ccips/ccip-013/ccip-013-stabilize-protocol-and-simplify-contracts.md -[^7]: TODO: update after upload +[^7]: See the [ccip-014-vote-calculations-per-ccip-015 spreadsheet](./ccip-014-vote-calculations-per-ccip-015.ods)