Stop building witnesses if abortrescan is called #331

src/net.cpp

@@ -2468,7 +2468,7 @@ void RelayTransaction(const CTransaction& tx, const CDataStream& ss)
         fprintf(stderr, "%s: -testnode=1, no peers, not relaying\n", __func__ );
         return;
     } else {
-        fprintf(stderr, "%s: Relaying to %lu of %lu peers\n", __func__, newSize, vNodes.size() );
+        fprintf(stderr, "%s: Relaying %s to %lu of %lu peers\n", __func__, tx.GetHash().GetHex().c_str(), newSize, vNodes.size() );
     }
 
     // Only relay to randomly chosen 50% of peers

src/transaction_builder.cpp

@@ -182,7 +182,7 @@ boost::optional<CTransaction> TransactionBuilder::Build()
 
     auto ctx = librustzcash_sapling_proving_ctx_init();
 
-    LogPrintf("%s: Creating Sapling SpendDescriptions\n", __FUNCTION__);
+    LogPrintf("%s: Creating Sapling SpendDescriptions size=%d\n", __FUNCTION__, spends.size());
     // Create Sapling SpendDescriptions
     for (auto spend : spends) {
         auto cm = spend.note.cm();
@@ -213,7 +213,7 @@ boost::optional<CTransaction> TransactionBuilder::Build()
                 sdesc.rk.begin(),
                 sdesc.zkproof.data())) {
             librustzcash_sapling_proving_ctx_free(ctx);
-            LogPrintf("%s: Invalid sapling spend proof!\n", __FUNCTION__);
+            LogPrintf("%s: Invalid sapling spend proof! note value=%d\n", __FUNCTION__, spend.note.value() );
             return boost::none;
         }
 

src/wallet/wallet.cpp

@@ -1146,6 +1146,15 @@ void CWallet::BuildWitnessCache(const CBlockIndex* pindex, bool witnessOnly)
     LogPrintf("%s: height=%d, startHeight=%d\n", __func__, height, startHeight);
 
   while (pblockindex) {
+    if (ShutdownRequested()) {
+        LogPrintf("%s: shutdown requested, aborting building witnesses\n", __func__);
+        break;
+    }
+    if(pwalletMain->fAbortRescan) {
+        LogPrintf("%s: rescan aborted at block %d, stopping witness building\n", pwalletMain->rescanHeight);
+        pwalletMain->fRescanning = false;
+        return;
+    }
 
     if (pblockindex->GetHeight() % 100 == 0 && pblockindex->GetHeight() < height - 5) {
       LogPrintf("Building Witnesses for block %i %.4f complete, %d remaining\n", pblockindex->GetHeight(), pblockindex->GetHeight() / double(height), height - pblockindex->GetHeight() );