From 9fa68f4ffa8ce19bc5d5cf3e64f17b25578e1946 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Thu, 11 Apr 2024 08:00:44 -0700 Subject: [PATCH] Address PR comments for changelog --- CHANGELOG.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50a38c5a9e..b111a6091a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,20 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE ## [2.5.0.0.0] -This release implements the 2.5 Stacks consensus rules: primarily the instantiation +This release implements the 2.5 Stacks consensus rules which activates at Bitcoin block `839,444`: primarily the instantiation of the pox-4 contract. For more details see SIP-021. -This release is a consensus-critical release. Nodes which do not update before -the 2.5 activation height will be forked away from the rest of the network. This release -is compatible with 2.4.x chain state directories and does not require resyncing from -genesis. The first time a node boots with this version it will perform some database -migrations which could lengthen the normal node startup time. +This is the first consensus-critical release for Nakamoto. Nodes which do not update before the 2.5 activation height will be forked away from the rest of the network. This release is compatible with 2.4.x chain state directories and does not require resyncing from genesis. The first time a node boots with this version it will perform some database migrations which could lengthen the normal node startup time. + +**This is a required release before Nakamoto rules are enabled in 3.0.** + + +### Timing of Release from 2.5 to 3.0 + +Activating Nakamoto will include two epochs: + +- **Epoch 2.5:** Pox-4 contract is booted up but no Nakamoto consensus rules take effect. +- **Epoch 3:** Nakamoto consensus rules take effect. ### Added