Auto merge of #1932 - aniemerg:1522-pause-mining-for-joinsplit, r=arcalinea

Pause mining during JoinSplit creation

Closes #1522 .
This commit is contained in:
zkbot 2017-03-02 01:23:44 +00:00
commit 312fbd9d0e
1 changed files with 17 additions and 0 deletions

View File

@ -21,6 +21,7 @@
#include "rpcprotocol.h"
#include "zcash/IncrementalMerkleTree.hpp"
#include "sodium.h"
#include "miner.h"
#include <iostream>
#include <chrono>
@ -112,6 +113,14 @@ void AsyncRPCOperation_sendmany::main() {
bool success = false;
#ifdef ENABLE_MINING
#ifdef ENABLE_WALLET
GenerateBitcoins(false, NULL, 0);
#else
GenerateBitcoins(false, 0);
#endif
#endif
try {
success = main_impl();
} catch (const UniValue& objError) {
@ -133,6 +142,14 @@ void AsyncRPCOperation_sendmany::main() {
set_error_message("unknown error");
}
#ifdef ENABLE_MINING
#ifdef ENABLE_WALLET
GenerateBitcoins(GetBoolArg("-gen",false), pwalletMain, GetArg("-genproclimit", 1));
#else
GenerateBitcoins(GetBoolArg("-gen",false), GetArg("-genproclimit", 1));
#endif
#endif
stop_execution_clock();
if (success) {