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

Merge pull request #1427 from jl777/dev

Browse Source 
Dev
This commit is contained in:
jl777
2019-04-15 18:28:24 -11:00
committed by GitHub
parent c5e89091a6 c6a58be7f2
commit 15377f2fea
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/wallet/walletdb.cpp
View File

@@ -30,6 +30,7 @@
#include "utiltime.h" #include "utiltime.h"
#include "wallet/wallet.h" #include "wallet/wallet.h"
#include "zcash/Proof.hpp" #include "zcash/Proof.hpp"
#include "komodo_defs.h"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
@@ -486,7 +487,6 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
auto verifier = libzcash::ProofVerifier::Strict(); auto verifier = libzcash::ProofVerifier::Strict();
if (!(CheckTransaction(0,wtx, state, verifier) && (wtx.GetHash() == hash) && state.IsValid())) if (!(CheckTransaction(0,wtx, state, verifier) && (wtx.GetHash() == hash) && state.IsValid()))
{ {
fprintf(stderr, "Removing corrupt tx from wallet.%s\n", hash.ToString().c_str());
deadTxns.push_back(hash); deadTxns.push_back(hash);
return false; return false;
} }
@@ -952,10 +952,14 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
} }
if ( !deadTxns.empty() ) if ( !deadTxns.empty() )
{
if ( ASSETCHAINS_STAKED != 0 )
{ {
int32_t reAdded = 0; int32_t reAdded = 0;
CWalletDB walletdb(pwallet->strWalletFile, "r+", false); CWalletDB walletdb(pwallet->strWalletFile, "r+", false);
BOOST_FOREACH (uint256& hash, deadTxns) { BOOST_FOREACH (uint256& hash, deadTxns)
{
fprintf(stderr, "Removing corrupt tx from wallet.%s\n", hash.ToString().c_str());
if (!EraseTx(hash)) if (!EraseTx(hash))
fprintf(stderr, "could not delete tx.%s\n",hash.ToString().c_str()); fprintf(stderr, "could not delete tx.%s\n",hash.ToString().c_str());
uint256 blockhash; CTransaction tx; uint256 blockhash; CTransaction tx;
@@ -967,8 +971,16 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
} }
} }
fprintf(stderr, "Cleared %lu corrupted transactions from wallet. Readded %i known transactions.\n",(long)deadTxns.size(),reAdded); fprintf(stderr, "Cleared %lu corrupted transactions from wallet. Readded %i known transactions.\n",(long)deadTxns.size(),reAdded);
fNoncriticalErrors = false;
deadTxns.clear(); deadTxns.clear();
} }
else if ( (GetBoolArg("-zapwallettxes", false)) )
{
LogPrintf("Transactions are corrupted. Please restart daemon with -zapwallettxes=2\n");
fprintf(stderr,"Transactions are corrupted. Please restart daemon with -zapwallettxes=2\n");
return DB_CORRUPT;
}
}
if (fNoncriticalErrors && result == DB_LOAD_OK) if (fNoncriticalErrors && result == DB_LOAD_OK)
result = DB_NONCRITICAL_ERROR; result = DB_NONCRITICAL_ERROR;