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.

Sign up for GitHub

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

Jump to bottom

Chore: Merge master to develop #4946

Merged
merged 42 commits into from
Jul 8, 2024
Merged

Chore: Merge master to develop #4946

merged 42 commits into from
Jul 8, 2024

Conversation

kantai
Copy link
Member

@kantai kantai commented Jul 3, 2024

This merges the latest from master to develop. The conflicts were in CHANGELOG.md, and in commented out code in v1::signer

wileyj and others added 30 commits May 8, 2024 09:17
@wileyj
4746 - avoid extra ci runs
384e381
@wileyj
remove paths-ignore
2a729d3
@wileyj
Merge pull request #4766 from stacks-network/fix/reduce_ci_runs-master
b7f7295 
[CI] 4746 - Avoid extraneous CI runs (master)
@wileyj
Adding 2.5.0.0.4 to the changelog
e756c6e
@wileyj
Update build command
0924437 
- removed the step to , defaulting to repo root
@wileyj
Update changelog with what's changing in this version
5c718ff
@wileyj
Merge pull request #4806 from stacks-network/chore/2.5.0.0.4-changelog
a88ee2b 
Adding 2.5.0.0.4 to the changelog
@jcnelson
fix: the number of stacker signer slots is 13 for Nakamoto
631138f
@jcnelson
fix: disable relevant unit tests that assume 14 stacker signer slots
c13e521
@jcnelson
fix: fix stacks-inspect so that the block ranges correspond to height…
5d9f472 
…s, not rowids
@wileyj
Merge pull request #4845 from stacks-network/fix/signer-slot-count
246aac0 
Fix/signer slot count
@wileyj
Revert "Fix/signer slot count"
3906688
@wileyj
Merge pull request #4853 from stacks-network/revert-4845-fix/signer-s…
c848473 
…lot-count

Revert "Fix/signer slot count"
@jcnelson
chore: disable stackerdb encrypted state to make dkg and adjacent CI …
0f8b661 
…tests pass
@jcnelson
Merge branch 'release/2.5.0.0.4' into fix/signer-slot-count
0ece14b
@jcnelson
Merge pull request #4868 from stacks-network/fix/signer-slot-count
cfffe55 
Fix/signer-slot-count
@jcnelson @kantai
fix: always, always, always filter out stacks blocks on non-canonical…
2d7f8ed 
… burnchain forks
@kantai
Merge pull request #4893 from stacks-network/fix/miner-ignores-noncan…
0d850da 
…onical-2.5.0.0.4

Fix: never consider Stacks chain tips that are not on the canonical burn chain #4886
@kantai
fix: signer slots count in staging
6e64d0d
@kantai
test: update tests
e4770f6
@kantai
Merge pull request #4891 from stacks-network/fix/signer-slots-count
5309358 
Fix: signer slots count in staging
@wileyj
Add PR's to the changelog for 2.5.0.0.4
a758941
@kantai
perf: improvements in clarity analysis
3ae098e 
* cow/arcing tuple types and refactoring some checks in analyzer
@wileyj
Merge pull request #4908 from stacks-network/perf/clarity-improvements
4669b75 
Performance improvements in Clarity analysis
@wileyj
Merge branch 'release/2.5.0.0.4' into chore/2.5.0.0.4-changelog
0fbd7ac
@wileyj
Address PR comments
b667b65
@wileyj
Merge pull request #4909 from stacks-network/chore/2.5.0.0.4-changelog
c47af1b 
Add PR's to the changelog for 2.5.0.0.4
@wileyj
Merge branch 'master' into chore/merge-master-2.5.0.0.4
d073cdb 
* master:
  remove paths-ignore
  4746 - avoid extra ci runs
@wileyj
Merge pull request #4917 from stacks-network/chore/merge-master-2.5.0…
35d0840 
….0.4

Merge branch release/2.5.0.0.4 to master
@kantai
chore: make connection_options.antientropy_retry configurable
0f000c9
@kantai kantai requested review from a team as code owners July 3, 2024 15:40
@wileyj
Copy link
Contributor

wileyj commented Jul 3, 2024

hmm, master could use a merge from release/2.5.0.0.5, else we'll be doing this again after that (only 2 PR's missing - one for the default antientropy_rety and another for the changelog).

better to wait on this PR until that one is merged?

@kantai
Copy link
Member Author

kantai commented Jul 3, 2024

hmm, master could use a merge from release/2.5.0.0.5, else we'll be doing this again after that (only 2 PR's missing - one for the default antientropy_rety and another for the changelog).

better to wait on this PR until that one is merged?

Yep, happy to wait on that. Will close.

@kantai kantai closed this Jul 3, 2024
@wileyj
Copy link
Contributor

wileyj commented Jul 3, 2024

#4947

@wileyj wileyj reopened this Jul 3, 2024
@kantai kantai enabled auto-merge July 4, 2024 01:42
@smcclellan smcclellan requested review from obycode and wileyj July 5, 2024 13:55
obycode
obycode approved these changes Jul 8, 2024
View reviewed changes
Copy link
Contributor

@obycode obycode left a comment

Choose a reason for hiding this comment

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

LGTM

@kantai kantai added this pull request to the merge queue Jul 8, 2024
Merged via the queue into develop with commit 8c3bf33 Jul 8, 2024
1 check passed
@kantai kantai deleted the chore/master-to-develop-07032024 branch July 8, 2024 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@obycode obycode obycode approved these changes

@wileyj wileyj wileyj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kantai @wileyj @obycode @jcnelson