Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CCIP-019 PoX-4 Stacking #67

Closed
wants to merge 11 commits into from
Closed

CCIP-019 PoX-4 Stacking #67

wants to merge 11 commits into from

Conversation

friedger
Copy link
Contributor

This PR

@friedger friedger marked this pull request as draft March 22, 2024 12:30
@friedger friedger changed the title CCIP-019 Nakamoto CCIP-019 PoX-4 Stacking May 4, 2024
@friedger friedger marked this pull request as ready for review May 4, 2024 14:56
Copy link
Contributor

@whoabuddy whoabuddy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey just gave this a once over and feels like we're part of the way there, some open questions and suggestions to match the formats of other proposals to start.

We should include a vote per CCIP-015, even if it's just with MIA and focused on the MIA treasury (see comments).

We should add tests for these new contracts which is tricky with the changes in formatting for Clarinet. I'm not a fan of disabling the old tests, but propose we try to keep this and add new tests side-by-side to ensure all expected outcomes.

.github/workflows/test-contracts.yaml Outdated Show resolved Hide resolved
Clarinet.toml Outdated Show resolved Hide resolved
Clarinet.toml Outdated Show resolved Hide resolved
Clarinet.toml Outdated Show resolved Hide resolved
Clarinet.toml Outdated Show resolved Hide resolved
contracts/proposals/ccip019-pox-4-stacking.clar Outdated Show resolved Hide resolved
contracts/proposals/ccip019-pox-4-stacking.clar Outdated Show resolved Hide resolved
contracts/proposals/ccip019-pox-4-stacking.clar Outdated Show resolved Hide resolved
contracts/proposals/ccip019-pox-4-stacking.clar Outdated Show resolved Hide resolved
contracts/traits/ccip019-proxy-trait.clar Outdated Show resolved Hide resolved
@friedger
Copy link
Contributor Author

Tests fails because we now have epoch 2.5 that is required for pox-4 that is used in the treasury-v3 contract..

Copy link

codecov bot commented Jul 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.29%. Comparing base (4d8f4a2) to head (5e04323).

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main      #67   +/-   ##
=======================================
  Coverage   88.29%   88.29%           
=======================================
  Files          24       24           
  Lines        1657     1657           
  Branches      275      275           
=======================================
  Hits         1463     1463           
  Misses        174      174           
  Partials       20       20           

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4d8f4a2...5e04323. Read the comment docs.

@whoabuddy
Copy link
Contributor

Tests fails because we now have epoch 2.5 that is required for pox-4 that is used in the treasury-v3 contract..

I think this has to do with using the mainnet addresses and the requirements, the .cache directory is normally hidden but we have it visible and uploaded so the GH runner doesn't have to download the contracts.

Something funny was happening at that step and I've got it working locally just updating to all testnet addresses in the code. It wouldn't let me add to this branch (probably something I'm doing) so here's the commit with the changes that got it to pass.

$ clarinet check -m Clarinet-2.5.toml 
✔ 149 contracts checked

Overall things look good here, I'll get a review going next and thank you for this!! 🙏

Copy link
Contributor

@whoabuddy whoabuddy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall LGTM, one small change on the name in ccd005 and otherwise might be easier to use testnet addresses over mainnet for Clarinet.


;; add treasuries to ccd005-city-data
(try! (contract-call? .ccd005-city-data add-treasury miaId .ccd002-treasury-mia-mining-v3 "mining-v3"))
(try! (contract-call? .ccd005-city-data add-treasury miaId .ccd002-treasury-mia-stx-stacking-v3 "stx-v3"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(try! (contract-call? .ccd005-city-data add-treasury miaId .ccd002-treasury-mia-stx-stacking-v3 "stx-v3"))
(try! (contract-call? .ccd005-city-data add-treasury miaId .ccd002-treasury-mia-stx-stacking-v3 "rewards-v3"))

Small change but makes it easier to understand purpose.

whoabuddy added a commit that referenced this pull request Aug 7, 2024
Using mia over stx makes it easier to understand what the treasury is associated with, and the treasury name is part of the suggestion here (and fits in the 10char limit): #67 (comment)
@whoabuddy
Copy link
Contributor

Closing in favor of #76

@whoabuddy whoabuddy closed this Aug 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants