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

Fix: correct burn view for miner block broadcast #5515

Merged
merged 92 commits into from
Jan 21, 2025
Merged

Conversation

jcnelson
Copy link
Member

This fixes the burn view calculation for the Nakamoto miner when accepting and broadcasting a block.

It builds atop #5508, so don't bother merging until #5508 is in develop.

@jcnelson jcnelson requested a review from a team as a code owner November 27, 2024 20:15
@aldur
Copy link
Contributor

aldur commented Dec 3, 2024

  1. Merge hotfix: remove chain stall race condition #5508 to master
  2. After release merge master into develop.
  3. Merge this to develop.

jferrant
jferrant previously approved these changes Dec 4, 2024
@jcnelson
Copy link
Member Author

jcnelson commented Dec 5, 2024

This now contains the hotfix to the miner @obycode @jferrant

Copy link
Collaborator

@jferrant jferrant left a comment

Choose a reason for hiding this comment

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

Just a few questions.

@aldur aldur added this to the 3.1.0.0.2 milestone Dec 11, 2024
@aldur aldur assigned kantai and unassigned jcnelson Jan 21, 2025
@kantai kantai requested a review from a team as a code owner January 21, 2025 16:31
jferrant
jferrant previously approved these changes Jan 21, 2025
@jferrant jferrant requested a review from obycode January 21, 2025 18:18
@kantai kantai dismissed their stale review January 21, 2025 18:42

Took over the PR, and my comments have been addressed.

@jcnelson jcnelson requested a review from kantai January 21, 2025 19:23
@kantai kantai added this pull request to the merge queue Jan 21, 2025
Merged via the queue into develop with commit 04f6fc4 Jan 21, 2025
169 checks passed
@kantai kantai deleted the fix/burn-view branch January 21, 2025 21:03
@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 Jan 29, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
Status: Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

6 participants