Revert "Make RelayWalletTransaction attempt to AcceptToMemoryPool."

This reverts commit c1a0128033.
This commit is contained in:
lateminer
2018-01-08 22:35:33 +03:00
parent e8ad469c2c
commit 765380cf35

View File

@@ -1800,11 +1800,9 @@ void CWallet::ReacceptWalletTransactions()
bool CWalletTx::RelayWalletTransaction()
{
assert(pwallet->GetBroadcastTransactions());
if (!IsCoinBase() && !IsCoinStake() && !isAbandoned() && GetDepthInMainChain() == 0)
if (!IsCoinBase() && !IsCoinStake())
{
CValidationState state;
/* GetDepthInMainChain already catches known conflicts. */
if (InMempool() || AcceptToMemoryPool(maxTxFee, state)) {
if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
LogPrintf("Relaying wtx %s\n", GetHash().ToString());
RelayTransaction((CTransaction)*this);
return true;