kvazar/kevacoin
1
0
Fork 0
mirror of https://github.com/kvazar-network/kevacoin.git synced 2025-01-12 16:17:53 +00:00
Code Issues Projects Releases Wiki Activity

wallet: Update formatting

Browse Source
This commit is contained in:
Luke Dashjr 2017-06-05 22:23:20 +00:00
parent 9cbe8c80ba
commit c237bd750e
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/wallet/wallet.cpp
View File

@ -450,24 +450,25 @@ bool CWallet::Verify()
} }
std::string strError; std::string strError;
if (!CWalletDB::VerifyEnvironment(walletFile, GetDataDir().string(), strError)) if (!CWalletDB::VerifyEnvironment(walletFile, GetDataDir().string(), strError)) {
return InitError(strError); return InitError(strError);
}
if (GetBoolArg("-salvagewallet", false)) if (GetBoolArg("-salvagewallet", false)) {
{
// Recover readable keypairs: // Recover readable keypairs:
CWallet dummyWallet; CWallet dummyWallet;
std::string backup_filename; std::string backup_filename;
if (!CWalletDB::Recover(walletFile, (void *)&dummyWallet, CWalletDB::RecoverKeysOnlyFilter, backup_filename)) if (!CWalletDB::Recover(walletFile, (void *)&dummyWallet, CWalletDB::RecoverKeysOnlyFilter, backup_filename)) {
return false; return false;
}
} }
std::string strWarning; std::string strWarning;
bool dbV = CWalletDB::VerifyDatabaseFile(walletFile, GetDataDir().string(), strWarning, strError); bool dbV = CWalletDB::VerifyDatabaseFile(walletFile, GetDataDir().string(), strWarning, strError);
if (!strWarning.empty()) if (!strWarning.empty()) {
InitWarning(strWarning); InitWarning(strWarning);
if (!dbV) }
{ if (!dbV) {
InitError(strError); InitError(strError);
return false; return false;
} }
@ -2880,8 +2881,9 @@ bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry)
bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry, CWalletDB *pwalletdb) bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry, CWalletDB *pwalletdb)
{ {
if (!pwalletdb->WriteAccountingEntry(++nAccountingEntryNumber, acentry)) if (!pwalletdb->WriteAccountingEntry(++nAccountingEntryNumber, acentry)) {
return false; return false;
}
laccentries.push_back(acentry); laccentries.push_back(acentry);
CAccountingEntry & entry = laccentries.back(); CAccountingEntry & entry = laccentries.back();

17
src/wallet/walletdb.cpp
View File

@ -60,9 +60,9 @@ bool CWalletDB::EraseTx(uint256 hash)
bool CWalletDB::WriteKey(const CPubKey& vchPubKey, const CPrivKey& vchPrivKey, const CKeyMetadata& keyMeta) bool CWalletDB::WriteKey(const CPubKey& vchPubKey, const CPrivKey& vchPrivKey, const CKeyMetadata& keyMeta)
{ {
if (!WriteIC(std::make_pair(std::string("keymeta"), vchPubKey), if (!WriteIC(std::make_pair(std::string("keymeta"), vchPubKey), keyMeta, false)) {
keyMeta, false))
return false; return false;
}
// hash pubkey/privkey to accelerate wallet load // hash pubkey/privkey to accelerate wallet load
std::vector<unsigned char> vchKey; std::vector<unsigned char> vchKey;
@ -79,12 +79,13 @@ bool CWalletDB::WriteCryptedKey(const CPubKey& vchPubKey,
{ {
const bool fEraseUnencryptedKey = true; const bool fEraseUnencryptedKey = true;
if (!WriteIC(std::make_pair(std::string("keymeta"), vchPubKey), if (!WriteIC(std::make_pair(std::string("keymeta"), vchPubKey), keyMeta)) {
keyMeta))
return false; return false;
}
if (!WriteIC(std::make_pair(std::string("ckey"), vchPubKey), vchCryptedSecret, false)) if (!WriteIC(std::make_pair(std::string("ckey"), vchPubKey), vchCryptedSecret, false)) {
return false; return false;
}
if (fEraseUnencryptedKey) if (fEraseUnencryptedKey)
{ {
EraseIC(std::make_pair(std::string("key"), vchPubKey)); EraseIC(std::make_pair(std::string("key"), vchPubKey));
@ -106,15 +107,17 @@ bool CWalletDB::WriteCScript(const uint160& hash, const CScript& redeemScript)
bool CWalletDB::WriteWatchOnly(const CScript &dest, const CKeyMetadata& keyMeta) bool CWalletDB::WriteWatchOnly(const CScript &dest, const CKeyMetadata& keyMeta)
{ {
if (!WriteIC(std::make_pair(std::string("watchmeta"), *(const CScriptBase*)(&dest)), keyMeta)) if (!WriteIC(std::make_pair(std::string("watchmeta"), *(const CScriptBase*)(&dest)), keyMeta)) {
return false; return false;
}
return WriteIC(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest)), '1'); return WriteIC(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest)), '1');
} }
bool CWalletDB::EraseWatchOnly(const CScript &dest) bool CWalletDB::EraseWatchOnly(const CScript &dest)
{ {
if (!EraseIC(std::make_pair(std::string("watchmeta"), *(const CScriptBase*)(&dest)))) if (!EraseIC(std::make_pair(std::string("watchmeta"), *(const CScriptBase*)(&dest)))) {
return false; return false;
}
return EraseIC(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest))); return EraseIC(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest)));
} }