diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-10 12:11:16 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-10 12:15:19 +0200 |
| commit | 3a1d3e8f52e98af5c527aafc3d494db258c2bb46 (patch) | |
| tree | f7230404c488df423811f7c23bbaedd0f8696c9b /src | |
| parent | e54ff2fc0ef526e4403526a31a6d7625abdf5245 (diff) | |
| parent | 14d4eef79931318cb5968f9154cf458d9f8d27fa (diff) | |
| download | bitcoin-3a1d3e8f52e98af5c527aafc3d494db258c2bb46.tar.xz | |
Merge pull request #5985
14d4eef Fix removing of orphan transactions (Alex Morcos)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index e92f64413a..b5dd2643d3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4322,7 +4322,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, mempool.check(pcoinsTip); RelayTransaction(tx); vWorkQueue.push_back(inv.hash); - vEraseQueue.push_back(inv.hash); LogPrint("mempool", "AcceptToMemoryPool: peer=%d %s: accepted %s (poolsz %u)\n", pfrom->id, pfrom->cleanSubVer, @@ -4349,7 +4348,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, // anyone relaying LegitTxX banned) CValidationState stateDummy; - vEraseQueue.push_back(orphanHash); if (setMisbehaving.count(fromPeer)) continue; @@ -4358,6 +4356,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, LogPrint("mempool", " accepted orphan tx %s\n", orphanHash.ToString()); RelayTransaction(orphanTx); vWorkQueue.push_back(orphanHash); + vEraseQueue.push_back(orphanHash); } else if (!fMissingInputs2) { @@ -4369,8 +4368,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, setMisbehaving.insert(fromPeer); LogPrint("mempool", " invalid orphan tx %s\n", orphanHash.ToString()); } - // too-little-fee orphan + // Has inputs but not accepted to mempool + // Probably non-standard or insufficient fee/priority LogPrint("mempool", " removed orphan tx %s\n", orphanHash.ToString()); + vEraseQueue.push_back(orphanHash); } mempool.check(pcoinsTip); } |