From 62f50661e385962bbb15999c75fa0243062fe994 Mon Sep 17 00:00:00 2001 From: Hank Stoever Date: Fri, 6 Dec 2024 15:16:49 -0800 Subject: [PATCH 1/2] fix: revert stack block version change --- stackslib/src/chainstate/nakamoto/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stackslib/src/chainstate/nakamoto/mod.rs b/stackslib/src/chainstate/nakamoto/mod.rs index d874186988..dbaf226015 100644 --- a/stackslib/src/chainstate/nakamoto/mod.rs +++ b/stackslib/src/chainstate/nakamoto/mod.rs @@ -131,7 +131,7 @@ pub use self::staging_blocks::{ NakamotoStagingBlocksConn, NakamotoStagingBlocksConnRef, NakamotoStagingBlocksTx, }; -pub const NAKAMOTO_BLOCK_VERSION: u8 = 1; +pub const NAKAMOTO_BLOCK_VERSION: u8 = 0; define_named_enum!(HeaderTypeNames { Nakamoto("nakamoto"), From 86751a0390be14b4ecd5431d3075b28c7a13ffa5 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Sat, 7 Dec 2024 10:11:29 -0800 Subject: [PATCH 2/2] Adding changelog for epoch 3.1 and revert block version change (#5538) --- CHANGELOG.md | 7 +++++++ stacks-signer/CHANGELOG.md | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f383cb596c..920621c045 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE ### Added +### 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/will-corcoran/sips/blob/feat/sip-029-halving-alignment/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 a332b344ce..01613ab23c 100644 --- a/stacks-signer/CHANGELOG.md +++ b/stacks-signer/CHANGELOG.md @@ -11,6 +11,14 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE ### Changed +## [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 + ## [3.0.0.0.4.0] ### Added