diff --git a/configure.ac b/configure.ac index 7af12d382..b90f165f5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) -define(_CLIENT_VERSION_MINOR, 3) -define(_CLIENT_VERSION_REVISION, 1) +define(_CLIENT_VERSION_MINOR, 4) +define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 51) 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))) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index c6509473d..d41c80a73 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,5 +1,5 @@ -bitcoinz (1.3.0) stable; urgency=medium +bitcoinz (1.4.0) stable; urgency=high - * 1.3.0 release. + * 1.4.0 release. - -- The BitcoinZ Community Sat, 10 June 2018 00:15:00 +0100 + -- The BitcoinZ Community Fri, 15 June 2018 00:15:00 +0100 diff --git a/contrib/debian/control b/contrib/debian/control index b1ba34bc7..30ae24bf1 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -11,7 +11,7 @@ Vcs-Git: https://github.com/btcz/bitcoinz.git Vcs-Browser: https://github.com/btcz Package: bitcoinz -Version: 1.3.0 +Version: 1.4.0 Depends: ${shlibs:Depends} Architecture: all Description: BitcoinZ is a decentralized community project based on the Bitcoin and Zcash codebase. diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index bc4f2100a..5d860368b 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoinz-1.3.0" +name: "bitcoinz-1.4.0" enable_cache: true distro: "debian" suites: diff --git a/doc/man/bitcoinz-cli.1 b/doc/man/bitcoinz-cli.1 index 7613fac89..12cf63099 100644 --- 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.3.0" "User Commands" +.TH BITCOINZ-CLI "1" "June 2018" "bitcoinz-cli v1.4.0" "User Commands" .SH NAME -bitcoinz-cli \- manual page for bitcoinz-cli v1.3.0 +bitcoinz-cli \- manual page for bitcoinz-cli v1.4.0 .SH DESCRIPTION -BitcoinZ RPC client version v1.3.0 +BitcoinZ RPC client version v1.4.0 .PP In order to ensure you are adequately protecting your privacy when using BitcoinZ, please see . diff --git a/doc/man/bitcoinz-tx.1 b/doc/man/bitcoinz-tx.1 index 2d7e271d0..a00843dfc 100644 --- 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.3.0" "User Commands" +.TH BITCOINZ-TX "1" "June 2018" "bitcoinz-tx v1.4.0" "User Commands" .SH NAME -bitcoinz-tx \- manual page for bitcoinz-tx v1.3.0 +bitcoinz-tx \- manual page for bitcoinz-tx v1.4.0 .SH DESCRIPTION -BitcoinZ bitcoinz\-tx utility version v1.3.0 +BitcoinZ bitcoinz\-tx utility version v1.4.0 .SS "Usage:" .TP bitcoinz\-tx [options] [commands] diff --git a/doc/man/bitcoinzd.1 b/doc/man/bitcoinzd.1 index 53c7fd92c..c698e911d 100644 --- 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.3.0" "User Commands" +.TH BITCOINZD "1" "June 2018" "bitcoinzd v1.4.0" "User Commands" .SH NAME -bitcoinzd \- manual page for bitcoinzd v1.3.0 +bitcoinzd \- manual page for bitcoinzd v1.4.0 .SH DESCRIPTION -BitcoinZ Daemon version v1.3.0 +BitcoinZ Daemon version v1.4.0 .PP In order to ensure you are adequately protecting your privacy when using BitcoinZ, please see . diff --git a/src/clientversion.h b/src/clientversion.h index 03903b7cb..bad31e66c 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,7 +17,7 @@ //! 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 3 +#define CLIENT_VERSION_MINOR 4 #define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 51 diff --git a/src/main.cpp b/src/main.cpp index ed564c007..7dd0d9d35 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3010,7 +3010,7 @@ bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, bool f return state.Invalid(error("CheckBlockHeader(): block timestamp too far in the future"), REJECT_INVALID, "time-too-new"); - // starting at height 158750, decrease to 30 minute window to decrease effectiveness of timewarp attack. + // starting at height 159300, decrease to 30 minute window to decrease effectiveness of timewarp attack. else if (nHeight >= chainParams.GetNewTimeRule() && block.GetBlockTime() > GetAdjustedTime() + 30 * 60) return state.Invalid(error("CheckBlockHeader(): block timestamp too far in the future"), REJECT_INVALID, "time-too-new");