Skip to content

Commit 49777d3

Browse files
authored
Merge pull request #5540 from stacks-network/chore/3.1.0.0.0_changelog
Add changlog for epoch 3.1 and revert block version (5538)
2 parents 8c99a12 + 86751a0 commit 49777d3

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
99

1010
### Added
1111

12+
### Changed
13+
14+
## [3.1.0.0.0]
15+
16+
### Added
17+
18+
- **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)
1219
- New RPC endpoints
1320
- `/v2/clarity/marf/:marf_key_hash`
1421
- `/v2/clarity/metadata/:principal/:contract_name/:clarity_metadata_key`

stacks-signer/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
1111

1212
### Changed
1313

14+
## [3.1.0.0.0.0]
15+
16+
### Added
17+
18+
- **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)
19+
20+
### Changed
21+
1422
## [3.0.0.0.4.0]
1523

1624
### Added

stackslib/src/chainstate/nakamoto/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pub use self::staging_blocks::{
131131
NakamotoStagingBlocksConn, NakamotoStagingBlocksConnRef, NakamotoStagingBlocksTx,
132132
};
133133

134-
pub const NAKAMOTO_BLOCK_VERSION: u8 = 1;
134+
pub const NAKAMOTO_BLOCK_VERSION: u8 = 0;
135135

136136
define_named_enum!(HeaderTypeNames {
137137
Nakamoto("nakamoto"),

0 commit comments

Comments
 (0)