From 2436b21b64377aa78c86f308d54a4607d955212d Mon Sep 17 00:00:00 2001 From: svost Date: Fri, 11 Feb 2022 22:44:46 +0300 Subject: [PATCH] Cleanup walletdb files --- src/walletdb.cpp | 280 +++++++++++++++++++++++++++++++++++++++++++----------- src/walletdb.h | 195 +++++--------------------------------- 2 files changed, 248 insertions(+), 227 deletions(-) diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 42becb3..2353df9 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -13,8 +13,6 @@ #include #include -using namespace std; - static uint64_t nAccountingEntryNumber = 0; extern bool fWalletUnlockMintOnly; @@ -23,34 +21,187 @@ extern bool fWalletUnlockMintOnly; // CWalletDB // -bool CWalletDB::WriteName(const string& strAddress, const string& strName) +bool CWalletDB::WriteName(const std::string& strAddress, const std::string& strName) { nWalletDBUpdated++; - return Write(make_pair(string("name"), strAddress), strName); + return Write(make_pair(std::string("name"), strAddress), strName); } -bool CWalletDB::EraseName(const string& strAddress) +bool CWalletDB::EraseName(const std::string& strAddress) { // This should only be used for sending addresses, never for receiving addresses, // receiving addresses must always have an address book entry if they're not change return. nWalletDBUpdated++; - return Erase(make_pair(string("name"), strAddress)); + return Erase(make_pair(std::string("name"), strAddress)); +} + +bool CWalletDB::WriteTx(uint256 hash, const CWalletTx &wtx) +{ + nWalletDBUpdated++; + return Write(std::make_pair(std::string("tx"), hash), wtx); +} + +bool CWalletDB::EraseTx(uint256 hash) +{ + nWalletDBUpdated++; + return Erase(std::make_pair(std::string("tx"), hash)); +} + +bool CWalletDB::WriteKey(const CPubKey &key, const CPrivKey &vchPrivKey, const CKeyMetadata &keyMeta) +{ + nWalletDBUpdated++; + if(!Write(std::make_pair(std::string("keymeta"), key), keyMeta)) + return false; + + if(!Write(std::make_pair(std::string("key"), key), vchPrivKey, false)) + return false; + + return true; +} + +bool CWalletDB::WriteMalleableKey(const CMalleableKeyView &keyView, const CSecret &vchSecretH, const CKeyMetadata &keyMeta) +{ + nWalletDBUpdated++; + if(!Write(std::make_pair(std::string("malmeta"), keyView.ToString()), keyMeta)) + return false; + + if(!Write(std::make_pair(std::string("malpair"), keyView.ToString()), vchSecretH, false)) + return false; + + return true; +} + +bool CWalletDB::WriteCryptedMalleableKey(const CMalleableKeyView &keyView, const std::vector &vchCryptedSecretH, const CKeyMetadata &keyMeta) +{ + nWalletDBUpdated++; + if(!Write(std::make_pair(std::string("malmeta"), keyView.ToString()), keyMeta)) + return false; + + if(!Write(std::make_pair(std::string("malcpair"), keyView.ToString()), vchCryptedSecretH, false)) + return false; + + Erase(std::make_pair(std::string("malpair"), keyView.ToString())); + + return true; +} + +bool CWalletDB::WriteCryptedKey(const CPubKey &key, const std::vector &vchCryptedSecret, const CKeyMetadata &keyMeta) +{ + nWalletDBUpdated++; + bool fEraseUnencryptedKey = true; + + if(!Write(std::make_pair(std::string("keymeta"), key), keyMeta)) + return false; + + if (!Write(std::make_pair(std::string("ckey"), key), vchCryptedSecret, false)) + return false; + if (fEraseUnencryptedKey) + { + Erase(std::make_pair(std::string("key"), key)); + Erase(std::make_pair(std::string("wkey"), key)); + } + return true; +} + +bool CWalletDB::WriteMasterKey(unsigned int nID, const CMasterKey &kMasterKey) +{ + nWalletDBUpdated++; + return Write(std::make_pair(std::string("mkey"), nID), kMasterKey, true); +} + +bool CWalletDB::EraseMasterKey(unsigned int nID) +{ + nWalletDBUpdated++; + return Erase(std::make_pair(std::string("mkey"), nID)); } -bool CWalletDB::ReadAccount(const string& strAccount, CAccount& account) +bool CWalletDB::EraseCryptedKey(const CPubKey &key) +{ + return Erase(std::make_pair(std::string("ckey"), key)); +} + +bool CWalletDB::EraseCryptedMalleableKey(const CMalleableKeyView &keyView) +{ + return Erase(std::make_pair(std::string("malcpair"), keyView.ToString())); +} + +bool CWalletDB::WriteCScript(const uint160 &hash, const CScript &redeemScript) +{ + nWalletDBUpdated++; + return Write(std::make_pair(std::string("cscript"), hash), redeemScript, false); +} + +bool CWalletDB::WriteWatchOnly(const CScript &dest) +{ + nWalletDBUpdated++; + return Write(std::make_pair(std::string("watchs"), dest), '1'); +} + +bool CWalletDB::EraseWatchOnly(const CScript &dest) +{ + nWalletDBUpdated++; + return Erase(std::make_pair(std::string("watchs"), dest)); +} + +bool CWalletDB::WriteBestBlock(const CBlockLocator &locator) +{ + nWalletDBUpdated++; + return Write(std::string("bestblock"), locator); +} + +bool CWalletDB::ReadBestBlock(CBlockLocator &locator) +{ + return Read(std::string("bestblock"), locator); +} + +bool CWalletDB::WriteOrderPosNext(int64_t nOrderPosNext) +{ + nWalletDBUpdated++; + return Write(std::string("orderposnext"), nOrderPosNext); +} + +bool CWalletDB::WriteDefaultKey(const CPubKey &key) +{ + nWalletDBUpdated++; + return Write(std::string("defaultkey"), key); +} + +bool CWalletDB::ReadPool(int64_t nPool, CKeyPool &keypool) +{ + return Read(std::make_pair(std::string("pool"), nPool), keypool); +} + +bool CWalletDB::WritePool(int64_t nPool, const CKeyPool &keypool) +{ + nWalletDBUpdated++; + return Write(std::make_pair(std::string("pool"), nPool), keypool); +} + +bool CWalletDB::ErasePool(int64_t nPool) +{ + nWalletDBUpdated++; + return Erase(std::make_pair(std::string("pool"), nPool)); +} + +bool CWalletDB::WriteMinVersion(int nVersion) +{ + return Write(std::string("minversion"), nVersion); +} + +bool CWalletDB::ReadAccount(const std::string& strAccount, CAccount& account) { account.SetNull(); - return Read(make_pair(string("acc"), strAccount), account); + return Read(make_pair(std::string("acc"), strAccount), account); } -bool CWalletDB::WriteAccount(const string& strAccount, const CAccount& account) +bool CWalletDB::WriteAccount(const std::string& strAccount, const CAccount& account) { - return Write(make_pair(string("acc"), strAccount), account); + return Write(make_pair(std::string("acc"), strAccount), account); } bool CWalletDB::WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry) { - return Write(std::make_tuple(string("acentry"), acentry.strAccount, nAccEntryNum), acentry); + return Write(std::make_tuple(std::string("acentry"), acentry.strAccount, nAccEntryNum), acentry); } bool CWalletDB::WriteAccountingEntry(const CAccountingEntry& acentry) @@ -58,9 +209,9 @@ bool CWalletDB::WriteAccountingEntry(const CAccountingEntry& acentry) return WriteAccountingEntry(++nAccountingEntryNumber, acentry); } -int64_t CWalletDB::GetAccountCreditDebit(const string& strAccount) +int64_t CWalletDB::GetAccountCreditDebit(const std::string& strAccount) { - list entries; + std::list entries; ListAccountCreditDebit(strAccount, entries); int64_t nCreditDebit = 0; @@ -70,20 +221,20 @@ int64_t CWalletDB::GetAccountCreditDebit(const string& strAccount) return nCreditDebit; } -void CWalletDB::ListAccountCreditDebit(const string& strAccount, list& entries) +void CWalletDB::ListAccountCreditDebit(const std::string& strAccount, std::list& entries) { bool fAllAccounts = (strAccount == "*"); Dbc* pcursor = GetCursor(); if (!pcursor) - throw runtime_error("CWalletDB::ListAccountCreditDebit() : cannot create DB cursor"); + throw std::runtime_error("CWalletDB::ListAccountCreditDebit() : cannot create DB cursor"); unsigned int fFlags = DB_SET_RANGE; for ( ; ; ) { // Read next record CDataStream ssKey(SER_DISK, CLIENT_VERSION); if (fFlags == DB_SET_RANGE) - ssKey << std::make_tuple(string("acentry"), (fAllAccounts? string("") : strAccount), uint64_t(0)); + ssKey << std::make_tuple(std::string("acentry"), (fAllAccounts? std::string("") : strAccount), uint64_t(0)); CDataStream ssValue(SER_DISK, CLIENT_VERSION); int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags); fFlags = DB_NEXT; @@ -92,11 +243,11 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, listclose(); - throw runtime_error("CWalletDB::ListAccountCreditDebit() : error scanning DB"); + throw std::runtime_error("CWalletDB::ListAccountCreditDebit() : error scanning DB"); } // Unserialize - string strType; + std::string strType; ssKey >> strType; if (strType != "acentry") break; @@ -122,30 +273,30 @@ CWalletDB::ReorderTransactions(CWallet* pwallet) // Probably a bad idea to change the output of this // First: get all CWalletTx and CAccountingEntry into a sorted-by-time multimap. - typedef pair TxPair; - typedef multimap TxItems; + typedef std::pair TxPair; + typedef std::multimap TxItems; TxItems txByTime; - for (map::iterator it = pwallet->mapWallet.begin(); it != pwallet->mapWallet.end(); ++it) + for (auto it = pwallet->mapWallet.begin(); it != pwallet->mapWallet.end(); ++it) { CWalletTx* wtx = &((*it).second); - txByTime.insert(make_pair(wtx->nTimeReceived, TxPair(wtx, (CAccountingEntry*)0))); + txByTime.insert(make_pair(wtx->nTimeReceived, TxPair(wtx, (CAccountingEntry*)nullptr))); } - list acentries; + std::list acentries; ListAccountCreditDebit("", acentries); for (CAccountingEntry& entry : acentries) { - txByTime.insert(make_pair(entry.nTime, TxPair((CWalletTx*)0, &entry))); + txByTime.insert(make_pair(entry.nTime, TxPair((CWalletTx*)nullptr, &entry))); } int64_t& nOrderPosNext = pwallet->nOrderPosNext; nOrderPosNext = 0; std::vector nOrderPosOffsets; - for (TxItems::iterator it = txByTime.begin(); it != txByTime.end(); ++it) + for (auto it = txByTime.begin(); it != txByTime.end(); ++it) { CWalletTx *const pwtx = (*it).second.first; CAccountingEntry *const pacentry = (*it).second.second; - int64_t& nOrderPos = (pwtx != 0) ? pwtx->nOrderPos : pacentry->nOrderPos; + int64_t& nOrderPos = (pwtx != nullptr) ? pwtx->nOrderPos : pacentry->nOrderPos; if (nOrderPos == -1) { @@ -194,7 +345,7 @@ public: bool fIsEncrypted; bool fAnyUnordered; int nFileVersion; - vector vWalletUpgrade; + std::vector vWalletUpgrade; CWalletScanState() { nKeys = nCKeys = nKeyMeta = 0; @@ -206,7 +357,7 @@ public: bool ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, - CWalletScanState &wss, string& strType, string& strErr) + CWalletScanState &wss, std::string& strType, std::string& strErr) { try { // Unserialize @@ -216,7 +367,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, if (strType == "name") { - string strAddress; + std::string strAddress; ssKey >> strAddress; ssValue >> pwallet->mapAddressBook[CBitcoinAddress(strAddress)]; } @@ -267,7 +418,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, } else if (strType == "acentry") { - string strAccount; + std::string strAccount; ssKey >> strAccount; uint64_t nNumber; ssKey >> nNumber; @@ -297,7 +448,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, } else if (strType == "malpair") { - string strKeyView; + std::string strKeyView; CSecret vchSecret; ssKey >> strKeyView; @@ -312,7 +463,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, } else if (strType == "malcpair") { - string strKeyView; + std::string strKeyView; std::vector vchCryptedSecret; ssKey >> strKeyView; @@ -400,7 +551,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, wss.nCKeys++; CPubKey vchPubKey; ssKey >> vchPubKey; - vector vchPrivKey; + std::vector vchPrivKey; ssValue >> vchPrivKey; if (!pwallet->LoadCryptedKey(vchPubKey, vchPrivKey)) { @@ -411,7 +562,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, } else if (strType == "malmeta") { - string strKeyView; + std::string strKeyView; ssKey >> strKeyView; CMalleableKeyView keyView; @@ -487,7 +638,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, return true; } -static bool IsKeyType(string strType) +static bool IsKeyType(const std::string& strType) { return (strType== "key" || strType == "wkey" || strType == "mkey" || strType == "ckey" || strType == "malpair" || strType == "malcpair"); @@ -503,7 +654,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet) try { LOCK(pwallet->cs_wallet); int nMinVersion = 0; - if (Read((string)"minversion", nMinVersion)) + if (Read((std::string)"minversion", nMinVersion)) { if (nMinVersion > CLIENT_VERSION) return DB_TOO_NEW; @@ -533,7 +684,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet) } // Try to be tolerant of single corrupt records: - string strType, strErr; + std::string strType, strErr; if (!ReadKeyValue(pwallet, ssKey, ssValue, wss, strType, strErr)) { // losing keys is considered a catastrophic error, anything else @@ -593,7 +744,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet) return result; } -DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector& vTxHash) +DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, std::vector& vTxHash) { pwallet->vchDefaultKey = CPubKey(); CWalletScanState wss; @@ -603,7 +754,7 @@ DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector& vTxHash) try { LOCK(pwallet->cs_wallet); int nMinVersion = 0; - if (Read((string)"minversion", nMinVersion)) + if (Read((std::string)"minversion", nMinVersion)) { if (nMinVersion > CLIENT_VERSION) return DB_TOO_NEW; @@ -632,7 +783,7 @@ DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector& vTxHash) return DB_CORRUPT; } - string strType; + std::string strType; ssKey >> strType; if (strType == "tx") { uint256 hash; @@ -659,7 +810,7 @@ DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector& vTxHash) DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet) { // build list of wallet TXs - vector vTxHash; + std::vector vTxHash; DBErrors err = FindWalletTx(pwallet, vTxHash); if (err != DB_LOAD_OK) return err; @@ -678,7 +829,7 @@ void ThreadFlushWalletDB(void* parg) // Make this thread recognisable as the wallet flushing thread RenameThread("novacoin-wallet"); - const string& strFile = ((const string*)parg)[0]; + const std::string& strFile = ((const std::string*)parg)[0]; static bool fOneThread; if (fOneThread) return; @@ -706,7 +857,7 @@ void ThreadFlushWalletDB(void* parg) { // Don't do this if any databases are in use int nRefCount = 0; - map::iterator mi = bitdb.mapFileUseCount.begin(); + auto mi = bitdb.mapFileUseCount.begin(); while (mi != bitdb.mapFileUseCount.end()) { nRefCount += (*mi).second; @@ -715,7 +866,7 @@ void ThreadFlushWalletDB(void* parg) if (nRefCount == 0 && !fShutdown) { - map::iterator mi = bitdb.mapFileUseCount.find(strFile); + auto mi = bitdb.mapFileUseCount.find(strFile); if (mi != bitdb.mapFileUseCount.end()) { printf("Flushing wallet.dat\n"); @@ -735,7 +886,7 @@ void ThreadFlushWalletDB(void* parg) } } -bool BackupWallet(const CWallet& wallet, const string& strDest) +bool BackupWallet(const CWallet& wallet, const std::string& strDest) { if (!wallet.fFileBacked) return false; @@ -775,7 +926,7 @@ bool BackupWallet(const CWallet& wallet, const string& strDest) return false; } -bool DumpWallet(CWallet* pwallet, const string& strDest) +bool DumpWallet(CWallet* pwallet, const std::string& strDest) { if (!pwallet->fFileBacked) return false; @@ -788,14 +939,14 @@ bool DumpWallet(CWallet* pwallet, const string& strDest) // sort time/key pairs std::vector > vAddresses; - for (std::map::const_iterator it = mapAddresses.begin(); it != mapAddresses.end(); it++) { + for (auto it = mapAddresses.begin(); it != mapAddresses.end(); it++) { vAddresses.push_back(std::make_pair(it->second, it->first)); } mapAddresses.clear(); std::sort(vAddresses.begin(), vAddresses.end()); // open outputfile as a stream - ofstream file; + std::ofstream file; file.open(strDest.c_str()); if (!file.is_open()) return false; @@ -807,7 +958,7 @@ bool DumpWallet(CWallet* pwallet, const string& strDest) file << strprintf("# mined on %s\n", EncodeDumpTime(pindexBest->nTime).c_str()); file << "\n"; - for (std::vector >::const_iterator it = vAddresses.begin(); it != vAddresses.end(); it++) { + for (auto it = vAddresses.begin(); it != vAddresses.end(); it++) { const CBitcoinAddress &addr = it->second; std::string strTime = EncodeDumpTime(it->first); std::string strAddr = addr.ToString(); @@ -852,14 +1003,14 @@ bool DumpWallet(CWallet* pwallet, const string& strDest) return true; } -bool ImportWallet(CWallet *pwallet, const string& strLocation) +bool ImportWallet(CWallet *pwallet, const std::string& strLocation) { if (!pwallet->fFileBacked) return false; // open inputfile as stream - ifstream file; + std::ifstream file; file.open(strLocation.c_str()); if (!file.is_open()) return false; @@ -875,8 +1026,8 @@ bool ImportWallet(CWallet *pwallet, const string& strLocation) continue; // Skip comments and empty lines std::vector vstr; - istringstream iss(line); - copy(istream_iterator(iss), istream_iterator(), back_inserter(vstr)); + std::istringstream iss(line); + copy(std::istream_iterator(iss), std::istream_iterator(), back_inserter(vstr)); if (vstr.size() < 2) continue; @@ -975,7 +1126,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys) int64_t now = GetTime(); std::string newFilename = strprintf("wallet.%" PRId64 ".bak", now); - int result = dbenv.dbenv.dbrename(NULL, filename.c_str(), NULL, + int result = dbenv.dbenv.dbrename(nullptr, filename.c_str(), nullptr, newFilename.c_str(), DB_AUTO_COMMIT); if (result == 0) printf("Renamed %s to %s\n", filename.c_str(), newFilename.c_str()); @@ -996,7 +1147,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys) bool fSuccess = allOK; Db* pdbCopy = new Db(&dbenv.dbenv, 0); - int ret = pdbCopy->open(NULL, // Txn pointer + int ret = pdbCopy->open(nullptr, // Txn pointer filename.c_str(), // Filename "main", // Logical db name DB_BTREE, // Database type @@ -1017,7 +1168,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys) { CDataStream ssKey(row.first, SER_DISK, CLIENT_VERSION); CDataStream ssValue(row.second, SER_DISK, CLIENT_VERSION); - string strType, strErr; + std::string strType, strErr; bool fReadOK = ReadKeyValue(&dummyWallet, ssKey, ssValue, wss, strType, strErr); if (!IsKeyType(strType)) @@ -1045,3 +1196,20 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename) { return CWalletDB::Recover(dbenv, filename, false); } + +CKeyMetadata::CKeyMetadata() +{ + SetNull(); +} + +CKeyMetadata::CKeyMetadata(int64_t nCreateTime_) +{ + nVersion = CKeyMetadata::CURRENT_VERSION; + nCreateTime = nCreateTime_; +} + +void CKeyMetadata::SetNull() +{ + nVersion = CKeyMetadata::CURRENT_VERSION; + nCreateTime = 0; +} diff --git a/src/walletdb.h b/src/walletdb.h index b8bf4c4..44f5825 100644 --- a/src/walletdb.h +++ b/src/walletdb.h @@ -6,7 +6,6 @@ #define BITCOIN_WALLETDB_H #include "db.h" -#include "keystore.h" class CKeyPool; class CAccount; @@ -30,15 +29,8 @@ public: int nVersion; int64_t nCreateTime; // 0 means unknown - CKeyMetadata() - { - SetNull(); - } - CKeyMetadata(int64_t nCreateTime_) - { - nVersion = CKeyMetadata::CURRENT_VERSION; - nCreateTime = nCreateTime_; - } + CKeyMetadata(); + CKeyMetadata(int64_t nCreateTime_); IMPLEMENT_SERIALIZE ( @@ -47,11 +39,7 @@ public: READWRITE(nCreateTime); ) - void SetNull() - { - nVersion = CKeyMetadata::CURRENT_VERSION; - nCreateTime = 0; - } + void SetNull(); }; @@ -67,163 +55,28 @@ private: void operator=(const CWalletDB&); public: bool WriteName(const std::string& strAddress, const std::string& strName); - bool EraseName(const std::string& strAddress); - - bool WriteTx(uint256 hash, const CWalletTx& wtx) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("tx"), hash), wtx); - } - - bool EraseTx(uint256 hash) - { - nWalletDBUpdated++; - return Erase(std::make_pair(std::string("tx"), hash)); - } - - bool WriteKey(const CPubKey& key, const CPrivKey& vchPrivKey, const CKeyMetadata &keyMeta) - { - nWalletDBUpdated++; - if(!Write(std::make_pair(std::string("keymeta"), key), keyMeta)) - return false; - - if(!Write(std::make_pair(std::string("key"), key), vchPrivKey, false)) - return false; - - return true; - } - - bool WriteMalleableKey(const CMalleableKeyView& keyView, const CSecret& vchSecretH, const CKeyMetadata &keyMeta) - { - nWalletDBUpdated++; - if(!Write(std::make_pair(std::string("malmeta"), keyView.ToString()), keyMeta)) - return false; - - if(!Write(std::make_pair(std::string("malpair"), keyView.ToString()), vchSecretH, false)) - return false; - - return true; - } - - bool WriteCryptedMalleableKey(const CMalleableKeyView& keyView, const std::vector& vchCryptedSecretH, const CKeyMetadata &keyMeta) - { - nWalletDBUpdated++; - if(!Write(std::make_pair(std::string("malmeta"), keyView.ToString()), keyMeta)) - return false; - - if(!Write(std::make_pair(std::string("malcpair"), keyView.ToString()), vchCryptedSecretH, false)) - return false; - - Erase(std::make_pair(std::string("malpair"), keyView.ToString())); - - return true; - } - - - bool WriteCryptedKey(const CPubKey& key, const std::vector& vchCryptedSecret, const CKeyMetadata &keyMeta) - { - nWalletDBUpdated++; - bool fEraseUnencryptedKey = true; - - if(!Write(std::make_pair(std::string("keymeta"), key), keyMeta)) - return false; - - if (!Write(std::make_pair(std::string("ckey"), key), vchCryptedSecret, false)) - return false; - if (fEraseUnencryptedKey) - { - Erase(std::make_pair(std::string("key"), key)); - Erase(std::make_pair(std::string("wkey"), key)); - } - return true; - } - - bool WriteMasterKey(unsigned int nID, const CMasterKey& kMasterKey) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("mkey"), nID), kMasterKey, true); - } - - bool EraseMasterKey(unsigned int nID) - { - nWalletDBUpdated++; - return Erase(std::make_pair(std::string("mkey"), nID)); - } - - bool EraseCryptedKey(const CPubKey& key) - { - return Erase(std::make_pair(std::string("ckey"), key)); - } - - bool EraseCryptedMalleableKey(const CMalleableKeyView& keyView) - { - return Erase(std::make_pair(std::string("malcpair"), keyView.ToString())); - } - - bool WriteCScript(const uint160& hash, const CScript& redeemScript) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("cscript"), hash), redeemScript, false); - } - - bool WriteWatchOnly(const CScript &dest) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("watchs"), dest), '1'); - } - - bool EraseWatchOnly(const CScript &dest) - { - nWalletDBUpdated++; - return Erase(std::make_pair(std::string("watchs"), dest)); - } - - bool WriteBestBlock(const CBlockLocator& locator) - { - nWalletDBUpdated++; - return Write(std::string("bestblock"), locator); - } - - bool ReadBestBlock(CBlockLocator& locator) - { - return Read(std::string("bestblock"), locator); - } - - bool WriteOrderPosNext(int64_t nOrderPosNext) - { - nWalletDBUpdated++; - return Write(std::string("orderposnext"), nOrderPosNext); - } - - bool WriteDefaultKey(const CPubKey& key) - { - nWalletDBUpdated++; - return Write(std::string("defaultkey"), key); - } - - bool ReadPool(int64_t nPool, CKeyPool& keypool) - { - return Read(std::make_pair(std::string("pool"), nPool), keypool); - } - - bool WritePool(int64_t nPool, const CKeyPool& keypool) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("pool"), nPool), keypool); - } - - bool ErasePool(int64_t nPool) - { - nWalletDBUpdated++; - return Erase(std::make_pair(std::string("pool"), nPool)); - } - - bool WriteMinVersion(int nVersion) - { - return Write(std::string("minversion"), nVersion); - } - + bool WriteTx(uint256 hash, const CWalletTx& wtx); + bool EraseTx(uint256 hash); + bool WriteKey(const CPubKey& key, const CPrivKey& vchPrivKey, const CKeyMetadata &keyMeta); + bool WriteMalleableKey(const CMalleableKeyView& keyView, const CSecret& vchSecretH, const CKeyMetadata &keyMeta); + bool WriteCryptedMalleableKey(const CMalleableKeyView& keyView, const std::vector& vchCryptedSecretH, const CKeyMetadata &keyMeta); + bool WriteCryptedKey(const CPubKey& key, const std::vector& vchCryptedSecret, const CKeyMetadata &keyMeta); + bool WriteMasterKey(unsigned int nID, const CMasterKey& kMasterKey); + bool EraseMasterKey(unsigned int nID); + bool EraseCryptedKey(const CPubKey& key); + bool EraseCryptedMalleableKey(const CMalleableKeyView& keyView); + bool WriteCScript(const uint160& hash, const CScript& redeemScript); + bool WriteWatchOnly(const CScript &dest); + bool EraseWatchOnly(const CScript &dest); + bool WriteBestBlock(const CBlockLocator& locator); + bool ReadBestBlock(CBlockLocator& locator); + bool WriteOrderPosNext(int64_t nOrderPosNext); + bool WriteDefaultKey(const CPubKey& key); + bool ReadPool(int64_t nPool, CKeyPool& keypool); + bool WritePool(int64_t nPool, const CKeyPool& keypool); + bool ErasePool(int64_t nPool); + bool WriteMinVersion(int nVersion); bool ReadAccount(const std::string& strAccount, CAccount& account); bool WriteAccount(const std::string& strAccount, const CAccount& account); private: -- 1.7.1