Skip to content

Commit 78c87b1

Browse files
authored
Merge branch 'develop' into feat/build-time-git-consts
2 parents 475e9fd + 91a1398 commit 78c87b1

File tree

170 files changed

+3227
-3477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+3227
-3477
lines changed

.github/workflows/bitcoin-tests.yml

Lines changed: 94 additions & 147 deletions
Large diffs are not rendered by default.

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,31 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to the versioning scheme outlined in the [README.md](README.md).
77

8+
## [Unreleased]
9+
10+
### Added
11+
12+
### Changed
13+
14+
### Fixed
15+
16+
## [3.1.0.0.5]
17+
18+
### Added
19+
20+
- Add miner configuration option `tenure_extend_cost_threshold` to specify the percentage of the tenure budget that must be spent before a time-based tenure extend is attempted
21+
22+
### Changed
23+
24+
- Miner will include other transactions in blocks with tenure extend transactions (#5760)
25+
- Add `block_rejection_timeout_steps` to miner configuration for defining rejections-based timeouts while waiting for signers response (#5705)
26+
- Miner will not issue a tenure extend until at least half of the block budget has been spent (#5757)
27+
28+
### Fixed
29+
30+
- Miners who restart their nodes immediately before a winning tenure now correctly detect that
31+
they won the tenure after their nodes restart ([#5750](https://github.com/stacks-network/stacks-core/issues/5750)).
32+
833
## [3.1.0.0.4]
934

1035
### Added

0 commit comments

Comments
 (0)