Browse Source

Bug: remove keva input value from the value to select.

cn
Jianping Wu 6 years ago
parent
commit
049a7b2a80
  1. 4
      src/wallet/wallet.cpp

4
src/wallet/wallet.cpp

@ -2810,7 +2810,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend,
wtxNew.fFromMe = true; wtxNew.fFromMe = true;
bool fFirst = true; bool fFirst = true;
CAmount nValueToSelect = nValue; CAmount nValueToSelect = nValue - nInputValue;
if (nSubtractFeeFromAmount == 0) if (nSubtractFeeFromAmount == 0)
nValueToSelect += nFeeRet; nValueToSelect += nFeeRet;
// vouts to the payees // vouts to the payees
@ -3118,9 +3118,11 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CCon
{ {
// Broadcast // Broadcast
if (!wtx.AcceptToMemoryPool(maxTxFee, state)) { if (!wtx.AcceptToMemoryPool(maxTxFee, state)) {
printf("JWU Transaction cannot be broadcast immediately! \n");
LogPrintf("CommitTransaction(): Transaction cannot be broadcast immediately, %s\n", state.GetRejectReason()); LogPrintf("CommitTransaction(): Transaction cannot be broadcast immediately, %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. // TODO: if we expect the failure to be long term or permanent, instead delete wtx from the wallet and return failure.
} else { } else {
printf("JWU Transaction CAN OK be broadcast immediately! \n");
wtx.RelayWalletTransaction(connman); wtx.RelayWalletTransaction(connman);
} }
} }

Loading…
Cancel
Save