Set Canopy testnet activation height to 1020500

ZcashFoundation · Jul 17, 2020 · 8a4c515 · 8a4c515
1 parent c0a1985
commit 8a4c515
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -15,7 +15,7 @@ The code preparations for the Canopy network upgrade are finished and included i
 - [ZIP 214: Consensus rules for a Zcash Development Fund](https://zips.z.cash/zip-0214)
 - [ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules](https://zips.z.cash/zip-0215)
 
-Canopy will activate on testnet at height TODO, and can also be activated at a specific height in regtest mode by setting the config option `-nuparams=0xe9ff75a6:HEIGHT`.
+Canopy will activate on testnet at height 1020500, and can also be activated at a specific height in regtest mode by setting the config option `-nuparams=0xe9ff75a6:HEIGHT`.
 
 Canopy will activate on mainnet at height 1046400.
 

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -353,7 +353,7 @@ class CTestNetParams : public CChainParams {
             uint256S("05688d8a0e9ff7c04f6f05e6d695dc5ab43b9c4803342d77ae360b2b27d2468e");
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nProtocolVersion = 170012;
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight =
-            Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
+            Consensus::NetworkUpgrade::1020500;
 
         consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48;