From 97910c5c5d930c9d776a84f19caaa9017ad55916 Mon Sep 17 00:00:00 2001
From: wileyj <2847772+wileyj@users.noreply.github.com>
Date: Fri, 13 Dec 2024 09:14:41 -0800
Subject: [PATCH] Adding changelog for 3.1.0.0.2.x

---
 CHANGELOG.md               | 14 +++-----------
 stacks-signer/CHANGELOG.md |  7 +++++--
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9007e510ad..d19470075d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,19 +9,9 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ### Added
 
-- Set the epoch to 3.1 in the Clarity DB upon activation.
-
 ### 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]
+## [3.1.0.0.2]
 
 ### Added
 
@@ -30,6 +20,8 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
   - `/v2/clarity/marf/:marf_key_hash`
   - `/v2/clarity/metadata/:principal/:contract_name/:clarity_metadata_key`
 - When a proposed block is validated by a node, the block can be validated even when the block version is different than the node's default ([#5539](https://github.com/stacks-network/stacks-core/pull/5539))
+- 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))
+- Set the epoch to 3.1 in the Clarity DB upon activation.
 
 ### Changed
 
diff --git a/stacks-signer/CHANGELOG.md b/stacks-signer/CHANGELOG.md
index 2f1187de51..fd38fe9775 100644
--- a/stacks-signer/CHANGELOG.md
+++ b/stacks-signer/CHANGELOG.md
@@ -11,15 +11,18 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## Changed
 
-## [3.1.0.0.1.0]
+## [3.1.0.0.2.0]
 
-### Added
+## 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
 
 - 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