diff --git a/CHANGELOG.md b/CHANGELOG.md index 05df6a51a3..f85ed6526b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,21 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE ### Added +### Changed + +## [3.1.0.0.1] + +### Added + - A miner will now generate a tenure-extend when at least 70% of the signers have confirmed that they are willing to allow one, via the new timestamp included in block responses. This allows the miner to refresh its budget in between Bitcoin blocks. ([#5476](https://github.com/stacks-network/stacks-core/discussions/5476)) + +### Changed + +## [3.1.0.0.0] + +### Added + +- **SIP-029 consensus rules, activating in epoch 3.1 at block 875,000** (see [SIP-029](https://github.com/stacksgov/sips/blob/main/sips/sip-029/sip-029-halving-alignment.md) for details) - New RPC endpoints - `/v2/clarity/marf/:marf_key_hash` - `/v2/clarity/metadata/:principal/:contract_name/:clarity_metadata_key` diff --git a/stacks-signer/CHANGELOG.md b/stacks-signer/CHANGELOG.md index 2fec112d1f..517f5b30ea 100644 --- a/stacks-signer/CHANGELOG.md +++ b/stacks-signer/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE ## [Unreleased] +## Added + +## Changed + +## [3.1.0.0.1.0] + ### Added ### Changed @@ -14,6 +20,15 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE - Added tenure extend timestamp to signer block responses - Added tenure_idle_timeout_secs configuration option for determining when a time-based tenure extend will be accepted +## [3.1.0.0.0.0] + +### Added + +- **SIP-029 consensus rules, activating in epoch 3.1 at block 875,000** (see [SIP-029](https://github.com/will-corcoran/sips/blob/feat/sip-029-halving-alignment/sips/sip-029/sip-029-halving-alignment.md) for details) + +### Changed +>>>>>>> chore/3.1.0.0.0_changelog + ## [3.0.0.0.4.0] ### Added