Better logging for CheckCoinSpend

Fuzzbawls · Fuzzbawls · commit 4e5dc84faf91 · 2019-03-22T17:28:24.000-07:00
Also re-introduce the regtest specific conditional
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -4684,10 +4684,10 @@ bool CWallet::CheckCoinSpend(libzerocoin::CoinSpend& spend, libzerocoin::Accumul
 {
     if (!spend.Verify(accumulator)) {
         receipt.SetStatus(_("The transaction did not verify"), ZPIV_BAD_SERIALIZATION);
-        return false;
+        return error("%s : The transaction did not verify", __func__);
     }
 
-    if (IsSerialKnown(spend.getCoinSerialNumber())) {
+    if (Params().NetworkID() != CBaseChainParams::REGTEST && IsSerialKnown(spend.getCoinSerialNumber())) {
         //Tried to spend an already spent zPIV
         receipt.SetStatus(_("The coin spend has been used"), ZPIV_SPENT_USED_ZPIV);
         uint256 hashSerial = GetSerialHash(spend.getCoinSerialNumber());

Original file line number	Diff line number	Diff line change
`@@ -4684,10 +4684,10 @@ bool CWallet::CheckCoinSpend(libzerocoin::CoinSpend& spend, libzerocoin::Accumul`
`4684`	`4684`	`{`
`4685`	`4685`	`if (!spend.Verify(accumulator)) {`
`4686`	`4686`	`receipt.SetStatus(_("The transaction did not verify"), ZPIV_BAD_SERIALIZATION);`
`4687`		`- return false;`
	`4687`	`+ return error("%s : The transaction did not verify", __func__);`
`4688`	`4688`	`}`
`4689`	`4689`
`4690`		`- if (IsSerialKnown(spend.getCoinSerialNumber())) {`
	`4690`	`+ if (Params().NetworkID() != CBaseChainParams::REGTEST && IsSerialKnown(spend.getCoinSerialNumber())) {`
`4691`	`4691`	`//Tried to spend an already spent zPIV`
`4692`	`4692`	`receipt.SetStatus(_("The coin spend has been used"), ZPIV_SPENT_USED_ZPIV);`
`4693`	`4693`	`uint256 hashSerial = GetSerialHash(spend.getCoinSerialNumber());`