Merge tag '1.4.1'

btcz · Mar 11, 2019 · 8e6b5a0 · 8e6b5a0
2 parents e698d4c + b788da8
commit 8e6b5a0
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 21 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,3 +3,4 @@ doc/man/Makefile
 src/Makefile
 Dockerfile
 qa/Dockerfile.test
+qa/docker-run-tests.sh
diff --git a/configure.ac b/configure.ac
@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 4)
-define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 51)
+define(_CLIENT_VERSION_REVISION, 1)
+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, true)

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.3.
-.TH BITCOINZ-CLI "1" "June 2018" "bitcoinz-cli v1.4.0" "User Commands"
+.TH BITCOINZ-CLI "1" "March 2019" "bitcoinz-cli v1.4.1" "User Commands"
 .SH NAME
-bitcoinz-cli \- manual page for bitcoinz-cli v1.4.0
+bitcoinz-cli \- manual page for bitcoinz-cli v1.4.1
 .SH DESCRIPTION
-BitcoinZ RPC client version v1.4.0
+BitcoinZ RPC client version v1.4.1
 .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.3.
-.TH BITCOINZ-TX "1" "June 2018" "bitcoinz-tx v1.4.0" "User Commands"
+.TH BITCOINZ-TX "1" "March 2019" "bitcoinz-tx v1.4.1" "User Commands"
 .SH NAME
-bitcoinz-tx \- manual page for bitcoinz-tx v1.4.0
+bitcoinz-tx \- manual page for bitcoinz-tx v1.4.1
 .SH DESCRIPTION
-BitcoinZ bitcoinz\-tx utility version v1.4.0
+BitcoinZ bitcoinz\-tx utility version v1.4.1
 .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.3.
-.TH BITCOINZD "1" "June 2018" "bitcoinzd v1.4.0" "User Commands"
+.TH BITCOINZD "1" "March 2019" "bitcoinzd v1.4.1" "User Commands"
 .SH NAME
-bitcoinzd \- manual page for bitcoinzd v1.4.0
+bitcoinzd \- manual page for bitcoinzd v1.4.1
 .SH DESCRIPTION
-BitcoinZ Daemon version v1.4.0
+BitcoinZ Daemon version v1.4.1
 .PP
 In order to ensure you are adequately protecting your privacy when using
 BitcoinZ, please see <https://z.cash/support/security/>.

diff --git a/qa/bitcoinz/full_test_suite.py b/qa/bitcoinz/full_test_suite.py
@@ -67,7 +67,7 @@ def check_security_hardening():
     ret &= test_rpath_runpath('src/zcash-gtest')
     ret &= test_rpath_runpath('src/bitcoinz-tx')
     ret &= test_rpath_runpath('src/test/test_bitcoin')
-    ret &= test_rpath_runpath('src/bitcoinz/GenerateParams')
+    ret &= test_rpath_runpath('src/zcash/GenerateParams')
 
     # NOTE: checksec.sh does not reliably determine whether FORTIFY_SOURCE
     # is enabled for the entire binary. See issue #915.
@@ -76,7 +76,7 @@ def check_security_hardening():
     ret &= test_fortify_source('src/zcash-gtest')
     ret &= test_fortify_source('src/bitcoinz-tx')
     ret &= test_fortify_source('src/test/test_bitcoin')
-    ret &= test_fortify_source('src/bitcoinz/GenerateParams')
+    ret &= test_fortify_source('src/zcash/GenerateParams')
 
     return ret
 

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -57,7 +57,7 @@ class CMainParams : public CChainParams {
         pchMessageStart[1] = 0xe9;
         pchMessageStart[2] = 0x27;
         pchMessageStart[3] = 0x64;
-        vAlertPubKey = ParseHex("048679fb891b15d0cada9692047fd0ae26ad8bfb83fabddbb50334ee5bc0683294deb410be20513c5af6e7b9cec717ade82b27080ee6ef9a245c36a795ab044bb3");
+        vAlertPubKey = ParseHex("04d5212ed0303c64db1840e799d31953eb362fd71d8e742dccd9aa78c4713d6d26b44974b44e2ac71aa38b06ef60c020207b85d270e4bdf8c797f3216f969960dc");
         nDefaultPort = 1989;
         nMaxTipAge = 24 * 60 * 60;
         nPruneAfterHeight = 100000;
@@ -142,12 +142,14 @@ class CMainParams : public CChainParams {
             ( 84208, uint256S("0x0000000328e5d0346a78aea2d586154ab3145d51ba3936998253593b0ab2980c"))
             ( 105841, uint256S("0x000000010305387fd72bc70ce5cc5b512fe513016e7208b9ee61d601fe212991"))  //Dr Hawking, Rest in peace.
             ( 140000, uint256S("0x0000000155f89d1ededf519c6445d41c9240ee4daa721c91c19eea0faa2f02c8"))
-            ( 153955, uint256S("0x00000006913d3122f32e60c9d64e87edd8e9a05444447df49713c15fbae6484d")),
+            ( 153955, uint256S("0x00000006913d3122f32e60c9d64e87edd8e9a05444447df49713c15fbae6484d"))
+            ( 160011, uint256S("0x0003a9fbed918bdd83fb5d38016189d5b8fe77495d4a7bd2405d3e8a04a62201"))  //18-06-17  8am UTC Hooray for Zhash!
+            ( 166500, uint256S("0x0000002b640d62dd0c2ab68774b05297d2aa72bd63997d3a73ad959963b148d8")),
 
-            1528292585,     // * UNIX timestamp of last checkpoint block
-            616001,         // * total number of transactions between genesis and last checkpoint
+            1530166456,     // * UNIX timestamp of last checkpoint block
+            662217,         // * total number of transactions between genesis and last checkpoint
                             //   (the tx=... number in the SetBestChain debug.log lines)
-            2304.6771849  // * estimated number of transactions per day after checkpoint
+            2290.912865  // * estimated number of transactions per day after checkpoint
                             //   total number of tx / (checkpoint block height / (24 * 24))
         };
 

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -18,8 +18,8 @@
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 4
-#define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 51
+#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_BUILD 50
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

diff --git 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 = 249000;
+static const int APPROX_RELEASE_HEIGHT = 649000;
 static const int WEEKS_UNTIL_DEPRECATION = 16;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);