Skip to content

Commit 69bbafb

Browse files
committed
Merge branch 'develop' of https://github.com/stacks-network/stacks-core into fix/clippy-ci-stacks-lib-collapsible-else-if
2 parents 96de191 + 8c23c0e commit 69bbafb

File tree

184 files changed

+2517
-2119
lines changed

Some content is hidden

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

184 files changed

+2517
-2119
lines changed

.github/workflows/bitcoin-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ jobs:
135135
- tests::signer::v0::tenure_extend_after_bad_commit
136136
- tests::signer::v0::block_proposal_max_age_rejections
137137
- tests::signer::v0::global_acceptance_depends_on_block_announcement
138+
- tests::signer::v0::no_reorg_due_to_successive_block_validation_ok
138139
- tests::nakamoto_integrations::burn_ops_integration_test
139140
- tests::nakamoto_integrations::check_block_heights
140141
- tests::nakamoto_integrations::clarity_burn_state

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
88
## [Unreleased]
99

1010
### Added
11+
1112
- Add `tenure_timeout_secs` to the miner for determining when a time-based tenure extend should be attempted.
1213

1314
### Changed
1415

16+
- When a transaction is dropped due to replace-by-fee, the `/drop_mempool_tx` event observer payload now includes `new_txid`, which is the transaction that replaced this dropped transaction. When a transaction is dropped for other reasons, `new_txid` is `null`. [#5381](https://github.com/stacks-network/stacks-core/pull/5381)
1517
- Nodes will assume that all PoX anchor blocks exist by default, and stall initial block download indefinitely to await their arrival (#5502)
1618

1719
## [3.1.0.0.1]

0 commit comments

Comments
 (0)