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)
This commit is contained in:
commit
3368895c3b
1 changed files with 1 additions and 1 deletions
|
@ -1263,7 +1263,7 @@ bool CWalletTx::RelayWalletTransaction()
|
||||||
assert(pwallet->GetBroadcastTransactions());
|
assert(pwallet->GetBroadcastTransactions());
|
||||||
if (!IsCoinBase())
|
if (!IsCoinBase())
|
||||||
{
|
{
|
||||||
if (GetDepthInMainChain() == 0 && !isAbandoned()) {
|
if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
|
||||||
LogPrintf("Relaying wtx %s\n", GetHash().ToString());
|
LogPrintf("Relaying wtx %s\n", GetHash().ToString());
|
||||||
RelayTransaction((CTransaction)*this);
|
RelayTransaction((CTransaction)*this);
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Add table
Reference in a new issue