Permalink
Browse files

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

5a2b1c0 Don't resend wallet txs that aren't in our own mempool (Alex Morcos)
  • Loading branch information...
laanwj committed Mar 3, 2016
2 parents 7f001bd + 5a2b1c0 commit 3368895c3b94d8fda4d6cca22ae4766625b7a2c9
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/wallet/wallet.cpp
View
@@ -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;

0 comments on commit 3368895

Please sign in to comment.