X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fminer.cpp;h=6dff17690243734cec1e2d18a19d3f20e996bb7e;hb=273ceadcc0475b03a2be03ffbeded0831d8232fc;hp=99267651c50f4535fa6ba6f36278f4c7529db1c3;hpb=8d43f1482a14263a76c039c227c4383580dcc1db;p=novacoin.git diff --git a/src/miner.cpp b/src/miner.cpp index 9926765..6dff176 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -15,9 +15,6 @@ using namespace std; // BitcoinMiner // -string strMintMessage = "Stake miner suspended due to locked wallet."; -string strMintWarning; - extern unsigned int nMinerSleep; int static FormatHashBlocks(void* pbuffer, unsigned int len) @@ -311,7 +308,7 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake) if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS) continue; - if (!tx.ConnectInputs(txdb, mapInputs, mapTestPoolTmp, CDiskTxPos(1,1,1), pindexPrev, false, true)) + if (!tx.ConnectInputs(txdb, mapInputs, mapTestPoolTmp, CDiskTxPos(1,1,1), pindexPrev, false, true, true, MANDATORY_SCRIPT_VERIFY_FLAGS)) continue; mapTestPoolTmp[tx.GetHash()] = CTxIndex(CDiskTxPos(1,1,1), tx.vout.size()); swap(mapTestPool, mapTestPoolTmp); @@ -531,7 +528,6 @@ void StakeMiner(CWallet *pwallet) while (pwallet->IsLocked()) { - strMintWarning = strMintMessage; Sleep(1000); if (fShutdown) return; @@ -544,8 +540,6 @@ void StakeMiner(CWallet *pwallet) return; } - strMintWarning = ""; - // // Create new block // @@ -559,7 +553,6 @@ void StakeMiner(CWallet *pwallet) // Trying to sign a block if (pblock->SignBlock(*pwallet)) { - strMintWarning = _("Stake generation: new block found!"); SetThreadPriority(THREAD_PRIORITY_NORMAL); CheckStake(pblock.get(), *pwallet); SetThreadPriority(THREAD_PRIORITY_LOWEST);