Merge pull request #61 from zerocurrencycoin/v3.1.2

V3.1.2

README.md

@@ -1,30 +1,30 @@
 ![alt text](https://github.com/zerocurrencycoin/Zero/blob/master/art/zero%203d%20mountain.png?raw=true)
 
-[ZERO](https://zerocurrency.io) - [Cygnus:3.1.1](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.1)
+[ZERO](https://zerocurrency.io) - [Draco:3.2.0](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.2.0)
 
 ||FAST|| ||DECENTRALISED|| ||ANONYMOUS|| ||SECURE|| ||ASIC RESISTANT||  - LAUNCE DATE: 2017-02-19
 
 GENESIS BLOCK - 19th Feb 2017 11:26:40 - 068cbb5db6bc11be5b93479ea4df41fa7e012e92ca8603c315f9b1a2202205c6
 
-Download the latest version here - [ZERO - Latest Version - Cygnus:3.1.1](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.1)
+Download the latest version here - [ZERO - Latest Version - Draco:3.2.0](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.2.0)
 
 ------------------------------------------
 
 ❓ What is ZERO?
 --------------
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.1) is a revolutionary cryptocurrency and transaction platform based on Zcash.
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.2.0) is a revolutionary cryptocurrency and transaction platform based on Zcash.
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.1) offers total payment confidentiality, while still maintaining a decentralised network using a public blockchain.
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.2.0) offers total payment confidentiality, while still maintaining a decentralised network using a public blockchain.
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.1) combines Bitcoin’s security with Zcash’s anonymity and privacy.
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.2.0) combines Bitcoin’s security with Zcash’s anonymity and privacy.
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.1) stands out from the competition as a fully working product that has already
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.2.0) stands out from the competition as a fully working product that has already
 implemented a set of special features not found in any other cryptocurrency.
 
 Our main focus as a team and community is to remain as transparent as we can possibly be and to maintain an interactive relationship with everyone involved. We are fully open about the project, listening to all suggestions from investors, miners and supporters.
 
-This software is the [ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.1) node. It downloads and stores the entire history of ZERO's transactions, about 1.2GB at this point.
+This software is the [ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.2.0) node. It downloads and stores the entire history of ZERO's transactions, about 1.2GB at this point.
 Depending on the speed of your computer and network connection, the synchronization process could take several hours.
 
 ------------------------------------------
@@ -128,7 +128,7 @@ See important security warnings on the
 
 📒 Deprecation Policy
 ------------------
-Disabledeprecation flag has been removed. Old nodes will automatically be shut down and must be upgraded upon reaching the deprecation block height, which will occur approximately 26 weeks (1/2/2021) from the release of v3.1.1.
+Disabledeprecation flag has been removed. Old nodes will automatically be shut down and must be upgraded upon reaching the deprecation block height, which will occur approximately 26 weeks (6/26/2021) from the release of v3.2.0.
 
 
 🔧 Building

configure.ac

@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
-define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 2)
+define(_CLIENT_VERSION_REVISION, 0)
 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)))

doc/man/zero-cli.1

@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZERO-CLI "1" "December 2019" "zero-cli v3.1.1-79779934a" "User Commands"
+.TH ZERO-CLI "1" "December 2019" "zero-cli v3.2.0-79779934a" "User Commands"
 .SH NAME
-zero-cli \- manual page for zero-cli v3.1.1-79779934a
+zero-cli \- manual page for zero-cli v3.2.0-79779934a
 .SH DESCRIPTION
-Zero RPC client version v3.1.1\-79779934a
+Zero RPC client version v3.2.0\-79779934a
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.

doc/man/zero-tx.1

@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZERO-TX "1" "December 2019" "zero-tx v3.1.1-79779934a" "User Commands"
+.TH ZERO-TX "1" "December 2019" "zero-tx v3.2.0-79779934a" "User Commands"
 .SH NAME
-zero-tx \- manual page for zero-tx v3.1.1-79779934a
+zero-tx \- manual page for zero-tx v3.2.0-79779934a
 .SH DESCRIPTION
-Zero zero\-tx utility version v3.1.1\-79779934a
+Zero zero\-tx utility version v3.2.0\-79779934a
 .SS "Usage:"
 .TP
 zero\-tx [options] <hex\-tx> [commands]

doc/man/zerod.1

@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZEROD "1" "December 2019" "zerod v3.1.1-79779934a" "User Commands"
+.TH ZEROD "1" "December 2019" "zerod v3.2.0-79779934a" "User Commands"
 .SH NAME
-zerod \- manual page for zerod v3.1.1-79779934a
+zerod \- manual page for zerod v3.2.0-79779934a
 .SH DESCRIPTION
-Zero Daemon version v3.1.1\-79779934a
+Zero Daemon version v3.2.0\-79779934a
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.

src/Makefile.am

@@ -95,9 +95,11 @@ LIBZCASH_H = \
   zcash/Note.hpp \
   zcash/prf.h \
   zcash/Proof.hpp \
+	zcash/address/sapling.hpp \
+	zcash/address/sprout.hpp \
   zcash/util.h \
   zcash/Zcash.h \
-  zcash/zip32.h
+  zcash/address/zip32.h
 
 .PHONY: FORCE check-symbols check-security
 # bitcoin core #
@@ -343,7 +345,8 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/wallet.cpp \
   wallet/wallet_ismine.cpp \
   wallet/walletdb.cpp \
-	wallet/witness.cpp \
+  wallet/witness.cpp \
+  zcash/address/zip32.cpp \
   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)
 
@@ -548,7 +551,9 @@ libzcash_a_SOURCES = \
   zcash/Note.cpp \
   zcash/prf.cpp \
   zcash/util.cpp \
-  zcash/zip32.cpp
+	zcash/address/sapling.cpp \
+	zcash/address/sprout.cpp \
+  zcash/address/zip32.cpp
 
 libzcash_a_CPPFLAGS = $(AM_CPPFLAGS) $(PIC_FLAGS) -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES)
 libzcash_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)

src/chainparams.cpp

@@ -192,6 +192,7 @@ class CMainParams : public CChainParams {
         bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviews";
         bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivks";
         bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-main";
+        bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviews";
 
         fMiningRequiresPeers = true;
         fDefaultConsistencyChecks = false;
@@ -359,6 +360,7 @@ class CTestNetParams : public CChainParams {
         bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviewtestsapling";
         bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivktestsapling";
         bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-test";
+        bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviewtestsapling";
 
         fMiningRequiresPeers = true;
         fDefaultConsistencyChecks = false;
@@ -508,6 +510,7 @@ class CRegTestParams : public CChainParams {
         bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviewregtestsapling";
         bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivkregtestsapling";
         bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-regtest";
+        bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviewregtestsapling";
 
         fMiningRequiresPeers = false;
         fDefaultConsistencyChecks = true;

src/chainparams.h

@@ -61,6 +61,7 @@ class CChainParams
         SAPLING_FULL_VIEWING_KEY,
         SAPLING_INCOMING_VIEWING_KEY,
         SAPLING_EXTENDED_SPEND_KEY,
+        SAPLING_EXTENDED_FVK,
 
         MAX_BECH32_TYPES
     };

src/clientversion.cpp

@@ -19,7 +19,7 @@
  * for both bitcoind and bitcoin-core, to make it harder for attackers to
  * target servers or GUI users specifically.
  */
-const std::string CLIENT_NAME("Cygnus");
+const std::string CLIENT_NAME("Draco");
 
 /**
  * Client version number

src/deprecation.h

@@ -8,7 +8,7 @@
 // Deprecation policy:
 // * Shut down 26 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 4 weeks' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 886075;
+static const int APPROX_RELEASE_HEIGHT = 1012601;
 static const int WEEKS_UNTIL_DEPRECATION = 26;
 //Fixing zero day size
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 30);

src/gtest/test_keys.cpp

@@ -1,7 +1,7 @@
 #include <chainparams.h>
 #include <key_io.h>
 #include <zcash/Address.hpp>
-#include <zcash/zip32.h>
+#include <zcash/address/zip32.h>
 
 #include "utiltest.h"
 

src/gtest/test_keystore.cpp

@@ -9,7 +9,7 @@
 #endif
 #include "utiltest.h"
 #include "zcash/Address.hpp"
-#include "zcash/zip32.h"
+#include "zcash/address/zip32.h"
 
 #include "json_test_vectors.h"
 
@@ -196,34 +196,36 @@ TEST(keystore_tests, StoreAndRetrieveViewingKey) {
 TEST(keystore_tests, StoreAndRetrieveSaplingSpendingKey) {
     CBasicKeyStore keyStore;
     libzcash::SaplingExtendedSpendingKey skOut;
-    libzcash::SaplingFullViewingKey fvkOut;
+    libzcash::SaplingExtendedFullViewingKey extfvkOut;
     libzcash::SaplingIncomingViewingKey ivkOut;
 
-    auto sk = GetTestMasterSaplingSpendingKey();
-    auto fvk = sk.expsk.full_viewing_key();
-    auto ivk = fvk.in_viewing_key();
+    std::vector<unsigned char, secure_allocator<unsigned char>> rawSeed(32);
+    HDSeed seed(rawSeed);
+    auto sk = libzcash::SaplingExtendedSpendingKey::Master(seed);
+    auto extfvk = sk.ToXFVK();
+    auto ivk = extfvk.fvk.in_viewing_key();
     auto addr = sk.DefaultAddress();
 
     // Sanity-check: we can't get a key we haven't added
-    EXPECT_FALSE(keyStore.HaveSaplingSpendingKey(fvk));
-    EXPECT_FALSE(keyStore.GetSaplingSpendingKey(fvk, skOut));
+    EXPECT_FALSE(keyStore.HaveSaplingSpendingKey(extfvk));
+    EXPECT_FALSE(keyStore.GetSaplingSpendingKey(extfvk, skOut));
     // Sanity-check: we can't get a full viewing key we haven't added
     EXPECT_FALSE(keyStore.HaveSaplingFullViewingKey(ivk));
-    EXPECT_FALSE(keyStore.GetSaplingFullViewingKey(ivk, fvkOut));
+    EXPECT_FALSE(keyStore.GetSaplingFullViewingKey(ivk, extfvkOut));
     // Sanity-check: we can't get an incoming viewing key we haven't added
     EXPECT_FALSE(keyStore.HaveSaplingIncomingViewingKey(addr));
     EXPECT_FALSE(keyStore.GetSaplingIncomingViewingKey(addr, ivkOut));
 
     // When we specify the default address, we get the full mapping
-    keyStore.AddSaplingSpendingKey(sk, addr);
-    EXPECT_TRUE(keyStore.HaveSaplingSpendingKey(fvk));
-    EXPECT_TRUE(keyStore.GetSaplingSpendingKey(fvk, skOut));
+    keyStore.AddSaplingSpendingKey(sk);
+    EXPECT_TRUE(keyStore.HaveSaplingSpendingKey(extfvk));
+    EXPECT_TRUE(keyStore.GetSaplingSpendingKey(extfvk, skOut));
     EXPECT_TRUE(keyStore.HaveSaplingFullViewingKey(ivk));
-    EXPECT_TRUE(keyStore.GetSaplingFullViewingKey(ivk, fvkOut));
+    EXPECT_TRUE(keyStore.GetSaplingFullViewingKey(ivk, extfvkOut));
     EXPECT_TRUE(keyStore.HaveSaplingIncomingViewingKey(addr));
     EXPECT_TRUE(keyStore.GetSaplingIncomingViewingKey(addr, ivkOut));
     EXPECT_EQ(sk, skOut);
-    EXPECT_EQ(fvk, fvkOut);
+    EXPECT_EQ(extfvk, extfvkOut);
     EXPECT_EQ(ivk, ivkOut);
 }
 

src/gtest/test_zip32.cpp

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include <zcash/zip32.h>
+#include <zcash/address/zip32.h>
 
 // From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/sapling_zip32.py
 // Sapling consistently uses little-endian encoding, but uint256S takes its input in