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

Merge branched 2.5.0.0.4 to master #4917

Merged
merged 673 commits into from
Jun 26, 2024
Merged

Merge branched 2.5.0.0.4 to master #4917

merged 673 commits into from
Jun 26, 2024

Conversation

wileyj
Copy link
Contributor

@wileyj wileyj commented Jun 26, 2024

Merge release branch (with ci conflicts resolved) to master

jcnelson and others added 30 commits April 29, 2024 10:03
- Relocate PoX-4 stateful property-based tests from
  ../core-contract-tests/tests/pox-4/ to
  boot-contracts-stateful-prop-tests/tests/pox-4.
- Implement a minimalistic vitest and Clarinet project setup.
- Adjust configurations for optimal test isolation.
- Ensure Clarinet config is as minimalistic as possible.
- For more details, see: #4725 (comment)
fix: add signer-key to synthetic `stack-aggregation-increase` event
…g out making snapshots (but not saving them)
…r than 1 (i.e. we're not in the prepare phase)
…-scenarios

Solo Stacking stateful property-based tests
jcnelson and others added 19 commits June 3, 2024 18:07
…lot-count

Revert "Fix/signer slot count"
…onical-2.5.0.0.4

Fix: never consider Stacks chain tips that are not on the canonical burn chain #4886
* cow/arcing tuple types and refactoring some checks in analyzer
Performance improvements in Clarity analysis
* master:
  remove paths-ignore
  4746 - avoid extra ci runs
@wileyj wileyj marked this pull request as ready for review June 26, 2024 20:59
@wileyj wileyj requested review from a team June 26, 2024 20:59
@wileyj
Copy link
Contributor Author

wileyj commented Jun 26, 2024

replacing #4915 with this one using an intermediate branch

@wileyj wileyj merged commit 35d0840 into master Jun 26, 2024
1 check passed
@wileyj wileyj deleted the chore/merge-master-2.5.0.0.4 branch June 26, 2024 21:42
@stacks-network stacks-network locked as resolved and limited conversation to collaborators Jun 29, 2024
@wileyj wileyj requested review from obycode and removed request for obycode June 29, 2024 14:42
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.