highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 13:06:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
b3a7410 Return txid even if ATMP fails for new transaction (Pieter Wuille)
This commit is contained in:
Wladimir J. van der Laan 2016-12-13 12:15:25 +01:00
commit b6abdc77d3
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet.cpp
View File

@ -2584,11 +2584,11 @@ 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;