From efe22ea1aeb93c6ebf29903472f56bc34f4c9b8a Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Wed, 4 Feb 2015 07:44:23 -0700 Subject: [PATCH] fixed segfault --- src/instantx.cpp | 3 +-- src/masternode.cpp | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/instantx.cpp b/src/instantx.cpp index 1ed4b17faf..dfe1c7d18e 100644 --- a/src/instantx.cpp +++ b/src/instantx.cpp @@ -115,7 +115,6 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& if (AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs)) { LogPrintf("ProcessMessageInstantX::txlreq - Transaction Lock Request : accepted (resolved) %s\n", - pfrom->addr.ToString().c_str(), pfrom->cleanSubVer.c_str(), tx.GetHash().ToString().c_str() ); } else { @@ -157,7 +156,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& if(mapUnknownVotes[ctx.vinMasternode.prevout.hash] > GetTime() && mapUnknownVotes[ctx.vinMasternode.prevout.hash] - GetAverageVoteTime() > 60*10){ - LogPrintf("ProcessMessageInstantX::txlreq - masternode is spamming transaction votes: %s %s : rejected %s\n", + LogPrintf("ProcessMessageInstantX::txlreq - masternode is spamming transaction votes: %s %s\n", ctx.vinMasternode.ToString().c_str(), ctx.txHash.ToString().c_str() ); diff --git a/src/masternode.cpp b/src/masternode.cpp index 856f243529..2b2aa73927 100644 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -720,9 +720,6 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight) if(!enabled) return false; CMasternodePaymentWinner winner; - uint256 blockHash = 0; - if(!darkSendPool.GetBlockHash(blockHash, nBlockHeight-576)) return false; - std::vector vecLastPayments; int c = 0; BOOST_REVERSE_FOREACH(CMasternodePaymentWinner& winner, vWinning){