Navigation Menu

Skip to content

Commit

Permalink
dep height (#57)
Browse files Browse the repository at this point in the history
* adjust dep-height before major update

* bump revision and build

* bump version

* version fix

* bump versions
  • Loading branch information
cryptorex authored and renuzit committed Mar 11, 2019
1 parent 485b080 commit b788da8
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions 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>.
Expand Down
6 changes: 3 additions & 3 deletions 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]
Expand Down
6 changes: 3 additions & 3 deletions 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/>.
Expand Down
4 changes: 2 additions & 2 deletions src/clientversion.h
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/deprecation.h
Expand Up @@ -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);

Expand Down

0 comments on commit b788da8

Please sign in to comment.