Updated deprecation and version (to stable)

MarcelusCH · Sep 3, 2022 · 412449c · 412449c
1 parent 03aad9c
commit 412449c
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# BitcoinZ 2.0.8-RC1
+# BitcoinZ 2.0.8
 **Keep running wallet to strengthen the BitcoinZ network. Backup your wallet in many locations & keep your coins wallet offline.**
 
 ### Ports:

diff --git a/configure.ac b/configure.ac
@@ -3,10 +3,10 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 8)
-define(_CLIENT_VERSION_BUILD, 25)
+define(_CLIENT_VERSION_BUILD, 50)
 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, false)
+define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2022)
 AC_INIT([BitcoinZ],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/btcz/bitcoinz/issues],[BitcoinZ])
 AC_CONFIG_SRCDIR([src/main.cpp])

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
@@ -1,8 +1,8 @@
-bitcoinz (2.0.8-RC1) stable; urgency=low
+bitcoinz (2.0.8) stable; urgency=low
 
-  * 2.0.8-RC1 release.
+  * 2.0.8 release.
 
-  -- The BitcoinZ Community <[email protected]> Jul 2022
+  -- The BitcoinZ Community <[email protected]> Sep 2022
 
 bitcoinz (2.0.7-10) stable; urgency=medium
 

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "bitcoinz-2.0.8-RC1"
+name: "bitcoinz-2.0.8"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/doc/man/bitcoinz-cli.1 b/doc/man/bitcoinz-cli.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BITCOINZ-CLI "1" "Jul 2022" "bitcoinz-cli v2.0.8-RC1" "User Commands"
+.TH BITCOINZ-CLI "1" "Sep 2022" "bitcoinz-cli v2.0.8" "User Commands"
 .SH NAME
-bitcoinz-cli \- manual page for bitcoinz-cli v2.0.8-RC1
+bitcoinz-cli \- manual page for bitcoinz-cli v2.0.8
 .SH DESCRIPTION
-BitcoinZ RPC client version v2.0.8-RC1
+BitcoinZ RPC client version v2.0.8
 .PP
 In order to ensure you are adequately protecting your privacy when using
 BitcoinZ, please see <https://z.cash/support/security/index.html>.

diff --git a/doc/man/bitcoinz-tx.1 b/doc/man/bitcoinz-tx.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BITCOINZ-TX "1" "Jul 2022" "bitcoinz-tx v2.0.8-RC1" "User Commands"
+.TH BITCOINZ-TX "1" "Sep 2022" "bitcoinz-tx v2.0.8" "User Commands"
 .SH NAME
-bitcoinz-tx \- manual page for bitcoinz-tx v2.0.8-RC1
+bitcoinz-tx \- manual page for bitcoinz-tx v2.0.8
 .SH DESCRIPTION
-BitcoinZ bitcoinz\-tx utility version v2.0.8-RC1
+BitcoinZ bitcoinz\-tx utility version v2.0.8
 .SS "Usage:"
 .TP
 bitcoinz\-tx [options] <hex\-tx> [commands]

diff --git a/doc/man/bitcoinzd.1 b/doc/man/bitcoinzd.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BITCOINZD "1" "Jul 2022" "bitcoinzd v2.0.8-RC1" "User Commands"
+.TH BITCOINZD "1" "Sep 2022" "bitcoinzd v2.0.8" "User Commands"
 .SH NAME
-bitcoinzd \- manual page for bitcoinzd v2.0.8-RC1
+bitcoinzd \- manual page for bitcoinzd v2.0.8
 .SH DESCRIPTION
-BitcoinZ Daemon version v2.0.8-RC1
+BitcoinZ Daemon version v2.0.8
 .PP
 In order to ensure you are adequately protecting your privacy when using
 BitcoinZ, please see <https://z.cash/support/security/>.

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -19,10 +19,10 @@
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 0
 #define CLIENT_VERSION_REVISION 8
-#define CLIENT_VERSION_BUILD 25
+#define CLIENT_VERSION_BUILD 50
 
 //! Set to true for release, false for prerelease or test build
-#define CLIENT_VERSION_IS_RELEASE false
+#define CLIENT_VERSION_IS_RELEASE true
 
 /**
  * Copyright year (2009-this)

diff --git a/src/deprecation.h b/src/deprecation.h
@@ -9,7 +9,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 = 1028680; // +6 month
+static const int APPROX_RELEASE_HEIGHT = 1208650; // Aug 2023
 static const int WEEKS_UNTIL_DEPRECATION = 16;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);
 

diff --git a/src/metrics.cpp b/src/metrics.cpp
@@ -461,7 +461,7 @@ void ThreadShowMetricsScreen()
         std::cout << std::endl;
 
         // Thank you text
-        std::cout << _("BTCZ Node Version 2.0.8-RC1 (YODA) - Protocol 770008") << std::endl;
+        std::cout << _("BTCZ Node Version 2.0.8 (YODA) - Protocol 770008") << std::endl;
         std::cout << _("Thank you for running a BitcoinZ node!") << std::endl;
         std::cout << _("You're helping to strengthen the network and contributing to a social good :)") << std::endl;
     }