Skip to content

Conversation

@friedger
Copy link
Contributor

@friedger friedger commented Dec 3, 2023

Description

This PR changes the way how pox-4 contracts for mainnet and testnet are created. Instead of string concatenation, we now use is-in-mainnet in clarity.

Applicable issues

Additional info (benefits, drawbacks, caveats)

pox_4_body is only used to create pox-4 contract for mainnet and testnet. It is not used for creating pox-4 contract with other constants.

Checklist

  • Test coverage for new or modified code paths
  • Changelog is updated
  • Required documentation changes (e.g., docs/rpc/openapi.yaml and rpc-endpoints.md for v2 endpoints, event-dispatcher.md for new events)
  • New clarity functions have corresponding PR in clarity-benchmarking repo
  • New integration test(s) added to bitcoin-tests.yml

@friedger friedger requested a review from hugoclrd December 3, 2023 11:51
Copy link
Contributor

@moodmosaic moodmosaic left a comment

Choose a reason for hiding this comment

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

LGTM!

# path = "../../stackslib/src/chainstate/stacks/boot/pox-testnet.clar"
[contracts.pox-4]
path = "./contracts/pox/pox-4-testnet.clar"
path = "../../stackslib/src/chainstate/stacks/boot/pox-4.clar"
Copy link
Contributor

Choose a reason for hiding this comment

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

🎉

Copy link
Contributor

@hugoclrd hugoclrd left a comment

Choose a reason for hiding this comment

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

LGTM! thx @friedger

@friedger friedger merged commit 7b47c47 into feat/pox-4-disallow-stacking-during-prepare-phase Dec 4, 2023
Copy link
Member

@jcnelson jcnelson left a comment

Choose a reason for hiding this comment

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

I wish I'd had a chance to review this before it got merged, because this patch could use some improvement. Namely, the organization of the ADDRESS_VERSION constants are confusing. If you look in pox-4.clar, you'll see code comments to the effect that the four address versions here are included in a separate file, and yet here they are. Could you send another PR that cleans up pox-4.clar's ADDRESS_VERSIONs?

@blockstack-devops
Copy link
Contributor

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@stacks-network stacks-network locked as resolved and limited conversation to collaborators Nov 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants