highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-18 22:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2716 from laanwj/2013_05_30_getwork

Browse Source 
Move pMiningKey init out of StartRPCThreads
This commit is contained in:
Jeff Garzik
2013-05-30 09:15:16 -07:00
parent 87ec1929cf d98bf10f23
commit 6bc6d57303
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bitcoinrpc.cpp
View File

@@ -30,10 +30,6 @@ using namespace boost;
using namespace boost::asio;
using namespace json_spirit;
// Key used by getwork/getblocktemplate miners.
// Allocated in StartRPCThreads, free'd in StopRPCThreads
CReserveKey* pMiningKey = NULL;
static std::string strRPCUserColonPass;
// These are created by StartRPCThreads, destroyed in StopRPCThreads
@@ -727,9 +723,6 @@ static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol,
void StartRPCThreads()
{
// getwork/getblocktemplate mining rewards paid here:
pMiningKey = new CReserveKey(pwalletMain);
strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
if ((mapArgs["-rpcpassword"] == "") ||
(mapArgs["-rpcuser"] == mapArgs["-rpcpassword"]))
@@ -849,8 +842,6 @@ void StartRPCThreads()
void StopRPCThreads()
{
delete pMiningKey; pMiningKey = NULL;
if (rpc_io_service == NULL) return;
deadlineTimers.clear();