Browse Source
In addition to standard code separation, this change opens the door to fixing several include inter-dependencies.pull/145/head
Jeff Garzik
12 years ago
committed by
Pieter Wuille
15 changed files with 624 additions and 591 deletions
@ -0,0 +1,428 @@ |
|||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|||
// Copyright (c) 2009-2012 The Bitcoin developers
|
|||
// Distributed under the MIT/X11 software license, see the accompanying
|
|||
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
|
|||
|
|||
#include "walletdb.h" |
|||
#include "wallet.h" |
|||
#include <boost/filesystem.hpp> |
|||
|
|||
using namespace std; |
|||
using namespace boost; |
|||
|
|||
|
|||
static uint64 nAccountingEntryNumber = 0; |
|||
|
|||
extern CCriticalSection cs_db; |
|||
extern map<string, int> mapFileUseCount; |
|||
extern void CloseDb(const string& strFile); |
|||
|
|||
//
|
|||
// CWalletDB
|
|||
//
|
|||
|
|||
bool CWalletDB::WriteName(const string& strAddress, const string& strName) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
return Write(make_pair(string("name"), strAddress), strName); |
|||
} |
|||
|
|||
bool CWalletDB::EraseName(const 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)); |
|||
} |
|||
|
|||
bool CWalletDB::ReadAccount(const string& strAccount, CAccount& account) |
|||
{ |
|||
account.SetNull(); |
|||
return Read(make_pair(string("acc"), strAccount), account); |
|||
} |
|||
|
|||
bool CWalletDB::WriteAccount(const string& strAccount, const CAccount& account) |
|||
{ |
|||
return Write(make_pair(string("acc"), strAccount), account); |
|||
} |
|||
|
|||
bool CWalletDB::WriteAccountingEntry(const CAccountingEntry& acentry) |
|||
{ |
|||
return Write(boost::make_tuple(string("acentry"), acentry.strAccount, ++nAccountingEntryNumber), acentry); |
|||
} |
|||
|
|||
int64 CWalletDB::GetAccountCreditDebit(const string& strAccount) |
|||
{ |
|||
list<CAccountingEntry> entries; |
|||
ListAccountCreditDebit(strAccount, entries); |
|||
|
|||
int64 nCreditDebit = 0; |
|||
BOOST_FOREACH (const CAccountingEntry& entry, entries) |
|||
nCreditDebit += entry.nCreditDebit; |
|||
|
|||
return nCreditDebit; |
|||
} |
|||
|
|||
void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountingEntry>& entries) |
|||
{ |
|||
bool fAllAccounts = (strAccount == "*"); |
|||
|
|||
Dbc* pcursor = GetCursor(); |
|||
if (!pcursor) |
|||
throw runtime_error("CWalletDB::ListAccountCreditDebit() : cannot create DB cursor"); |
|||
unsigned int fFlags = DB_SET_RANGE; |
|||
loop |
|||
{ |
|||
// Read next record
|
|||
CDataStream ssKey; |
|||
if (fFlags == DB_SET_RANGE) |
|||
ssKey << boost::make_tuple(string("acentry"), (fAllAccounts? string("") : strAccount), uint64(0)); |
|||
CDataStream ssValue; |
|||
int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags); |
|||
fFlags = DB_NEXT; |
|||
if (ret == DB_NOTFOUND) |
|||
break; |
|||
else if (ret != 0) |
|||
{ |
|||
pcursor->close(); |
|||
throw runtime_error("CWalletDB::ListAccountCreditDebit() : error scanning DB"); |
|||
} |
|||
|
|||
// Unserialize
|
|||
string strType; |
|||
ssKey >> strType; |
|||
if (strType != "acentry") |
|||
break; |
|||
CAccountingEntry acentry; |
|||
ssKey >> acentry.strAccount; |
|||
if (!fAllAccounts && acentry.strAccount != strAccount) |
|||
break; |
|||
|
|||
ssValue >> acentry; |
|||
entries.push_back(acentry); |
|||
} |
|||
|
|||
pcursor->close(); |
|||
} |
|||
|
|||
|
|||
int CWalletDB::LoadWallet(CWallet* pwallet) |
|||
{ |
|||
pwallet->vchDefaultKey.clear(); |
|||
int nFileVersion = 0; |
|||
vector<uint256> vWalletUpgrade; |
|||
bool fIsEncrypted = false; |
|||
|
|||
//// todo: shouldn't we catch exceptions and try to recover and continue?
|
|||
{ |
|||
LOCK(pwallet->cs_wallet); |
|||
int nMinVersion = 0; |
|||
if (Read((string)"minversion", nMinVersion)) |
|||
{ |
|||
if (nMinVersion > CLIENT_VERSION) |
|||
return DB_TOO_NEW; |
|||
pwallet->LoadMinVersion(nMinVersion); |
|||
} |
|||
|
|||
// Get cursor
|
|||
Dbc* pcursor = GetCursor(); |
|||
if (!pcursor) |
|||
{ |
|||
printf("Error getting wallet database cursor\n"); |
|||
return DB_CORRUPT; |
|||
} |
|||
|
|||
loop |
|||
{ |
|||
// Read next record
|
|||
CDataStream ssKey; |
|||
CDataStream ssValue; |
|||
int ret = ReadAtCursor(pcursor, ssKey, ssValue); |
|||
if (ret == DB_NOTFOUND) |
|||
break; |
|||
else if (ret != 0) |
|||
{ |
|||
printf("Error reading next record from wallet database\n"); |
|||
return DB_CORRUPT; |
|||
} |
|||
|
|||
// Unserialize
|
|||
// Taking advantage of the fact that pair serialization
|
|||
// is just the two items serialized one after the other
|
|||
string strType; |
|||
ssKey >> strType; |
|||
if (strType == "name") |
|||
{ |
|||
string strAddress; |
|||
ssKey >> strAddress; |
|||
ssValue >> pwallet->mapAddressBook[strAddress]; |
|||
} |
|||
else if (strType == "tx") |
|||
{ |
|||
uint256 hash; |
|||
ssKey >> hash; |
|||
CWalletTx& wtx = pwallet->mapWallet[hash]; |
|||
ssValue >> wtx; |
|||
wtx.BindWallet(pwallet); |
|||
|
|||
if (wtx.GetHash() != hash) |
|||
printf("Error in wallet.dat, hash mismatch\n"); |
|||
|
|||
// Undo serialize changes in 31600
|
|||
if (31404 <= wtx.fTimeReceivedIsTxTime && wtx.fTimeReceivedIsTxTime <= 31703) |
|||
{ |
|||
if (!ssValue.empty()) |
|||
{ |
|||
char fTmp; |
|||
char fUnused; |
|||
ssValue >> fTmp >> fUnused >> wtx.strFromAccount; |
|||
printf("LoadWallet() upgrading tx ver=%d %d '%s' %s\n", wtx.fTimeReceivedIsTxTime, fTmp, wtx.strFromAccount.c_str(), hash.ToString().c_str()); |
|||
wtx.fTimeReceivedIsTxTime = fTmp; |
|||
} |
|||
else |
|||
{ |
|||
printf("LoadWallet() repairing tx ver=%d %s\n", wtx.fTimeReceivedIsTxTime, hash.ToString().c_str()); |
|||
wtx.fTimeReceivedIsTxTime = 0; |
|||
} |
|||
vWalletUpgrade.push_back(hash); |
|||
} |
|||
|
|||
//// debug print
|
|||
//printf("LoadWallet %s\n", wtx.GetHash().ToString().c_str());
|
|||
//printf(" %12I64d %s %s %s\n",
|
|||
// wtx.vout[0].nValue,
|
|||
// DateTimeStrFormat("%x %H:%M:%S", wtx.GetBlockTime()).c_str(),
|
|||
// wtx.hashBlock.ToString().substr(0,20).c_str(),
|
|||
// wtx.mapValue["message"].c_str());
|
|||
} |
|||
else if (strType == "acentry") |
|||
{ |
|||
string strAccount; |
|||
ssKey >> strAccount; |
|||
uint64 nNumber; |
|||
ssKey >> nNumber; |
|||
if (nNumber > nAccountingEntryNumber) |
|||
nAccountingEntryNumber = nNumber; |
|||
} |
|||
else if (strType == "key" || strType == "wkey") |
|||
{ |
|||
vector<unsigned char> vchPubKey; |
|||
ssKey >> vchPubKey; |
|||
CKey key; |
|||
if (strType == "key") |
|||
{ |
|||
CPrivKey pkey; |
|||
ssValue >> pkey; |
|||
key.SetPubKey(vchPubKey); |
|||
key.SetPrivKey(pkey); |
|||
if (key.GetPubKey() != vchPubKey) |
|||
{ |
|||
printf("Error reading wallet database: CPrivKey pubkey inconsistency\n"); |
|||
return DB_CORRUPT; |
|||
} |
|||
if (!key.IsValid()) |
|||
{ |
|||
printf("Error reading wallet database: invalid CPrivKey\n"); |
|||
return DB_CORRUPT; |
|||
} |
|||
} |
|||
else |
|||
{ |
|||
CWalletKey wkey; |
|||
ssValue >> wkey; |
|||
key.SetPubKey(vchPubKey); |
|||
key.SetPrivKey(wkey.vchPrivKey); |
|||
if (key.GetPubKey() != vchPubKey) |
|||
{ |
|||
printf("Error reading wallet database: CWalletKey pubkey inconsistency\n"); |
|||
return DB_CORRUPT; |
|||
} |
|||
if (!key.IsValid()) |
|||
{ |
|||
printf("Error reading wallet database: invalid CWalletKey\n"); |
|||
return DB_CORRUPT; |
|||
} |
|||
} |
|||
if (!pwallet->LoadKey(key)) |
|||
{ |
|||
printf("Error reading wallet database: LoadKey failed\n"); |
|||
return DB_CORRUPT; |
|||
} |
|||
} |
|||
else if (strType == "mkey") |
|||
{ |
|||
unsigned int nID; |
|||
ssKey >> nID; |
|||
CMasterKey kMasterKey; |
|||
ssValue >> kMasterKey; |
|||
if(pwallet->mapMasterKeys.count(nID) != 0) |
|||
{ |
|||
printf("Error reading wallet database: duplicate CMasterKey id %u\n", nID); |
|||
return DB_CORRUPT; |
|||
} |
|||
pwallet->mapMasterKeys[nID] = kMasterKey; |
|||
if (pwallet->nMasterKeyMaxID < nID) |
|||
pwallet->nMasterKeyMaxID = nID; |
|||
} |
|||
else if (strType == "ckey") |
|||
{ |
|||
vector<unsigned char> vchPubKey; |
|||
ssKey >> vchPubKey; |
|||
vector<unsigned char> vchPrivKey; |
|||
ssValue >> vchPrivKey; |
|||
if (!pwallet->LoadCryptedKey(vchPubKey, vchPrivKey)) |
|||
{ |
|||
printf("Error reading wallet database: LoadCryptedKey failed\n"); |
|||
return DB_CORRUPT; |
|||
} |
|||
fIsEncrypted = true; |
|||
} |
|||
else if (strType == "defaultkey") |
|||
{ |
|||
ssValue >> pwallet->vchDefaultKey; |
|||
} |
|||
else if (strType == "pool") |
|||
{ |
|||
int64 nIndex; |
|||
ssKey >> nIndex; |
|||
pwallet->setKeyPool.insert(nIndex); |
|||
} |
|||
else if (strType == "version") |
|||
{ |
|||
ssValue >> nFileVersion; |
|||
if (nFileVersion == 10300) |
|||
nFileVersion = 300; |
|||
} |
|||
else if (strType == "cscript") |
|||
{ |
|||
uint160 hash; |
|||
ssKey >> hash; |
|||
CScript script; |
|||
ssValue >> script; |
|||
if (!pwallet->LoadCScript(script)) |
|||
{ |
|||
printf("Error reading wallet database: LoadCScript failed\n"); |
|||
return DB_CORRUPT; |
|||
} |
|||
} |
|||
} |
|||
pcursor->close(); |
|||
} |
|||
|
|||
BOOST_FOREACH(uint256 hash, vWalletUpgrade) |
|||
WriteTx(hash, pwallet->mapWallet[hash]); |
|||
|
|||
printf("nFileVersion = %d\n", nFileVersion); |
|||
|
|||
|
|||
// Rewrite encrypted wallets of versions 0.4.0 and 0.5.0rc:
|
|||
if (fIsEncrypted && (nFileVersion == 40000 || nFileVersion == 50000)) |
|||
return DB_NEED_REWRITE; |
|||
|
|||
if (nFileVersion < CLIENT_VERSION) // Update
|
|||
WriteVersion(CLIENT_VERSION); |
|||
|
|||
return DB_LOAD_OK; |
|||
} |
|||
|
|||
void ThreadFlushWalletDB(void* parg) |
|||
{ |
|||
const string& strFile = ((const string*)parg)[0]; |
|||
static bool fOneThread; |
|||
if (fOneThread) |
|||
return; |
|||
fOneThread = true; |
|||
if (!GetBoolArg("-flushwallet", true)) |
|||
return; |
|||
|
|||
unsigned int nLastSeen = nWalletDBUpdated; |
|||
unsigned int nLastFlushed = nWalletDBUpdated; |
|||
int64 nLastWalletUpdate = GetTime(); |
|||
while (!fShutdown) |
|||
{ |
|||
Sleep(500); |
|||
|
|||
if (nLastSeen != nWalletDBUpdated) |
|||
{ |
|||
nLastSeen = nWalletDBUpdated; |
|||
nLastWalletUpdate = GetTime(); |
|||
} |
|||
|
|||
if (nLastFlushed != nWalletDBUpdated && GetTime() - nLastWalletUpdate >= 2) |
|||
{ |
|||
TRY_LOCK(cs_db,lockDb); |
|||
if (lockDb) |
|||
{ |
|||
// Don't do this if any databases are in use
|
|||
int nRefCount = 0; |
|||
map<string, int>::iterator mi = mapFileUseCount.begin(); |
|||
while (mi != mapFileUseCount.end()) |
|||
{ |
|||
nRefCount += (*mi).second; |
|||
mi++; |
|||
} |
|||
|
|||
if (nRefCount == 0 && !fShutdown) |
|||
{ |
|||
map<string, int>::iterator mi = mapFileUseCount.find(strFile); |
|||
if (mi != mapFileUseCount.end()) |
|||
{ |
|||
printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); |
|||
printf("Flushing wallet.dat\n"); |
|||
nLastFlushed = nWalletDBUpdated; |
|||
int64 nStart = GetTimeMillis(); |
|||
|
|||
// Flush wallet.dat so it's self contained
|
|||
CloseDb(strFile); |
|||
dbenv.txn_checkpoint(0, 0, 0); |
|||
dbenv.lsn_reset(strFile.c_str(), 0); |
|||
|
|||
mapFileUseCount.erase(mi++); |
|||
printf("Flushed wallet.dat %"PRI64d"ms\n", GetTimeMillis() - nStart); |
|||
} |
|||
} |
|||
} |
|||
} |
|||
} |
|||
} |
|||
|
|||
bool BackupWallet(const CWallet& wallet, const string& strDest) |
|||
{ |
|||
if (!wallet.fFileBacked) |
|||
return false; |
|||
while (!fShutdown) |
|||
{ |
|||
{ |
|||
LOCK(cs_db); |
|||
if (!mapFileUseCount.count(wallet.strWalletFile) || mapFileUseCount[wallet.strWalletFile] == 0) |
|||
{ |
|||
// Flush log data to the dat file
|
|||
CloseDb(wallet.strWalletFile); |
|||
dbenv.txn_checkpoint(0, 0, 0); |
|||
dbenv.lsn_reset(wallet.strWalletFile.c_str(), 0); |
|||
mapFileUseCount.erase(wallet.strWalletFile); |
|||
|
|||
// Copy wallet.dat
|
|||
filesystem::path pathSrc = GetDataDir() / wallet.strWalletFile; |
|||
filesystem::path pathDest(strDest); |
|||
if (filesystem::is_directory(pathDest)) |
|||
pathDest /= wallet.strWalletFile; |
|||
|
|||
try { |
|||
#if BOOST_VERSION >= 104000 |
|||
filesystem::copy_file(pathSrc, pathDest, filesystem::copy_option::overwrite_if_exists); |
|||
#else |
|||
filesystem::copy_file(pathSrc, pathDest); |
|||
#endif |
|||
printf("copied wallet.dat to %s\n", pathDest.string().c_str()); |
|||
return true; |
|||
} catch(const filesystem::filesystem_error &e) { |
|||
printf("error copying wallet.dat to %s - %s\n", pathDest.string().c_str(), e.what()); |
|||
return false; |
|||
} |
|||
} |
|||
} |
|||
Sleep(100); |
|||
} |
|||
return false; |
|||
} |
@ -0,0 +1,179 @@ |
|||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|||
// Copyright (c) 2009-2012 The Bitcoin developers
|
|||
// Distributed under the MIT/X11 software license, see the accompanying
|
|||
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
|
|||
#ifndef BITCOIN_WALLETDB_H |
|||
#define BITCOIN_WALLETDB_H |
|||
|
|||
#include "db.h" |
|||
|
|||
class CKeyPool; |
|||
class CAccount; |
|||
class CAccountingEntry; |
|||
|
|||
/** Error statuses for the wallet database */ |
|||
enum DBErrors |
|||
{ |
|||
DB_LOAD_OK, |
|||
DB_CORRUPT, |
|||
DB_TOO_NEW, |
|||
DB_LOAD_FAIL, |
|||
DB_NEED_REWRITE |
|||
}; |
|||
|
|||
/** Access to the wallet database (wallet.dat) */ |
|||
class CWalletDB : public CDB |
|||
{ |
|||
public: |
|||
CWalletDB(std::string strFilename, const char* pszMode="r+") : CDB(strFilename.c_str(), pszMode) |
|||
{ |
|||
} |
|||
private: |
|||
CWalletDB(const CWalletDB&); |
|||
void operator=(const CWalletDB&); |
|||
public: |
|||
bool ReadName(const std::string& strAddress, std::string& strName) |
|||
{ |
|||
strName = ""; |
|||
return Read(std::make_pair(std::string("name"), strAddress), strName); |
|||
} |
|||
|
|||
bool WriteName(const std::string& strAddress, const std::string& strName); |
|||
|
|||
bool EraseName(const std::string& strAddress); |
|||
|
|||
bool ReadTx(uint256 hash, CWalletTx& wtx) |
|||
{ |
|||
return Read(std::make_pair(std::string("tx"), hash), wtx); |
|||
} |
|||
|
|||
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 ReadKey(const std::vector<unsigned char>& vchPubKey, CPrivKey& vchPrivKey) |
|||
{ |
|||
vchPrivKey.clear(); |
|||
return Read(std::make_pair(std::string("key"), vchPubKey), vchPrivKey); |
|||
} |
|||
|
|||
bool WriteKey(const std::vector<unsigned char>& vchPubKey, const CPrivKey& vchPrivKey) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
return Write(std::make_pair(std::string("key"), vchPubKey), vchPrivKey, false); |
|||
} |
|||
|
|||
bool WriteCryptedKey(const std::vector<unsigned char>& vchPubKey, const std::vector<unsigned char>& vchCryptedSecret, bool fEraseUnencryptedKey = true) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
if (!Write(std::make_pair(std::string("ckey"), vchPubKey), vchCryptedSecret, false)) |
|||
return false; |
|||
if (fEraseUnencryptedKey) |
|||
{ |
|||
Erase(std::make_pair(std::string("key"), vchPubKey)); |
|||
Erase(std::make_pair(std::string("wkey"), vchPubKey)); |
|||
} |
|||
return true; |
|||
} |
|||
|
|||
bool WriteMasterKey(unsigned int nID, const CMasterKey& kMasterKey) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
return Write(std::make_pair(std::string("mkey"), nID), kMasterKey, true); |
|||
} |
|||
|
|||
// Support for BIP 0013 : see https://en.bitcoin.it/wiki/BIP_0013
|
|||
bool ReadCScript(const uint160 &hash, CScript& redeemScript) |
|||
{ |
|||
redeemScript.clear(); |
|||
return Read(std::make_pair(std::string("cscript"), hash), redeemScript); |
|||
} |
|||
|
|||
bool WriteCScript(const uint160& hash, const CScript& redeemScript) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
return Write(std::make_pair(std::string("cscript"), hash), redeemScript, false); |
|||
} |
|||
|
|||
bool WriteBestBlock(const CBlockLocator& locator) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
return Write(std::string("bestblock"), locator); |
|||
} |
|||
|
|||
bool ReadBestBlock(CBlockLocator& locator) |
|||
{ |
|||
return Read(std::string("bestblock"), locator); |
|||
} |
|||
|
|||
bool ReadDefaultKey(std::vector<unsigned char>& vchPubKey) |
|||
{ |
|||
vchPubKey.clear(); |
|||
return Read(std::string("defaultkey"), vchPubKey); |
|||
} |
|||
|
|||
bool WriteDefaultKey(const std::vector<unsigned char>& vchPubKey) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
return Write(std::string("defaultkey"), vchPubKey); |
|||
} |
|||
|
|||
bool ReadPool(int64 nPool, CKeyPool& keypool) |
|||
{ |
|||
return Read(std::make_pair(std::string("pool"), nPool), keypool); |
|||
} |
|||
|
|||
bool WritePool(int64 nPool, const CKeyPool& keypool) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
return Write(std::make_pair(std::string("pool"), nPool), keypool); |
|||
} |
|||
|
|||
bool ErasePool(int64 nPool) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
return Erase(std::make_pair(std::string("pool"), nPool)); |
|||
} |
|||
|
|||
// Settings are no longer stored in wallet.dat; these are
|
|||
// used only for backwards compatibility:
|
|||
template<typename T> |
|||
bool ReadSetting(const std::string& strKey, T& value) |
|||
{ |
|||
return Read(std::make_pair(std::string("setting"), strKey), value); |
|||
} |
|||
template<typename T> |
|||
bool WriteSetting(const std::string& strKey, const T& value) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
return Write(std::make_pair(std::string("setting"), strKey), value); |
|||
} |
|||
bool EraseSetting(const std::string& strKey) |
|||
{ |
|||
nWalletDBUpdated++; |
|||
return Erase(std::make_pair(std::string("setting"), strKey)); |
|||
} |
|||
|
|||
bool WriteMinVersion(int nVersion) |
|||
{ |
|||
return Write(std::string("minversion"), nVersion); |
|||
} |
|||
|
|||
bool ReadAccount(const std::string& strAccount, CAccount& account); |
|||
bool WriteAccount(const std::string& strAccount, const CAccount& account); |
|||
bool WriteAccountingEntry(const CAccountingEntry& acentry); |
|||
int64 GetAccountCreditDebit(const std::string& strAccount); |
|||
void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& acentries); |
|||
|
|||
int LoadWallet(CWallet* pwallet); |
|||
}; |
|||
|
|||
#endif // BITCOIN_WALLETDB_H
|
Loading…
Reference in new issue