Browse Source

Merge #9302: Return txid even if ATMP fails for new transaction

b3a7410 Return txid even if ATMP fails for new transaction (Pieter Wuille)
0.14
Wladimir J. van der Laan 8 years ago
parent
commit
b6abdc77d3
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 8
      src/wallet/wallet.cpp

8
src/wallet/wallet.cpp

@ -2584,13 +2584,13 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CCon
{ {
// Broadcast // Broadcast
if (!wtxNew.AcceptToMemoryPool(maxTxFee, state)) { if (!wtxNew.AcceptToMemoryPool(maxTxFee, state)) {
// This must not fail. The transaction has already been signed and recorded. LogPrintf("CommitTransaction(): Transaction cannot be broadcast immediately, %s\n", state.GetRejectReason());
LogPrintf("CommitTransaction(): Error: Transaction not valid, %s\n", state.GetRejectReason()); // TODO: if we expect the failure to be long term or permanent, instead delete wtx from the wallet and return failure.
return false; } else {
}
wtxNew.RelayWalletTransaction(connman); wtxNew.RelayWalletTransaction(connman);
} }
} }
}
return true; return true;
} }

Loading…
Cancel
Save