Make RelayWalletTransaction attempt to AcceptToMemoryPool.

gmaxwell · MarcoFalke · commit 35174a028084 · 2016-12-14T13:55:14.000+01:00
This resolves an issue where a wallet transaction which failed to relay previously because it couldn't make it into the mempool will not try again until restart, even though mempool conditions may have changed. Abandoned and known-conflicted transactions are skipped. Some concern was expressed that there may be users with many unknown conflicts would waste a lot of CPU time trying to add them to their memory pools over and over again. But I am doubtful these users exist in any number, if they do exist they have worse problems, and they can mitigate any performance issue this might have by abandoning the transactions in question. Github-Pull: bitcoin#9290 Rebased-From: f692fce
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1449,9 +1449,10 @@ void CWallet::ReacceptWalletTransactions()
 bool CWalletTx::RelayWalletTransaction()
 {
     assert(pwallet->GetBroadcastTransactions());
-    if (!IsCoinBase())
+    if (!IsCoinBase() && !isAbandoned() && GetDepthInMainChain() == 0)
     {
-        if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
+        /* GetDepthInMainChain already catches known conflicts. */
+        if (InMempool() || AcceptToMemoryPool(false, maxTxFee)) {
             LogPrintf("Relaying wtx %s\n", GetHash().ToString());
             RelayTransaction((CTransaction)*this);
             return true;

Original file line number	Diff line number	Diff line change
`@@ -1449,9 +1449,10 @@ void CWallet::ReacceptWalletTransactions()`
`1449`	`1449`	`bool CWalletTx::RelayWalletTransaction()`
`1450`	`1450`	`{`
`1451`	`1451`	`assert(pwallet->GetBroadcastTransactions());`
`1452`		`- if (!IsCoinBase())`
	`1452`	`+ if (!IsCoinBase() && !isAbandoned() && GetDepthInMainChain() == 0)`
`1453`	`1453`	`{`
`1454`		`- if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {`
	`1454`	`+ /* GetDepthInMainChain already catches known conflicts. */`
	`1455`	`+ if (InMempool() \|\| AcceptToMemoryPool(false, maxTxFee)) {`
`1455`	`1456`	`LogPrintf("Relaying wtx %s\n", GetHash().ToString());`
`1456`	`1457`	`RelayTransaction((CTransaction)*this);`
`1457`	`1458`	`return true;`