Browse Source

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)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
3368895c3b
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      src/wallet/wallet.cpp

2
src/wallet/wallet.cpp

@ -1263,7 +1263,7 @@ bool CWalletTx::RelayWalletTransaction() @@ -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;

Loading…
Cancel
Save