highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-09-08 20:50:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7521: Don't resend wallet txs that aren't in our own mempool

Browse Source 
5a2b1c0 Don't resend wallet txs that aren't in our own mempool (Alex Morcos)
This commit is contained in:
Wladimir J. van der Laan
2016-03-03 15:09:16 +01:00
parent 7f001bdf64 5a2b1c0c8b
commit 3368895c3b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/wallet.cpp
View File

@@ -1263,7 +1263,7 @@ bool CWalletTx::RelayWalletTransaction()
assert(pwallet->GetBroadcastTransactions());
if (!IsCoinBase())
{
if (GetDepthInMainChain() == 0 && !isAbandoned()) {
if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
LogPrintf("Relaying wtx %s\n", GetHash().ToString());
RelayTransaction((CTransaction)*this);
return true;