Fix signrawtransaction (#29)

* Update deprecation.h * Versioning changes for 2.0.5-1 Signed-off-by: cryptobubbles <[email protected]> * Updated manpages for 2.0.5-1 Signed-off-by: cryptobubbles <[email protected]> * Updated release notes and changelog for 2.0.5-1 Signed-off-by: cryptobubbles <[email protected]> * Update zcbenchmarks.cpp Implement zcash fix in order to avoid error during mac os build. * Update release notes Signed-off-by: cryptobubbles <[email protected]>
ZclassicCommunity · Sep 2, 2019 · 845a2d8 · 845a2d8
1 parent d57bf7a
commit 845a2d8
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-ZClassic 2.0.5
+ZClassic 2.0.5-1
 <img align="right" width="120" height="80" src="doc/imgs/logo.png">
 ===========
 
@@ -45,7 +45,7 @@ Clone the repository
 ```{r, engine='bash'}
 git clone https://github.com/ZclassicCommunity/zclassic.git
 cd zclassic
-git checkout v2.0.5
+git checkout v2.0.5-1
 ```
 
  Get dependencies

diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 5)
-define(_CLIENT_VERSION_BUILD, 50)
+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)))
 define(_CLIENT_VERSION_IS_RELEASE, true)

diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZCLASSIC-CLI "1" "August 2019" "zclassic-cli v2.0.5-21efb9265" "User Commands"
+.TH ZCLASSIC-CLI "1" "September 2019" "zclassic-cli v2.0.5" "User Commands"
 .SH NAME
-zclassic-cli \- manual page for zclassic-cli v2.0.5-21efb9265
+zclassic-cli \- manual page for zclassic-cli v2.0.5
 .SH DESCRIPTION
-Zclassic RPC client version v2.0.5\-21efb9265
+Zclassic RPC client version v2.0.5
 .PP
 In order to ensure you are adequately protecting your privacy when using
 ZClassic, please see <https://z.cash/support/security/>.

diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZCLASSIC-TX "1" "August 2019" "zclassic-tx v2.0.5-21efb9265" "User Commands"
+.TH ZCLASSIC-TX "1" "September 2019" "zclassic-tx v2.0.5" "User Commands"
 .SH NAME
-zclassic-tx \- manual page for zclassic-tx v2.0.5-21efb9265
+zclassic-tx \- manual page for zclassic-tx v2.0.5
 .SH DESCRIPTION
-ZClassic zclassic\-tx utility version v2.0.5\-21efb9265
+ZClassic zclassic\-tx utility version v2.0.5
 .SS "Usage:"
 .TP
 zclassic\-tx [options] <hex\-tx> [commands]

diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZCLASSICD "1" "August 2019" "zclassicd v2.0.5-21efb9265" "User Commands"
+.TH ZCLASSICD "1" "September 2019" "zclassicd v2.0.5" "User Commands"
 .SH NAME
-zclassicd \- manual page for zclassicd v2.0.5-21efb9265
+zclassicd \- manual page for zclassicd v2.0.5
 .SH DESCRIPTION
-ZClassic Daemon version v2.0.5\-21efb9265
+ZClassic Daemon version v2.0.5
 .PP
 In order to ensure you are adequately protecting your privacy when using
 ZClassic, please see <https://z.cash/support/security/>.

diff --git a/doc/release-notes/release-notes-2.0.5-1.md b/doc/release-notes/release-notes-2.0.5-1.md
@@ -0,0 +1,15 @@
+Notable changes
+===============
+
+Fix signrawtransaction on mainnet
+---------------------------------
+Signrawtransaction was failing because APPROX_RELEASE_HEIGHT and Bubbles activation height were same.
+
+Fix build error on mac os
+-------------------------
+Patched zcbenchmarks.cpp
+
+Changelog
+=========
+Reduced the APPROX_RELEASE_HEIGHT to 582000 so that it is lower than the Bubbles activation height.
+Patched zcbenchmarks.cpp to fix build error on mac os.
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -18,7 +18,7 @@
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 0
 #define CLIENT_VERSION_REVISION 5
-#define CLIENT_VERSION_BUILD 50
+#define CLIENT_VERSION_BUILD 51
 
 //! 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 = 585318;
+static const int APPROX_RELEASE_HEIGHT = 582000;
 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/zcbenchmarks.cpp b/src/zcbenchmarks.cpp
@@ -453,9 +453,11 @@ double benchmark_increment_sapling_note_witnesses(size_t nTxs)
 // This class is based on the class CCoinsViewDB, but with limited functionality.
 // The construtor and the functions `GetCoins` and `HaveCoins` come directly from
 // CCoinsViewDB, but the rest are either mocks and/or don't really do anything.
+
+// The following constant is a duplicate of the one found in txdb.cpp
+static const char DB_COINS = 'c';
+
 class FakeCoinsViewDB : public CCoinsView {
-    // The following constant is a duplicate of the one found in txdb.cpp
-    static const char DB_COINS = 'c';
 
     CDBWrapper db;