DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #112 from blackjok3rtt/jl777

Browse Source 
fix erase expired tx on wallet load
This commit is contained in:
blackjok3rtt
2019-05-19 00:17:40 +08:00
committed by GitHub
parent 60d582482f c0bc4dc7f8
commit add8b29e32
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet.cpp
View File

@@ -2874,9 +2874,9 @@ void CWallet::ReacceptWalletTransactions()
bool invalid = state.IsInvalid(nDoS); bool invalid = state.IsInvalid(nDoS);
// log rejection and deletion // log rejection and deletion
// printf("ERROR reaccepting wallet transaction %s to mempool, reason: %s, DoS: %d\n", wtx.GetHash().ToString().c_str(), state.GetRejectReason().c_str(), nDoS); //printf("ERROR reaccepting wallet transaction %s to mempool, reason: %s, DoS: %d\n", wtx.GetHash().ToString().c_str(), state.GetRejectReason().c_str(), nDoS);
if (!wtx.IsCoinBase() && invalid && nDoS > 0) if (!wtx.IsCoinBase() && invalid && nDoS > 0 && state.GetRejectReason() != "tx-overwinter-expired")
{ {
LogPrintf("erasing transaction %s\n", wtx.GetHash().GetHex().c_str()); LogPrintf("erasing transaction %s\n", wtx.GetHash().GetHex().c_str());
vwtxh.push_back(wtx.GetHash()); vwtxh.push_back(wtx.GetHash());