Merge pull request #6653 from wileyj/chore/3.3.0.0.0_develop

Merge release/3.3.0.0.0 to develop from intermediary

Author: wileyj

CHANGELOG.md

@@ -8,11 +8,16 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 ## [Unreleased]
 
 ### Added
-
-- Added support for new Clarity 4 builtin, `secp256r1-verify?` (not activated until epoch 3.3)
 - Fixed an issue where `event.committed` was always equal to `true` in the block replay RPC endpoint
 - Added `result_hex` and `post_condition_aborted` to the block replay RPC endpoint
+- 
+## [3.3.0.0.0]
+
+### Added
+
+- Added support for new Clarity 4 builtin, `secp256r1-verify?` (not activated until epoch 3.3)
 - New `block_proposal_validation_timeout_secs` configuration option in the connection options section, allowing to set the maximum duration a node will spend validating a proposed block.
+- Activation height selected and set for epoch 3.3 at Bitcoin block 923,222
 
 ### Changed
 

sample/conf/testnet-follower-conf.toml

@@ -89,4 +89,4 @@ start_height = 71525
 
 [[burnchain.epochs]]
 epoch_name = "3.3"
-start_height = 108800
+start_height = 109280

sample/conf/testnet-miner-conf.toml

@@ -85,4 +85,4 @@ start_height = 71525
 
 [[burnchain.epochs]]
 epoch_name = "3.3"
-start_height = 108800
+start_height = 109280

sample/conf/testnet-signer.toml

@@ -87,4 +87,4 @@ start_height = 71525
 
 [[burnchain.epochs]]
 epoch_name = "3.3"
-start_height = 108800
+start_height = 109280

stackslib/src/core/mod.rs

@@ -108,7 +108,7 @@ pub const BITCOIN_MAINNET_STACKS_31_BURN_HEIGHT: u64 = 875_000;
 /// This is Epoch-3.2, activation height proposed in SIP-031
 pub const BITCOIN_MAINNET_STACKS_32_BURN_HEIGHT: u64 = 907_740;
 /// This is Epoch-3.3, activation timing proposed in SIP-033
-pub const BITCOIN_MAINNET_STACKS_33_BURN_HEIGHT: u64 = 922_480;
+pub const BITCOIN_MAINNET_STACKS_33_BURN_HEIGHT: u64 = 923_222;
 
 /// Bitcoin mainline testnet3 activation heights.
 /// TODO: No longer used since testnet3 is dead, so remove.

versions.toml

@@ -1,4 +1,4 @@
 # Update these values when a new release is created.
 # `stacks-common/build.rs` will automatically update `versions.rs` with these values.
-stacks_node_version = "3.3.0.0.0-rc1"
-stacks_signer_version = "3.3.0.0.0-rc1"
+stacks_node_version = "3.3.0.0.0"
+stacks_signer_version = "3.3.0.0.0.0"