phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-12 21:02:38 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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,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;
} }