Push deprecation out 10 years ;)

3.3.0 expires around block 1,392,000 [~June 9, 2022] and should be repclaced immediately!

README.md

@@ -103,7 +103,7 @@ See important security warnings on the
 
 📒 Deprecation Policy
 ------------------
-Disabledeprecation flag has been removed. Old nodes will automatically be shut down and must be upgraded upon reaching the deprecation block height, which will occur approximately 52 weeks (6/23/2022) from the release of v3.3.0.
+Disabledeprecation flag has been removed. Nodes running release 3.3.1 will automatically shut down in ten years (June 2032).
 
 
 🔧 Building

configure.ac

@@ -2,12 +2,12 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 3)
-define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 50)
+define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_BUILD, 6)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2021)
+define(_COPYRIGHT_YEAR, 2022)
 AC_INIT([Zcash],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/zcash/zcash/issues],[zcash])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])

src/clientversion.cpp

@@ -19,7 +19,7 @@
  * for both bitcoind and bitcoin-core, to make it harder for attackers to
  * target servers or GUI users specifically.
  */
-const std::string CLIENT_NAME("Ambae"); // Ambrym Maewo
+const std::string CLIENT_NAME("Ambrym"); // Maewo
 
 /**
  * Client version number

src/clientversion.h

@@ -15,11 +15,11 @@
  */
 
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
-// Actually set in configure.ac; set here unlikely and easy to notice values
-#define CLIENT_VERSION_MAJOR 9
+// Values actually set in configure.ac; set here to unlikely and easy to notice values
+#define CLIENT_VERSION_MAJOR 8
 #define CLIENT_VERSION_MINOR 8
-#define CLIENT_VERSION_REVISION 7
-#define CLIENT_VERSION_BUILD 6
+#define CLIENT_VERSION_REVISION 8
+#define CLIENT_VERSION_BUILD 8
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE false
@@ -28,7 +28,7 @@
  * Copyright year (2009-this)
  * Todo: update this when changing our copyright comments in the source
  */
-#define COPYRIGHT_YEAR 2021
+#define COPYRIGHT_YEAR 2022
 
 #endif //HAVE_CONFIG_H
 

src/deprecation.h

@@ -6,11 +6,11 @@
 #define ZCASH_DEPRECATION_H
 
 // Deprecation policy:
-// * Shut down 52 weeks' worth of blocks after the estimated release block height.
+// * Shut down 520 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 4 weeks' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 1130000;
-static const int WEEKS_UNTIL_DEPRECATION = 52;
-//Fixing zero day size
+static const int APPROX_RELEASE_HEIGHT = 1385000;
+static const int WEEKS_UNTIL_DEPRECATION = 520;
+//Fixing zero day size - was 1,392,080
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 30);
 
 // Number of blocks before deprecation to warn users