Merge pull request miketout#328 from VerusCoin/dev

Dev
Mr-Bossman · May 10, 2021 · d53d211 · d53d211
2 parents 64cbafb + 7ddae43
commit d53d211
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 12 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
 ####START####                                     PROJECT LEVEL VARIABLES                                  ####START####
 ########################################################################################################################
 variables:
-  VERSION: 0.7.3-1
+  VERSION: 0.7.3-2
   VERUS_CLI_ARM64_LINUX: Verus-CLI-Linux-v${VERSION}-arm64.tar.gz
   VERUS_CLI_LINUX_X86_64: Verus-CLI-Linux-v${VERSION}-x86_64.tar.gz
   VERUS_CLI_WINDOWS: Verus-CLI-Windows-v${VERSION}.zip

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## VerusCoin version 0.7.3-1
+## VerusCoin version 0.7.3-2
 
 Arguably the world's most advanced technology, zero knowledge privacy-centric blockchain, Verus Coin brings Sapling performance and zero knowledge features to an intelligent system with interchain smart contracts and a completely original, combined proof of stake/proof of work consensus algorithm that solves the nothing at stake problem. With this and its approach towards CPU mining and ASICs, Verus Coin strives to be one of the most naturally decentralizing and attack resistant blockchains in existence.
 

diff --git a/doc/man/verus-cli/linux/README.txt b/doc/man/verus-cli/linux/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.7.3-1
+VerusCoin Command Line Tools v0.7.3-2
 
 Contents:
 verusd - VerusCoin daemon

diff --git a/doc/man/verus-cli/mac/README.txt b/doc/man/verus-cli/mac/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.7.3-1
+VerusCoin Command Line Tools v0.7.3-2
 Contents:
 verusd - VerusCoin daemon.
 verus - VerusCoin command line utility.

diff --git a/doc/man/verus-cli/windows/README.txt b/doc/man/verus-cli/windows/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.7.3-1
+VerusCoin Command Line Tools v0.7.3-2
 Contents:
 verusd.exe - VerusCoin daemon
 verus.exe - VerusCoin command line utility

diff --git a/src/deprecation.h b/src/deprecation.h
@@ -8,7 +8,7 @@
 // Deprecation policy:
 // * Shut down 20 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 = 1510000;
+static const int APPROX_RELEASE_HEIGHT = 1513000;
 static const int WEEKS_UNTIL_DEPRECATION = 20;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 60 * 24);
 

diff --git a/src/transaction_builder.cpp b/src/transaction_builder.cpp
@@ -313,9 +313,10 @@ TransactionBuilderResult TransactionBuilder::Build()
 
         bool hasNativeChange = change > 0;
 
-        if ((hasNativeChange || hasReserveChange) && !tChangeAddr)
+        if ((hasNativeChange && (!tChangeAddr && !saplingChangeAddr && spends.empty())) || (hasReserveChange && !tChangeAddr))
         {
-            printf("%s: reserveChange: %s\n", __func__, reserveChange.ToUniValue().write(1,2).c_str());
+            printf("%s: nativeChange: %ld, reserveChange: %s\n", __func__, change, reserveChange.ToUniValue().write(1,2).c_str());
+            LogPrintf("%s: nativeChange: %ld, reserveChange: %s\n", __func__, change, reserveChange.ToUniValue().write(1,2).c_str());
             return TransactionBuilderResult("Reserve change must be sent to a transparent change address or VerusID");
         }
 
@@ -349,7 +350,7 @@ TransactionBuilderResult TransactionBuilder::Build()
             {
                 // tChangeAddr has already been validated.
                 AddTransparentOutput(tChangeAddr.value(), change);
-            } else if (!spends.empty()) 
+            } else if (!spends.empty())
             {
                 auto fvk = spends[0].expsk.full_viewing_key();
                 auto note = spends[0].note;

diff --git a/src/version.h b/src/version.h
@@ -35,6 +35,6 @@ static const int MEMPOOL_GD_VERSION = 60002;
 static const int NO_BLOOM_VERSION = 170004;
 
 #define KOMODO_VERSION "0.2.1"
-#define VERUS_VERSION "0.7.3-1"
+#define VERUS_VERSION "0.7.3-2"
 
 #endif // BITCOIN_VERSION_H
diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
@@ -280,8 +280,6 @@ bool ShieldToAddress::operator()(const libzcash::SaplingPaymentAddress &zaddr) c
     // Send all value to the target z-addr
     m_op->builder_.SendChangeTo(zaddr, ovk);
 
-
-
     // Build the transaction
     m_op->tx_ = m_op->builder_.Build().GetTxOrThrow();