From b0446eb88962afcfe6285aabc9ebc78e4d9c443e Mon Sep 17 00:00:00 2001 From: Marcelus <37587839+MarcelusCH@users.noreply.github.com> Date: Sun, 17 May 2020 18:33:08 +0200 Subject: [PATCH 1/2] Block height deprecation updated to 743740 (+ one year). (#62) deprecation height adjust, version bump 2.0.6, some copyright info. --- COPYING | 1 + configure.ac | 4 ++-- contrib/gitian-descriptors/gitian-linux.yml | 2 +- doc/release-notes/release-notes-2.0.6.md | 7 +++++++ src/clientversion.h | 6 +++--- src/deprecation.h | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 doc/release-notes/release-notes-2.0.6.md diff --git a/COPYING b/COPYING index 2970e8efd..2dd806c6c 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,7 @@ Copyright (c) 2016-2019 The Zcash developers Copyright (c) 2009-2019 The Bitcoin Core developers Copyright (c) 2009-2019 Bitcoin Developers +Copyright (c) 2018-2020 The BitcoinZ Community Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/configure.ac b/configure.ac index ec8ab0141..53d85ce17 100644 --- a/configure.ac +++ b/configure.ac @@ -2,12 +2,12 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 5) +define(_CLIENT_VERSION_REVISION, 6) 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) -define(_COPYRIGHT_YEAR, 2019) +define(_COPYRIGHT_YEAR, 2020) 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]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 713502775..157a3c9d6 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoinz-2.0.5" +name: "bitcoinz-2.0.6" enable_cache: true distro: "debian" suites: diff --git a/doc/release-notes/release-notes-2.0.6.md b/doc/release-notes/release-notes-2.0.6.md new file mode 100644 index 000000000..3da8e53d8 --- /dev/null +++ b/doc/release-notes/release-notes-2.0.6.md @@ -0,0 +1,7 @@ +Changelog +========= + +Marcelus (3): + Changed deprecation height + Updated copyright + Updated version info diff --git a/src/clientversion.h b/src/clientversion.h index 21c0b7956..1bf4de214 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin Core developers // Copyright (c) 2016-2019 The Zcash developers -// Copyright (c) 2017-2018 The BitcoinZ Community +// Copyright (c) 2017-2020 The BitcoinZ Community // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -18,7 +18,7 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 5 +#define CLIENT_VERSION_REVISION 6 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build @@ -28,7 +28,7 @@ * Copyright year (2009-this) * Todo: update this when changing our copyright comments in the source */ -#define COPYRIGHT_YEAR 2019 +#define COPYRIGHT_YEAR 2020 #endif //HAVE_CONFIG_H diff --git a/src/deprecation.h b/src/deprecation.h index 13c752c42..bfcf53eab 100644 --- 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 = 533500; +static const int APPROX_RELEASE_HEIGHT = 743740; static const int WEEKS_UNTIL_DEPRECATION = 16; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); From 2235d578131d908b411011f3720767bc6738aed2 Mon Sep 17 00:00:00 2001 From: cryptorex Date: Sun, 17 May 2020 12:20:30 -0500 Subject: [PATCH 2/2] remove archived win repo reference --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index b90889954..205973650 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ cd src/ ./bitcoinz-cli z_getnewaddress # Test checking transparent balance ./bitcoinz-cli getbalance -# Test checking total balance +# Test checking total balance ./bitcoinz-cli z_gettotalbalance # Check all available wallet commands ./bitcoinz-cli help @@ -119,9 +119,6 @@ COPY bitcoinz.conf /bitcoinz/data/bitcoinz.conf Then, build with `docker build -t my-bitcoinz .` and run. -### Windows -Windows build is maintained in [bitcoinz-win project](https://github.com/bitcoinz-pod/bitcoinz-win). - Security Warnings -----------------