fix: update all refs to mainnet except traits

For whatever reason when changing the traits to mainnet even with them listed in the project requirements there is an error that deposit-ft doesn't match the trait spec. Will update the two trait references manually for the updated simulation.
citycoins · Aug 7, 2024 · 7fb0af5 · 7fb0af5
1 parent 67382c9
commit 7fb0af5
Show file tree

Hide file tree

Showing 7 changed files with 1,878 additions and 8 deletions.
diff --git a/.cache/requirements/SP000000000000000000002Q6VF78.pox-4.clar b/.cache/requirements/SP000000000000000000002Q6VF78.pox-4.clar
diff --git a/.cache/requirements/SP000000000000000000002Q6VF78.pox-4.json b/.cache/requirements/SP000000000000000000002Q6VF78.pox-4.json
@@ -0,0 +1,4 @@
+{
+  "epoch": "Epoch25",
+  "clarity_version": "Clarity2"
+}
diff --git a/.cache/requirements/SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox4-fast-pool-v3.clar b/.cache/requirements/SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox4-fast-pool-v3.clar
diff --git a/.cache/requirements/SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox4-fast-pool-v3.json b/.cache/requirements/SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox4-fast-pool-v3.json
@@ -0,0 +1,4 @@
+{
+  "epoch": "Epoch25",
+  "clarity_version": "Clarity2"
+}
diff --git a/Clarinet.toml b/Clarinet.toml
@@ -10,6 +10,12 @@ path = ".requirements"
 
 # MAINNET REQUIREMENTS
 
+[[project.requirements]]
+contract_id = "SP000000000000000000002Q6VF78.pox-4"
+
+[[project.requirements]]
+contract_id = "SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox4-fast-pool-v3"
+
 [[project.requirements]]
 contract_id = "SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard"
 

diff --git a/contracts/extensions/ccd002-treasury-v3.clar b/contracts/extensions/ccd002-treasury-v3.clar
@@ -157,9 +157,7 @@
       delegate: to,
       sender: tx-sender
     })
-    ;; MAINNET: 'SP000000000000000000002Q6VF78.pox-4
-    ;; TESTNET: 'ST000000000000000000002AMW42H.pox-4
-    (match (as-contract (contract-call? 'ST000000000000000000002AMW42H.pox-4 delegate-stx maxAmount to none none))
+    (match (as-contract (contract-call? 'SP000000000000000000002Q6VF78.pox-4 delegate-stx maxAmount to none none))
       success (ok success)
       err (err (to-uint err))
     )
@@ -174,9 +172,7 @@
       caller: contract-caller,
       sender: tx-sender
     })
-    ;; MAINNET: 'SP000000000000000000002Q6VF78.pox-4
-    ;; TESTNET: 'ST000000000000000000002AMW42H.pox-4
-    (match (as-contract (contract-call? 'ST000000000000000000002AMW42H.pox-4 revoke-delegate-stx))
+    (match (as-contract (contract-call? 'SP000000000000000000002Q6VF78.pox-4 revoke-delegate-stx))
       success (begin (print success) (ok true))
       err (err (to-uint err))
     )

diff --git a/contracts/proposals/ccip019-pox-4-stacking.clar b/contracts/proposals/ccip019-pox-4-stacking.clar
@@ -79,14 +79,12 @@
     ))
 
     ;; allow MIA in treasuries
-    ;; MAINNET: 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-token-v2
     (try! (contract-call? .ccd002-treasury-mia-mining-v3 set-allowed 'SP1H1733V5MZ3SZ9XRW9FKYGEZT0JDGEB8Y634C7R.miamicoin-token-v2 true))
 
     ;; transfer funds to new treasury extensions
     (try! (contract-call? .ccd002-treasury-mia-mining-v2 withdraw-stx miaBalance .ccd002-treasury-mia-mining-v3))
 
     ;; delegate stack the STX in the mining and rewards treasuries (up to 50M STX each)
-    ;; MAINNET: SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox4-fast-pool-v3
     (try! (contract-call? .ccd002-treasury-mia-mining-v3 delegate-stx u50000000000000 'SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox4-fast-pool-v3))
     (try! (contract-call? .ccd002-treasury-mia-rewards-v3 delegate-stx u50000000000000 'SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox4-fast-pool-v3))