zcash_protocol: Set the public mainnet activation height for NU6

zcash · Sep 24, 2024 · ccd5a78 · ccd5a78
1 parent d8db481
commit ccd5a78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/components/zcash_protocol/CHANGELOG.md b/components/zcash_protocol/CHANGELOG.md
@@ -14,6 +14,7 @@ and this library adheres to Rust's notion of
   height from another yields the delta between them.
 
 ### Changed
+- Mainnet activation height has been set for `consensus::BranchId::Nu6`.
 - Adding a delta to a `BlockHeight` now uses saturating addition.
 - Subtracting a delta to a `BlockHeight` now uses saturating subtraction.
 

diff --git a/components/zcash_protocol/src/consensus.rs b/components/zcash_protocol/src/consensus.rs
@@ -342,7 +342,7 @@ impl Parameters for MainNetwork {
             NetworkUpgrade::Heartwood => Some(BlockHeight(903_000)),
             NetworkUpgrade::Canopy => Some(BlockHeight(1_046_400)),
             NetworkUpgrade::Nu5 => Some(BlockHeight(1_687_104)),
-            NetworkUpgrade::Nu6 => None,
+            NetworkUpgrade::Nu6 => Some(BlockHeight(2_726_400)),
             #[cfg(zcash_unstable = "zfuture")]
             NetworkUpgrade::ZFuture => None,
         }