Merge branch 'develop' of https://github.com/stacks-network/stacks-core…

… into fix/clippy-ci-stacks-lib-len-zero
stacks-network · Jan 3, 2025 · c7d455d · c7d455d
2 parents 4e867fe + 8e2c660
commit c7d455d
Show file tree

Hide file tree

Showing 123 changed files with 865 additions and 1,160 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,10 +8,12 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 ## [Unreleased]
 
 ### Added
+
 - Add `tenure_timeout_secs` to the miner for determining when a time-based tenure extend should be attempted.
 
 ### Changed
 
+- 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)
 - Nodes will assume that all PoX anchor blocks exist by default, and stall initial block download indefinitely to await their arrival (#5502)
 
 ## [3.1.0.0.1]