fix: update proposals with mainnet values

citycoins · Mar 29, 2023 · 270e9b8 · 270e9b8
1 parent 1b0cf72
commit 270e9b8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 84 deletions.
diff --git a/contracts/proposals/ccip012-bootstrap.clar b/contracts/proposals/ccip012-bootstrap.clar
@@ -22,37 +22,18 @@
     ))
 
     ;; set 3-of-5 signers
-    ;; MAINNET: 'SP372JVX6EWE2M0XPA84MWZYRRG2M6CAC4VVC12V1
-    ;; MAINNET: 'SP2R0DQYR7XHD161SH2GK49QRP1YSV7HE9JSG7W6G
-    ;; MAINNET: 'SPN4Y5QPGQA8882ZXW90ADC2DHYXMSTN8VAR8C3X
-    ;; MAINNET: 'SP3YYGCGX1B62CYAH4QX7PQE63YXG7RDTXD8BQHJQ
-    ;; MAINNET: 'SP7DGES13508FHRWS1FB0J3SZA326FP6QRMB6JDE
-    ;; TESTNET: 'ST3AY0CM7SD9183QZ4Y7S2RGBZX9GQT54MJ6XY0BN
-    ;; TESTNET: 'ST2D06VFWWTNCWHVB2FJ9KJ3EB30HFRTHB1A4BSP3
-    ;; TESTNET: 'ST113N3MMPZRMJJRZH6JTHA5CB7TBZH1EH4C22GFV
-    ;; TESTNET: 'ST8YRW1THF2XT8E45XXCGYKZH2B70HYH71VC7737
-    ;; TESTNET: 'STX13Q7ZJDSFVDZMQ1PWDFGT4QSBMASRMCYE4NAP
-    ;; LOCAL: 'ST1SJ3DTE5DN7X54YDH5D64R3BCB6A2AG2ZQ8YPD5
-    ;; LOCAL: 'ST2CY5V39NHDPWSXMW9QDT3HC3GD6Q6XX4CFRK9AG
-    ;; LOCAL: 'ST2JHG361ZXG51QTKY2NQCVBPPRRE2KZB1HR05NNC
-    ;; LOCAL: 'ST2NEB84ASENDXKYGJPQW86YXQCEFEX2ZQPG87ND
-    ;; LOCAL: 'ST2REHHS5J3CERCRBEPMGH7921Q6PYKAADT7JP2VB
-    (try! (contract-call? .ccd001-direct-execute set-approver 'ST3AY0CM7SD9183QZ4Y7S2RGBZX9GQT54MJ6XY0BN true))
-    (try! (contract-call? .ccd001-direct-execute set-approver 'ST2D06VFWWTNCWHVB2FJ9KJ3EB30HFRTHB1A4BSP3 true))
-    (try! (contract-call? .ccd001-direct-execute set-approver 'ST113N3MMPZRMJJRZH6JTHA5CB7TBZH1EH4C22GFV true))
-    (try! (contract-call? .ccd001-direct-execute set-approver 'ST8YRW1THF2XT8E45XXCGYKZH2B70HYH71VC7737 true))
-    (try! (contract-call? .ccd001-direct-execute set-approver 'STX13Q7ZJDSFVDZMQ1PWDFGT4QSBMASRMCYE4NAP true))
+    (try! (contract-call? .ccd001-direct-execute set-approver 'SP372JVX6EWE2M0XPA84MWZYRRG2M6CAC4VVC12V1 true))
+    (try! (contract-call? .ccd001-direct-execute set-approver 'SP2R0DQYR7XHD161SH2GK49QRP1YSV7HE9JSG7W6G true))
+    (try! (contract-call? .ccd001-direct-execute set-approver 'SPN4Y5QPGQA8882ZXW90ADC2DHYXMSTN8VAR8C3X true))
+    (try! (contract-call? .ccd001-direct-execute set-approver 'SP3YYGCGX1B62CYAH4QX7PQE63YXG7RDTXD8BQHJQ true))
+    (try! (contract-call? .ccd001-direct-execute set-approver 'SP7DGES13508FHRWS1FB0J3SZA326FP6QRMB6JDE true))
 
-    ;; set signals required to pass proposals
+    ;; set to 3-of-5 signals required
     (try! (contract-call? .ccd001-direct-execute set-signals-required u3))
 
     ;; delegate stack the STX in the mining treasuries (up to 50M STX each)
-    ;; MAINNET: 'SP700C57YJFD5RGHK0GN46478WBAM2KG3A4MN2QJ
-    ;; MAINNET: 'SP700C57YJFD5RGHK0GN46478WBAM2KG3A4MN2QJ
-    ;; TESTNET: 'ST1XQXW9JNQ1W4A7PYTN3HCHPEY7SHM6KPA085ES6
-    ;; LOCAL: 'ST1XQXW9JNQ1W4A7PYTN3HCHPEY7SHM6KPA085ES6
-    (try! (contract-call? .ccd002-treasury-mia-mining delegate-stx u50000000000000 'ST1XQXW9JNQ1W4A7PYTN3HCHPEY7SHM6KPA085ES6))
-    (try! (contract-call? .ccd002-treasury-nyc-mining delegate-stx u50000000000000 'ST1XQXW9JNQ1W4A7PYTN3HCHPEY7SHM6KPA085ES6))
+    (try! (contract-call? .ccd002-treasury-mia-mining delegate-stx u50000000000000 'SP700C57YJFD5RGHK0GN46478WBAM2KG3A4MN2QJ))
+    (try! (contract-call? .ccd002-treasury-nyc-mining delegate-stx u50000000000000 'SP700C57YJFD5RGHK0GN46478WBAM2KG3A4MN2QJ))
 
     (print "CityCoins DAO has risen! Our mission is to empower people to take ownership in their city by transforming citizens into stakeholders with the ability to fund, build, and vote on meaningful upgrades to their communities.")
 

diff --git a/contracts/proposals/ccip013-activation.clar b/contracts/proposals/ccip013-activation.clar
@@ -10,24 +10,16 @@
       (jobIds (unwrap! (contract-call? .ccip013-migration get-job-ids) ERR_PANIC))
     )
     ;; shut down old protocol contracts
-    ;; MAINNET: 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-core-v2
-    ;; TESTNET: 'ST1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8WRH7C6H.miamicoin-core-v2
-    (try! (contract-call? .ccd009-auth-v2-adapter execute-upgrade-core-contract-job-mia (get miaJobId jobIds) .miamicoin-core-v2 .ccd010-core-v2-adapter))
-    ;; MAINNET: 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-core-v2
-    ;; TESTNET: 'STSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1D64KKHQ.newyorkcitycoin-core-v2
-    (try! (contract-call? .ccd009-auth-v2-adapter execute-upgrade-core-contract-job-nyc (get nycJobId jobIds) .newyorkcitycoin-core-v2 .ccd010-core-v2-adapter))
+    (try! (contract-call? .ccd009-auth-v2-adapter execute-upgrade-core-contract-job-mia (get miaJobId jobIds) 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-core-v2 .ccd010-core-v2-adapter))
+    (try! (contract-call? .ccd009-auth-v2-adapter execute-upgrade-core-contract-job-nyc (get nycJobId jobIds) 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-core-v2 .ccd010-core-v2-adapter))
     ;; activate cities in new protocol
     (try! (contract-call? .ccd005-city-data set-activation-status miaId true))
     (try! (contract-call? .ccd005-city-data set-activation-status nycId true))
     ;; sets allowed assets for treasury contracts
-    ;; MAINNET: 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-token-v2
-    ;; TESTNET: 'ST1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8WRH7C6H.miamicoin-token-v2
-    (try! (contract-call? .ccd002-treasury-mia-mining set-allowed .miamicoin-token-v2 true))
-    (try! (contract-call? .ccd002-treasury-mia-stacking set-allowed .miamicoin-token-v2 true))
-    ;; MAINNET: 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-token-v2
-    ;; TESTNET: 'STSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1D64KKHQ.newyorkcitycoin-token-v2
-    (try! (contract-call? .ccd002-treasury-nyc-mining set-allowed .newyorkcitycoin-token-v2 true))
-    (try! (contract-call? .ccd002-treasury-nyc-stacking set-allowed .newyorkcitycoin-token-v2 true))
+    (try! (contract-call? .ccd002-treasury-mia-mining set-allowed 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-token-v2 true))
+    (try! (contract-call? .ccd002-treasury-mia-stacking set-allowed 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-token-v2 true))
+    (try! (contract-call? .ccd002-treasury-nyc-mining set-allowed 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-token-v2 true))
+    (try! (contract-call? .ccd002-treasury-nyc-stacking set-allowed 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-token-v2 true))
 
     (print "Continuous effort, not strength or intelligence is the key to unlocking our potential. - Winston Churchill")
 

diff --git a/contracts/proposals/ccip013-migration.clar b/contracts/proposals/ccip013-migration.clar
@@ -12,40 +12,20 @@
       (miaId (try! (contract-call? .ccd004-city-registry get-or-create-city-id "mia")))
       (nycId (try! (contract-call? .ccd004-city-registry get-or-create-city-id "nyc")))
       ;; get activation block
-      ;; MAINNET: 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-core-v2
-      ;; TESTNET: 'ST1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8WRH7C6H.miamicoin-core-v2
-      (miaActivationBlock (try! (contract-call? .miamicoin-core-v2 get-activation-block)))
-      ;; MAINNET: 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-core-v2
-      ;; TESTNET: 'STSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1D64KKHQ.newyorkcitycoin-core-v2
-      (nycActivationBlock (try! (contract-call? .newyorkcitycoin-core-v2 get-activation-block)))
+      (miaActivationBlock (try! (contract-call? 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-core-v2 get-activation-block)))
+      (nycActivationBlock (try! (contract-call? 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-core-v2 get-activation-block)))
       ;; get activation delay
-      ;; MAINNET: 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-core-v2
-      ;; TESTNET: 'ST1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8WRH7C6H.miamicoin-core-v2
-      (miaActivationDelay (contract-call? .miamicoin-core-v2 get-activation-delay))
-      ;; MAINNET: 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-core-v2
-      ;; TESTNET: 'STSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1D64KKHQ.newyorkcitycoin-core-v2
-      (nycActivationDelay (contract-call? .newyorkcitycoin-core-v2 get-activation-delay))
+      (miaActivationDelay (contract-call? 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-core-v2 get-activation-delay))
+      (nycActivationDelay (contract-call? 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-core-v2 get-activation-delay))
       ;; get activation threshold
-      ;; MAINNET: 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-core-v2
-      ;; TESTNET: 'ST1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8WRH7C6H.miamicoin-core-v2
-      (miaActivationThreshold (contract-call? .miamicoin-core-v2 get-activation-threshold))
-      ;; MAINNET: 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-core-v2
-      ;; TESTNET: 'STSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1D64KKHQ.newyorkcitycoin-core-v2
-      (nycActivationThreshold (contract-call? .newyorkcitycoin-core-v2 get-activation-threshold))
+      (miaActivationThreshold (contract-call? 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-core-v2 get-activation-threshold))
+      (nycActivationThreshold (contract-call? 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-core-v2 get-activation-threshold))
       ;; get coinbase thresholds
-      ;; MAINNET: 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-token-v2
-      ;; TESTNET: 'ST1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8WRH7C6H.miamicoin-token-v2
-      (miaThresholds (try! (contract-call? .miamicoin-token-v2 get-coinbase-thresholds)))
-      ;; MAINNET: 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-token-v2
-      ;; TESTNET: 'STSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1D64KKHQ.newyorkcitycoin-token-v2
-      (nycThresholds (try! (contract-call? .newyorkcitycoin-token-v2 get-coinbase-thresholds)))
+      (miaThresholds (try! (contract-call? 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-token-v2 get-coinbase-thresholds)))
+      (nycThresholds (try! (contract-call? 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-token-v2 get-coinbase-thresholds)))
       ;; get coinbase amounts
-      ;; MAINNET: 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-token-v2
-      ;; TESTNET: 'ST1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8WRH7C6H.miamicoin-token-v2
-      (miaAmounts (unwrap! (contract-call? .miamicoin-token-v2 get-coinbase-amounts) ERR_PANIC))
-      ;; MAINNET: 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-token-v2
-      ;; TESTNET: 'STSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1D64KKHQ.newyorkcitycoin-token-v2
-      (nycAmounts (unwrap! (contract-call? .newyorkcitycoin-token-v2 get-coinbase-amounts) ERR_PANIC))
+      (miaAmounts (unwrap! (contract-call? 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-token-v2 get-coinbase-amounts) ERR_PANIC))
+      (nycAmounts (unwrap! (contract-call? 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-token-v2 get-coinbase-amounts) ERR_PANIC))
     )
     ;; set city activation details
     (try! (contract-call? .ccd005-city-data set-activation-details miaId
@@ -105,20 +85,11 @@
     (try! (contract-call? .ccd005-city-data set-coinbase-details nycId u10000 u25000))
 
     ;; setup core contract upgrade using ccd009 adapter
-
-    ;; MAINNET: 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-auth-v2
-    ;; TESTNET: 'ST1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8WRH7C6H.miamicoin-auth-v2
-    (var-set miaJobId (try! (contract-call? .ccd009-auth-v2-adapter create-job-mia "upgrade to DAO protocol" .miamicoin-auth-v2)))
-    ;; MAINNET: 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-auth-v2
-    ;; TESTNET: 'STSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1D64KKHQ.newyorkcitycoin-auth-v2
-    (var-set nycJobId (try! (contract-call? .ccd009-auth-v2-adapter create-job-nyc "upgrade to DAO protocol" .newyorkcitycoin-auth-v2)))
-    ;; MAINNET: 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-core-v2
-    ;; TESTNET: 'ST1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8WRH7C6H.miamicoin-core-v2
-    (try! (contract-call? .ccd009-auth-v2-adapter add-principal-argument-mia (var-get miaJobId) "oldContract" .miamicoin-core-v2))
+    (var-set miaJobId (try! (contract-call? .ccd009-auth-v2-adapter create-job-mia "upgrade to DAO protocol" 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-auth-v2)))
+    (var-set nycJobId (try! (contract-call? .ccd009-auth-v2-adapter create-job-nyc "upgrade to DAO protocol" 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-auth-v2)))
+    (try! (contract-call? .ccd009-auth-v2-adapter add-principal-argument-mia (var-get miaJobId) "oldContract" 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-core-v2))
     (try! (contract-call? .ccd009-auth-v2-adapter add-principal-argument-mia (var-get miaJobId) "newContract" .ccd010-core-v2-adapter))
-    ;; MAINNET: 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-core-v2
-    ;; TESTNET: 'STSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1D64KKHQ.newyorkcitycoin-core-v2
-    (try! (contract-call? .ccd009-auth-v2-adapter add-principal-argument-nyc (var-get nycJobId) "oldContract" .newyorkcitycoin-core-v2))
+    (try! (contract-call? .ccd009-auth-v2-adapter add-principal-argument-nyc (var-get nycJobId) "oldContract" 'SPSCWDV3RKV5ZRN1FQD84YE1NQFEDJ9R1F4DYQ11.newyorkcitycoin-core-v2))
     (try! (contract-call? .ccd009-auth-v2-adapter add-principal-argument-nyc (var-get nycJobId) "newContract" .ccd010-core-v2-adapter))
     (try! (contract-call? .ccd009-auth-v2-adapter activate-job-mia (var-get miaJobId)))
     (try! (contract-call? .ccd009-auth-v2-adapter activate-job-nyc (var-get nycJobId)))