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

fix erase expired tx on wallet load

Browse Source
This commit is contained in:
blackjok3r
2019-05-19 00:21:36 +08:00
parent 02a3f08894
commit d4aac39f75
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/wallet/wallet.cpp
View File

@@ -2876,21 +2876,18 @@ void CWallet::ReacceptWalletTransactions()
// 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());
} }
} }
} }
if ( IsInitialBlockDownload() == 0 )
{
for (auto hash : vwtxh) for (auto hash : vwtxh)
{ {
EraseFromWallet(hash); EraseFromWallet(hash);
} }
} }
}
bool CWalletTx::RelayWalletTransaction() bool CWalletTx::RelayWalletTransaction()
{ {