From 369c16ef443d7f7755f4eb9b0c95dcb2767f16ca Mon Sep 17 00:00:00 2001 From: therealyingtong Date: Tue, 28 Jul 2020 07:18:26 +0800 Subject: [PATCH] Set APPROX_RELEASE_HEIGHT to 917000 and update release-notes-3.1.0.md --- doc/release-notes/release-notes-3.1.0.md | 2 +- src/deprecation.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/release-notes-3.1.0.md b/doc/release-notes/release-notes-3.1.0.md index 0e39d9c64..07359f1d5 100644 --- a/doc/release-notes/release-notes-3.1.0.md +++ b/doc/release-notes/release-notes-3.1.0.md @@ -12,7 +12,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 1028500, 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 1028500, and can also be activated at a specific height in regtest mode by setting the config option `-nuparams=0xe9ff75a6:HEIGHT`. Note that v3.1.0 enables Canopy support on the testnet. Canopy will activate on mainnet at height 1046400. diff --git a/src/deprecation.h b/src/deprecation.h index a83cafc4b..11e6d12da 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -8,7 +8,7 @@ // Deprecation policy: // * Shut down 16 weeks' worth of blocks after the estimated release block height. // * A warning is shown during the 2 weeks' worth of blocks prior to shut down. -static const int APPROX_RELEASE_HEIGHT = 1020000; +static const int APPROX_RELEASE_HEIGHT = 917000; static const int WEEKS_UNTIL_DEPRECATION = 16; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 48);