DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Pause mining during joinsplit creation

Browse Source
This commit is contained in:
Allan Niemerg
2016-12-04 21:05:30 -06:00
committed by Jay Graber
parent 5a0d9db4e4
commit 49c2cecb9f
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/wallet/asyncrpcoperation_sendmany.cpp
View File

@@ -21,6 +21,7 @@
#include "rpcprotocol.h" #include "rpcprotocol.h"
#include "zcash/IncrementalMerkleTree.hpp" #include "zcash/IncrementalMerkleTree.hpp"
#include "sodium.h" #include "sodium.h"
#include "miner.h"
#include <iostream> #include <iostream>
#include <chrono> #include <chrono>
@@ -101,6 +102,14 @@ void AsyncRPCOperation_sendmany::main() {
bool success = false; bool success = false;
#ifdef ENABLE_MINING
#ifdef ENABLE_WALLET
GenerateBitcoins(false, NULL, 0);
#else
GenerateBitcoins(false, 0);
#endif
#endif
try { try {
success = main_impl(); success = main_impl();
} catch (Object objError) { } catch (Object objError) {
@@ -119,6 +128,14 @@ void AsyncRPCOperation_sendmany::main() {
set_error_message("unknown error"); 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(); stop_execution_clock();
if (success) { if (success) {