|
|
|
@ -1405,7 +1405,7 @@ void CWallet::ReacceptWalletTransactions()
@@ -1405,7 +1405,7 @@ void CWallet::ReacceptWalletTransactions()
|
|
|
|
|
CWalletTx& wtx = *(item.second); |
|
|
|
|
|
|
|
|
|
LOCK(mempool.cs); |
|
|
|
|
wtx.AcceptToMemoryPool(false, maxTxFee); |
|
|
|
|
wtx.AcceptToMemoryPool(maxTxFee); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -2450,8 +2450,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
@@ -2450,8 +2450,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
|
|
|
|
|
if (fBroadcastTransactions) |
|
|
|
|
{ |
|
|
|
|
// Broadcast
|
|
|
|
|
if (!wtxNew.AcceptToMemoryPool(false, maxTxFee)) |
|
|
|
|
{ |
|
|
|
|
if (!wtxNew.AcceptToMemoryPool(maxTxFee)) { |
|
|
|
|
// This must not fail. The transaction has already been signed and recorded.
|
|
|
|
|
LogPrintf("CommitTransaction(): Error: Transaction not valid\n"); |
|
|
|
|
return false; |
|
|
|
@ -3563,8 +3562,8 @@ int CMerkleTx::GetBlocksToMaturity() const
@@ -3563,8 +3562,8 @@ int CMerkleTx::GetBlocksToMaturity() const
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool CMerkleTx::AcceptToMemoryPool(bool fLimitFree, CAmount nAbsurdFee) |
|
|
|
|
bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee) |
|
|
|
|
{ |
|
|
|
|
CValidationState state; |
|
|
|
|
return ::AcceptToMemoryPool(mempool, state, *this, fLimitFree, NULL, false, nAbsurdFee); |
|
|
|
|
return ::AcceptToMemoryPool(mempool, state, *this, true, NULL, false, nAbsurdFee); |
|
|
|
|
} |
|
|
|
|