Merge #9290: Make RelayWalletTransaction attempt to AcceptToMemoryPool.

sipa · sipa · commit 57e337d40e94 · 2016-12-14T01:28:09.000-08:00
f692fce Make RelayWalletTransaction attempt to AcceptToMemoryPool. (Gregory Maxwell)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -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());

Original file line number	Diff line number	Diff line change
`@@ -1542,9 +1542,11 @@ void CWallet::ReacceptWalletTransactions()`
`1542`	`1542`	`bool CWalletTx::RelayWalletTransaction(CConnman* connman)`
`1543`	`1543`	`{`
`1544`	`1544`	`assert(pwallet->GetBroadcastTransactions());`
`1545`		`- if (!IsCoinBase())`
	`1545`	`+ if (!IsCoinBase() && !isAbandoned() && GetDepthInMainChain() == 0)`
`1546`	`1546`	`{`
`1547`		`- if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {`
	`1547`	`+ CValidationState state;`
	`1548`	`+ /* GetDepthInMainChain already catches known conflicts. */`
	`1549`	`+ if (InMempool() \|\| AcceptToMemoryPool(maxTxFee, state)) {`
`1548`	`1550`	`LogPrintf("Relaying wtx %s\n", GetHash().ToString());`
`1549`	`1551`	`if (connman) {`
`1550`	`1552`	`CInv inv(MSG_TX, GetHash());`