From b943eee5ee05e333dbc554762f7b8006a0886a9d Mon Sep 17 00:00:00 2001 From: skwurp Date: Tue, 29 Apr 2014 10:26:13 +1200 Subject: [PATCH] Fix proof-of-stake block signing. Add back mistakenly removed SignBlock() in proof-of-stake section of BitcoinMiner(). --- src/main.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 842171e..27c398d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2759,8 +2759,6 @@ bool LoadExternalBlockFile(FILE* fileIn) extern map mapAlerts; extern CCriticalSection cs_mapAlerts; -static string strMintWarning; - string GetWarnings(string strFor) { int nPriority = 0; @@ -2770,13 +2768,6 @@ string GetWarnings(string strFor) if (GetBoolArg("-testsafemode")) strRPC = "test"; - // ppcoin: wallet lock warning for minting - if (strMintWarning != "") - { - nPriority = 0; - strStatusBar = strMintWarning; - } - // Misc warnings like out of disk space and clock is wrong if (strMiscWarning != "") { @@ -4338,6 +4329,8 @@ void BitcoinMiner(CWallet *pwallet, bool fProofOfStake) // ppcoin: if proof-of-stake block found then process block if (pblock->IsProofOfStake()) { + if (!pblock->SignBlock(*pwalletMain)) + continue; printf("CPUMiner : proof-of-stake block found %s\n", pblock->GetHash().ToString().c_str()); SetThreadPriority(THREAD_PRIORITY_NORMAL); CheckWork(pblock.get(), *pwalletMain, reservekey); @@ -4396,10 +4389,7 @@ void BitcoinMiner(CWallet *pwallet, bool fProofOfStake) pblock->nNonce = nNonceFound; assert(result == pblock->GetHash()); if (!pblock->SignBlock(*pwalletMain)) - { break; - } - strMintWarning = ""; SetThreadPriority(THREAD_PRIORITY_NORMAL); CheckWork(pblock.get(), *pwalletMain, reservekey);