Merge #9290: Make RelayWalletTransaction attempt to AcceptToMemoryPool.
f692fce
Make RelayWalletTransaction attempt to AcceptToMemoryPool. (Gregory Maxwell)
This commit is contained in:
commit
57e337d40e
1 changed files with 4 additions and 2 deletions
|
@ -1542,9 +1542,11 @@ void CWallet::ReacceptWalletTransactions()
|
|||
bool CWalletTx::RelayWalletTransaction(CConnman* connman)
|
||||
{
|
||||
assert(pwallet->GetBroadcastTransactions());
|
||||
if (!IsCoinBase())
|
||||
if (!IsCoinBase() && !isAbandoned() && GetDepthInMainChain() == 0)
|
||||
{
|
||||
if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
|
||||
CValidationState state;
|
||||
/* GetDepthInMainChain already catches known conflicts. */
|
||||
if (InMempool() || AcceptToMemoryPool(maxTxFee, state)) {
|
||||
LogPrintf("Relaying wtx %s\n", GetHash().ToString());
|
||||
if (connman) {
|
||||
CInv inv(MSG_TX, GetHash());
|
||||
|
|
Loading…
Reference in a new issue