Skip to content

Commit f3f49a4

Browse files
authored
Merge branch 'develop' into long-block-proposal-timeout
2 parents 6224b72 + 7e8f2a3 commit f3f49a4

File tree

10 files changed

+332
-76
lines changed

10 files changed

+332
-76
lines changed

.github/workflows/bitcoin-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ jobs:
170170
- tests::nakamoto_integrations::v3_blockbyheight_api_endpoint
171171
- tests::nakamoto_integrations::mine_invalid_principal_from_consensus_buff
172172
- tests::nakamoto_integrations::test_tenure_extend_from_flashblocks
173+
- tests::nakamoto_integrations::restarting_miner
173174
# TODO: enable these once v1 signer is supported by a new nakamoto epoch
174175
# - tests::signer::v1::dkg
175176
# - tests::signer::v1::sign_request_rejected

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
1818

1919
- Miner will include other transactions in blocks with tenure extend transactions (#5760)
2020

21+
### Fixed
22+
23+
- Miners who restart their nodes immediately before a winning tenure now correctly detect that
24+
they won the tenure after their nodes restart ([#5750](https://github.com/stacks-network/stacks-core/issues/5750)).
25+
2126
## [3.1.0.0.4]
2227

2328
### Added

0 commit comments

Comments
 (0)