|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#ifndef BITCOIN_DB_H
|
|
|
|
#define BITCOIN_DB_H
|
|
|
|
|
|
|
|
#include "key.h"
|
|
|
|
|
|
|
|
#include <map>
|
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
#include <db_cxx.h>
|
|
|
|
|
|
|
|
class CTxIndex;
|
|
|
|
class CDiskBlockIndex;
|
|
|
|
class CDiskTxPos;
|
|
|
|
class COutPoint;
|
|
|
|
class CAddress;
|
|
|
|
class CWalletTx;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
14 years ago
|
|
|
class CWallet;
|
|
|
|
class CAccount;
|
|
|
|
class CAccountingEntry;
|
|
|
|
class CBlockLocator;
|
|
|
|
|
|
|
|
|
|
|
|
extern unsigned int nWalletDBUpdated;
|
|
|
|
extern DbEnv dbenv;
|
|
|
|
|
|
|
|
|
|
|
|
extern void DBFlush(bool fShutdown);
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
14 years ago
|
|
|
void ThreadFlushWalletDB(void* parg);
|
|
|
|
bool BackupWallet(const CWallet& wallet, const std::string& strDest);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class CDB
|
|
|
|
{
|
|
|
|
protected:
|
|
|
|
Db* pdb;
|
|
|
|
std::string strFile;
|
|
|
|
std::vector<DbTxn*> vTxn;
|
|
|
|
bool fReadOnly;
|
|
|
|
|
|
|
|
explicit CDB(const char* pszFile, const char* pszMode="r+");
|
|
|
|
~CDB() { Close(); }
|
|
|
|
public:
|
|
|
|
void Close();
|
|
|
|
private:
|
|
|
|
CDB(const CDB&);
|
|
|
|
void operator=(const CDB&);
|
|
|
|
|
|
|
|
protected:
|
|
|
|
template<typename K, typename T>
|
|
|
|
bool Read(const K& key, T& value)
|
|
|
|
{
|
|
|
|
if (!pdb)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Key
|
|
|
|
CDataStream ssKey(SER_DISK);
|
|
|
|
ssKey.reserve(1000);
|
|
|
|
ssKey << key;
|
|
|
|
Dbt datKey(&ssKey[0], ssKey.size());
|
|
|
|
|
|
|
|
// Read
|
|
|
|
Dbt datValue;
|
|
|
|
datValue.set_flags(DB_DBT_MALLOC);
|
|
|
|
int ret = pdb->get(GetTxn(), &datKey, &datValue, 0);
|
|
|
|
memset(datKey.get_data(), 0, datKey.get_size());
|
|
|
|
if (datValue.get_data() == NULL)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Unserialize value
|
|
|
|
CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK);
|
|
|
|
ssValue >> value;
|
|
|
|
|
|
|
|
// Clear and free memory
|
|
|
|
memset(datValue.get_data(), 0, datValue.get_size());
|
|
|
|
free(datValue.get_data());
|
|
|
|
return (ret == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename K, typename T>
|
|
|
|
bool Write(const K& key, const T& value, bool fOverwrite=true)
|
|
|
|
{
|
|
|
|
if (!pdb)
|
|
|
|
return false;
|
|
|
|
if (fReadOnly)
|
|
|
|
assert(("Write called on database in read-only mode", false));
|
|
|
|
|
|
|
|
// Key
|
|
|
|
CDataStream ssKey(SER_DISK);
|
|
|
|
ssKey.reserve(1000);
|
|
|
|
ssKey << key;
|
|
|
|
Dbt datKey(&ssKey[0], ssKey.size());
|
|
|
|
|
|
|
|
// Value
|
|
|
|
CDataStream ssValue(SER_DISK);
|
|
|
|
ssValue.reserve(10000);
|
|
|
|
ssValue << value;
|
|
|
|
Dbt datValue(&ssValue[0], ssValue.size());
|
|
|
|
|
|
|
|
// Write
|
|
|
|
int ret = pdb->put(GetTxn(), &datKey, &datValue, (fOverwrite ? 0 : DB_NOOVERWRITE));
|
|
|
|
|
|
|
|
// Clear memory in case it was a private key
|
|
|
|
memset(datKey.get_data(), 0, datKey.get_size());
|
|
|
|
memset(datValue.get_data(), 0, datValue.get_size());
|
|
|
|
return (ret == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename K>
|
|
|
|
bool Erase(const K& key)
|
|
|
|
{
|
|
|
|
if (!pdb)
|
|
|
|
return false;
|
|
|
|
if (fReadOnly)
|
|
|
|
assert(("Erase called on database in read-only mode", false));
|
|
|
|
|
|
|
|
// Key
|
|
|
|
CDataStream ssKey(SER_DISK);
|
|
|
|
ssKey.reserve(1000);
|
|
|
|
ssKey << key;
|
|
|
|
Dbt datKey(&ssKey[0], ssKey.size());
|
|
|
|
|
|
|
|
// Erase
|
|
|
|
int ret = pdb->del(GetTxn(), &datKey, 0);
|
|
|
|
|
|
|
|
// Clear memory
|
|
|
|
memset(datKey.get_data(), 0, datKey.get_size());
|
|
|
|
return (ret == 0 || ret == DB_NOTFOUND);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename K>
|
|
|
|
bool Exists(const K& key)
|
|
|
|
{
|
|
|
|
if (!pdb)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Key
|
|
|
|
CDataStream ssKey(SER_DISK);
|
|
|
|
ssKey.reserve(1000);
|
|
|
|
ssKey << key;
|
|
|
|
Dbt datKey(&ssKey[0], ssKey.size());
|
|
|
|
|
|
|
|
// Exists
|
|
|
|
int ret = pdb->exists(GetTxn(), &datKey, 0);
|
|
|
|
|
|
|
|
// Clear memory
|
|
|
|
memset(datKey.get_data(), 0, datKey.get_size());
|
|
|
|
return (ret == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
Dbc* GetCursor()
|
|
|
|
{
|
|
|
|
if (!pdb)
|
|
|
|
return NULL;
|
|
|
|
Dbc* pcursor = NULL;
|
|
|
|
int ret = pdb->cursor(NULL, &pcursor, 0);
|
|
|
|
if (ret != 0)
|
|
|
|
return NULL;
|
|
|
|
return pcursor;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ReadAtCursor(Dbc* pcursor, CDataStream& ssKey, CDataStream& ssValue, unsigned int fFlags=DB_NEXT)
|
|
|
|
{
|
|
|
|
// Read at cursor
|
|
|
|
Dbt datKey;
|
|
|
|
if (fFlags == DB_SET || fFlags == DB_SET_RANGE || fFlags == DB_GET_BOTH || fFlags == DB_GET_BOTH_RANGE)
|
|
|
|
{
|
|
|
|
datKey.set_data(&ssKey[0]);
|
|
|
|
datKey.set_size(ssKey.size());
|
|
|
|
}
|
|
|
|
Dbt datValue;
|
|
|
|
if (fFlags == DB_GET_BOTH || fFlags == DB_GET_BOTH_RANGE)
|
|
|
|
{
|
|
|
|
datValue.set_data(&ssValue[0]);
|
|
|
|
datValue.set_size(ssValue.size());
|
|
|
|
}
|
|
|
|
datKey.set_flags(DB_DBT_MALLOC);
|
|
|
|
datValue.set_flags(DB_DBT_MALLOC);
|
|
|
|
int ret = pcursor->get(&datKey, &datValue, fFlags);
|
|
|
|
if (ret != 0)
|
|
|
|
return ret;
|
|
|
|
else if (datKey.get_data() == NULL || datValue.get_data() == NULL)
|
|
|
|
return 99999;
|
|
|
|
|
|
|
|
// Convert to streams
|
|
|
|
ssKey.SetType(SER_DISK);
|
|
|
|
ssKey.clear();
|
|
|
|
ssKey.write((char*)datKey.get_data(), datKey.get_size());
|
|
|
|
ssValue.SetType(SER_DISK);
|
|
|
|
ssValue.clear();
|
|
|
|
ssValue.write((char*)datValue.get_data(), datValue.get_size());
|
|
|
|
|
|
|
|
// Clear and free memory
|
|
|
|
memset(datKey.get_data(), 0, datKey.get_size());
|
|
|
|
memset(datValue.get_data(), 0, datValue.get_size());
|
|
|
|
free(datKey.get_data());
|
|
|
|
free(datValue.get_data());
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
DbTxn* GetTxn()
|
|
|
|
{
|
|
|
|
if (!vTxn.empty())
|
|
|
|
return vTxn.back();
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
public:
|
|
|
|
bool TxnBegin()
|
|
|
|
{
|
|
|
|
if (!pdb)
|
|
|
|
return false;
|
|
|
|
DbTxn* ptxn = NULL;
|
|
|
|
int ret = dbenv.txn_begin(GetTxn(), &ptxn, DB_TXN_NOSYNC);
|
|
|
|
if (!ptxn || ret != 0)
|
|
|
|
return false;
|
|
|
|
vTxn.push_back(ptxn);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool TxnCommit()
|
|
|
|
{
|
|
|
|
if (!pdb)
|
|
|
|
return false;
|
|
|
|
if (vTxn.empty())
|
|
|
|
return false;
|
|
|
|
int ret = vTxn.back()->commit(0);
|
|
|
|
vTxn.pop_back();
|
|
|
|
return (ret == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool TxnAbort()
|
|
|
|
{
|
|
|
|
if (!pdb)
|
|
|
|
return false;
|
|
|
|
if (vTxn.empty())
|
|
|
|
return false;
|
|
|
|
int ret = vTxn.back()->abort();
|
|
|
|
vTxn.pop_back();
|
|
|
|
return (ret == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool ReadVersion(int& nVersion)
|
|
|
|
{
|
|
|
|
nVersion = 0;
|
|
|
|
return Read(std::string("version"), nVersion);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool WriteVersion(int nVersion)
|
|
|
|
{
|
|
|
|
return Write(std::string("version"), nVersion);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class CTxDB : public CDB
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
CTxDB(const char* pszMode="r+") : CDB("blkindex.dat", pszMode) { }
|
|
|
|
private:
|
|
|
|
CTxDB(const CTxDB&);
|
|
|
|
void operator=(const CTxDB&);
|
|
|
|
public:
|
|
|
|
bool ReadTxIndex(uint256 hash, CTxIndex& txindex);
|
|
|
|
bool UpdateTxIndex(uint256 hash, const CTxIndex& txindex);
|
|
|
|
bool AddTxIndex(const CTransaction& tx, const CDiskTxPos& pos, int nHeight);
|
|
|
|
bool EraseTxIndex(const CTransaction& tx);
|
|
|
|
bool ContainsTx(uint256 hash);
|
|
|
|
bool ReadOwnerTxes(uint160 hash160, int nHeight, std::vector<CTransaction>& vtx);
|
|
|
|
bool ReadDiskTx(uint256 hash, CTransaction& tx, CTxIndex& txindex);
|
|
|
|
bool ReadDiskTx(uint256 hash, CTransaction& tx);
|
|
|
|
bool ReadDiskTx(COutPoint outpoint, CTransaction& tx, CTxIndex& txindex);
|
|
|
|
bool ReadDiskTx(COutPoint outpoint, CTransaction& tx);
|
|
|
|
bool WriteBlockIndex(const CDiskBlockIndex& blockindex);
|
|
|
|
bool EraseBlockIndex(uint256 hash);
|
|
|
|
bool ReadHashBestChain(uint256& hashBestChain);
|
|
|
|
bool WriteHashBestChain(uint256 hashBestChain);
|
|
|
|
bool ReadBestInvalidWork(CBigNum& bnBestInvalidWork);
|
|
|
|
bool WriteBestInvalidWork(CBigNum bnBestInvalidWork);
|
|
|
|
bool LoadBlockIndex();
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class CAddrDB : public CDB
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
CAddrDB(const char* pszMode="r+") : CDB("addr.dat", pszMode) { }
|
|
|
|
private:
|
|
|
|
CAddrDB(const CAddrDB&);
|
|
|
|
void operator=(const CAddrDB&);
|
|
|
|
public:
|
|
|
|
bool WriteAddress(const CAddress& addr);
|
|
|
|
bool EraseAddress(const CAddress& addr);
|
|
|
|
bool LoadAddresses();
|
|
|
|
};
|
|
|
|
|
|
|
|
bool LoadAddresses();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class CKeyPool
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
int64 nTime;
|
|
|
|
std::vector<unsigned char> vchPubKey;
|
|
|
|
|
|
|
|
CKeyPool()
|
|
|
|
{
|
|
|
|
nTime = GetTime();
|
|
|
|
}
|
|
|
|
|
|
|
|
CKeyPool(const std::vector<unsigned char>& vchPubKeyIn)
|
|
|
|
{
|
|
|
|
nTime = GetTime();
|
|
|
|
vchPubKey = vchPubKeyIn;
|
|
|
|
}
|
|
|
|
|
|
|
|
IMPLEMENT_SERIALIZE
|
|
|
|
(
|
|
|
|
if (!(nType & SER_GETHASH))
|
|
|
|
READWRITE(nVersion);
|
|
|
|
READWRITE(nTime);
|
|
|
|
READWRITE(vchPubKey);
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
enum DBErrors
|
|
|
|
{
|
|
|
|
DB_LOAD_OK,
|
|
|
|
DB_CORRUPT,
|
|
|
|
DB_TOO_NEW
|
|
|
|
};
|
|
|
|
|
|
|
|
class CWalletDB : public CDB
|
|
|
|
{
|
|
|
|
public:
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
14 years ago
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
14 years ago
|
|
|
bool WriteName(const std::string& strAddress, const std::string& strName);
|
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
14 years ago
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
14 years ago
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
14 years ago
|
|
|
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));
|
|
|
|
}
|
|
|
|
|
|
|
|
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 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
|