#include "ui_interface.h"
#include "util.h"
#include "walletdb.h"
+#include "base58.h"
extern unsigned int nStakeMaxAge;
extern bool fWalletUnlockMintOnly;
FEATURE_WALLETCRYPT = 40000, // wallet encryption
FEATURE_COMPRPUBKEY = 60000, // compressed public keys
- FEATURE_LATEST = 60000
+ FEATURE_MALLKEY = 60017,
+ FEATURE_LATEST = 60017
};
/** A key pool entry */
// the maximum wallet format version: memory-only variable that specifies to what version this wallet may be upgraded
int nWalletMaxVersion;
+ int64_t nNextResend;
+ int64_t nLastResend;
+
// stake mining statistics
uint64_t nKernelsTried;
uint64_t nCoinDaysTried;
std::string strWalletFile;
std::set<int64_t> setKeyPool;
+ /*
std::map<CKeyID, CKeyMetadata> mapKeyMetadata;
+ std::map<CMalleableKeyView, CKeyMetadata> mapMalleableKeyMetadata;
+ */
+
+ std::map<CBitcoinAddress, CKeyMetadata> mapKeyMetadata;
typedef std::map<unsigned int, CMasterKey> MasterKeyMap;
MasterKeyMap mapMasterKeys;
CWallet(std::string strWalletFileIn)
{
SetNull();
-
+
strWalletFile = strWalletFileIn;
fFileBacked = true;
}
nMasterKeyMaxID = 0;
pwalletdbEncryption = NULL;
pwalletdbDecryption = NULL;
+ nNextResend = 0;
+ nLastResend = 0;
nOrderPosNext = 0;
nKernelsTried = 0;
nCoinDaysTried = 0;
int64_t nOrderPosNext;
std::map<uint256, int> mapRequestCount;
- std::map<CTxDestination, std::string> mapAddressBook;
+ std::map<CBitcoinAddress, std::string> mapAddressBook;
CPubKey vchDefaultKey;
int64_t nTimeFirstKey;
+ const CWalletTx* GetWalletTx(const uint256& hash) const;
+
// check whether we are allowed to upgrade (or already support) to the named feature
bool CanSupportFeature(enum WalletFeature wf) { return nWalletMaxVersion >= wf; }
// keystore implementation
// Generate a new key
CPubKey GenerateNewKey();
+ CMalleableKeyView GenerateNewMalleableKey();
// Adds a key to the store, and saves it to disk.
bool AddKey(const CKey& key);
+ bool AddKey(const CMalleableKey& mKey);
// Adds a key to the store, without saving it to disk (used by LoadWallet)
bool LoadKey(const CKey& key) { return CCryptoKeyStore::AddKey(key); }
// Load metadata (used by LoadWallet)
bool LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &metadata);
+ bool LoadKeyMetadata(const CMalleableKeyView &keyView, const CKeyMetadata &metadata);
+
+ // Load malleable key without saving it to disk (used by LoadWallet)
+ bool LoadKey(const CMalleableKeyView &keyView, const CSecret &vchSecretH) { return CCryptoKeyStore::AddMalleableKey(keyView, vchSecretH); }
+ bool LoadCryptedKey(const CMalleableKeyView &keyView, const std::vector<unsigned char> &vchCryptedSecretH) { return CCryptoKeyStore::AddCryptedMalleableKey(keyView, vchCryptedSecretH); }
bool LoadMinVersion(int nVersion) { nWalletVersion = nVersion; nWalletMaxVersion = std::max(nWalletMaxVersion, nVersion); return true; }
// Adds an encrypted key to the store, and saves it to disk.
bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret);
+ bool AddCryptedMalleableKey(const CMalleableKeyView& keyView, const std::vector<unsigned char> &vchCryptedSecretH);
// Adds an encrypted key to the store, without saving it to disk (used by LoadWallet)
bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret) { SetMinVersion(FEATURE_WALLETCRYPT); return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret); }
bool AddCScript(const CScript& redeemScript);
bool EncryptWallet(const SecureString& strWalletPassphrase);
bool DecryptWallet(const SecureString& strWalletPassphrase);
- void GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const;
+ void GetAddresses(std::map<CBitcoinAddress, int64_t> &mapAddresses) const;
+ bool GetPEM(const CKeyID &keyID, const std::string &fileName, const SecureString &strPassPhrase) const;
/** Increment the next transaction order id
void MarkDirty();
bool AddToWallet(const CWalletTx& wtxIn);
- bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate = false, bool fFindBlock = false);
+ bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate = false);
bool EraseFromWallet(uint256 hash);
void ClearOrphans();
void WalletUpdateSpent(const CTransaction& prevout, bool fBlock = false);
int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false);
int ScanForWalletTransaction(const uint256& hashTx);
void ReacceptWalletTransactions();
- void ResendWalletTransactions();
+ void ResendWalletTransactions(int64_t nBestBlockTime);
+ std::vector<uint256> ResendWalletTransactionsBefore(int64_t nTime);
int64_t GetBalance() const;
int64_t GetWatchOnlyBalance() const;
int64_t GetUnconfirmedBalance() const;
bool MergeCoins(const int64_t& nAmount, const int64_t& nMinValue, const int64_t& nMaxValue, std::list<uint256>& listMerged);
std::string SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false);
- std::string SendMoneyToDestination(const CTxDestination &address, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false);
bool NewKeyPool(unsigned int nSize = 0);
bool TopUpKeyPool(unsigned int nSize = 0);
int64_t GetOldestKeyPoolTime();
void GetAllReserveKeys(std::set<CKeyID>& setAddress) const;
- std::set< std::set<CTxDestination> > GetAddressGroupings();
- std::map<CTxDestination, int64_t> GetAddressBalances();
+ std::set< std::set<CBitcoinAddress> > GetAddressGroupings();
+ std::map<CBitcoinAddress, int64_t> GetAddressBalances();
isminetype IsMine(const CTxIn& txin) const;
int64_t GetDebit(const CTxIn& txin, const isminefilter& filter) const;
- isminetype IsMine(const CTxOut& txout) const
- {
- return ::IsMine(*this, txout.scriptPubKey);
- }
- int64_t GetCredit(const CTxOut& txout, const isminefilter& filter) const
- {
- if (!MoneyRange(txout.nValue))
- throw std::runtime_error("CWallet::GetCredit() : value out of range");
- return (IsMine(txout) & filter ? txout.nValue : 0);
- }
+ isminetype IsMine(const CTxOut& txout) const;
+ int64_t GetCredit(const CTxOut& txout, const isminefilter& filter) const;
bool IsChange(const CTxOut& txout) const;
- int64_t GetChange(const CTxOut& txout) const
- {
- if (!MoneyRange(txout.nValue))
- throw std::runtime_error("CWallet::GetChange() : value out of range");
- return (IsChange(txout) ? txout.nValue : 0);
- }
- bool IsMine(const CTransaction& tx) const
- {
- BOOST_FOREACH(const CTxOut& txout, tx.vout)
- if (IsMine(txout) && txout.nValue >= nMinimumInputValue)
- return true;
- return false;
- }
- bool IsFromMe(const CTransaction& tx) const
- {
- return (GetDebit(tx, MINE_ALL) > 0);
- }
- int64_t GetDebit(const CTransaction& tx, const isminefilter& filter) const
- {
- int64_t nDebit = 0;
- BOOST_FOREACH(const CTxIn& txin, tx.vin)
- {
- nDebit += GetDebit(txin, filter);
- if (!MoneyRange(nDebit))
- throw std::runtime_error("CWallet::GetDebit() : value out of range");
- }
- return nDebit;
- }
- int64_t GetCredit(const CTransaction& tx, const isminefilter& filter) const
- {
- int64_t nCredit = 0;
- BOOST_FOREACH(const CTxOut& txout, tx.vout)
- {
- nCredit += GetCredit(txout, filter);
- if (!MoneyRange(nCredit))
- throw std::runtime_error("CWallet::GetCredit() : value out of range");
- }
- return nCredit;
- }
- int64_t GetChange(const CTransaction& tx) const
- {
- int64_t nChange = 0;
- BOOST_FOREACH(const CTxOut& txout, tx.vout)
- {
- nChange += GetChange(txout);
- if (!MoneyRange(nChange))
- throw std::runtime_error("CWallet::GetChange() : value out of range");
- }
- return nChange;
- }
+ int64_t GetChange(const CTxOut& txout) const;
+ bool IsMine(const CTransaction& tx) const;
+ bool IsFromMe(const CTransaction& tx) const;
+ int64_t GetDebit(const CTransaction& tx, const isminefilter& filter) const;
+ int64_t GetCredit(const CTransaction& tx, const isminefilter& filter) const;
+ int64_t GetChange(const CTransaction& tx) const;
void SetBestChain(const CBlockLocator& loc);
DBErrors LoadWallet(bool& fFirstRunRet);
-
DBErrors ZapWalletTx();
bool SetAddressBookName(const CTxDestination& address, const std::string& strName);
-
- bool DelAddressBookName(const CTxDestination& address);
-
+ bool SetAddressBookName(const CBitcoinAddress& address, const std::string& strName);
+ bool DelAddressBookName(const CBitcoinAddress& address);
void UpdatedTransaction(const uint256 &hashTx);
-
void PrintWallet(const CBlock& block);
void Inventory(const uint256 &hash)
}
bool GetTransaction(const uint256 &hashTx, CWalletTx& wtx);
-
bool SetDefaultKey(const CPubKey &vchPubKey);
// signify that a particular wallet feature is now used. this may change nWalletVersion and nWalletMaxVersion if those are lower
/** Address book entry changed.
* @note called with lock cs_wallet held.
*/
- boost::signals2::signal<void (CWallet *wallet, const CTxDestination &address, const std::string &label, bool isMine, ChangeType status)> NotifyAddressBookChanged;
+ boost::signals2::signal<void (CWallet *wallet, const CBitcoinAddress &address, const std::string &label, bool isMine, ChangeType status)> NotifyAddressBookChanged;
/** Wallet transaction added, removed or updated.
* @note called with lock cs_wallet held.
// marks certain txout's as spent
// returns true if any update took place
- bool UpdateSpent(const std::vector<char>& vfNewSpent)
- {
- bool fReturn = false;
- for (unsigned int i = 0; i < vfNewSpent.size(); i++)
- {
- if (i == vfSpent.size())
- break;
-
- if (vfNewSpent[i] && !vfSpent[i])
- {
- vfSpent[i] = true;
- fReturn = true;
- fAvailableCreditCached = fAvailableWatchCreditCached = false;
- }
- }
- return fReturn;
- }
+ bool UpdateSpent(const std::vector<char>& vfNewSpent);
// make sure balances are recalculated
- void MarkDirty()
- {
- fCreditCached = false;
- fAvailableCreditCached = fAvailableWatchCreditCached = false;
- fDebitCached = fWatchDebitCached = false;
- fChangeCached = false;
- }
-
- void BindWallet(CWallet *pwalletIn)
- {
- pwallet = pwalletIn;
- MarkDirty();
- }
-
- void MarkSpent(unsigned int nOut)
- {
- if (nOut >= vout.size())
- throw std::runtime_error("CWalletTx::MarkSpent() : nOut out of range");
- vfSpent.resize(vout.size());
- if (!vfSpent[nOut])
- {
- vfSpent[nOut] = true;
- fAvailableCreditCached = fAvailableWatchCreditCached = false;
- }
- }
-
- void MarkUnspent(unsigned int nOut)
- {
- if (nOut >= vout.size())
- throw std::runtime_error("CWalletTx::MarkUnspent() : nOut out of range");
- vfSpent.resize(vout.size());
- if (vfSpent[nOut])
- {
- vfSpent[nOut] = false;
- fAvailableCreditCached = fAvailableWatchCreditCached = false;
- }
- }
-
- bool IsSpent(unsigned int nOut) const
- {
- if (nOut >= vout.size())
- throw std::runtime_error("CWalletTx::IsSpent() : nOut out of range");
- if (nOut >= vfSpent.size())
- return false;
- return (!!vfSpent[nOut]);
- }
-
- int64_t GetDebit(const isminefilter& filter) const
- {
- if (vin.empty())
- return 0;
-
- int64_t nDebit = 0;
- if (filter & MINE_SPENDABLE)
- {
- if (fDebitCached)
- nDebit += nDebitCached;
- else
- {
- nDebitCached = pwallet->GetDebit(*this, MINE_SPENDABLE);
- fDebitCached = true;
- nDebit += nDebitCached;
- }
- }
- if (filter & MINE_WATCH_ONLY)
- {
- if (fWatchDebitCached)
- nDebit += nWatchDebitCached;
- else
- {
- nWatchDebitCached = pwallet->GetDebit(*this, MINE_WATCH_ONLY);
- fWatchDebitCached = true;
- nDebit += nWatchDebitCached;
- }
- }
-
- return nDebit;
- }
-
- int64_t GetCredit(const isminefilter& filter) const
- {
- // Must wait until coinbase is safely deep enough in the chain before valuing it
- if ((IsCoinBase() || IsCoinStake()) && GetBlocksToMaturity() > 0)
- return 0;
-
- int64_t credit = 0;
- if (filter & MINE_SPENDABLE)
- {
- // GetBalance can assume transactions in mapWallet won't change
- if (fCreditCached)
- credit += nCreditCached;
- else
- {
- nCreditCached = pwallet->GetCredit(*this, MINE_SPENDABLE);
- fCreditCached = true;
- credit += nCreditCached;
- }
- }
- if (filter & MINE_WATCH_ONLY)
- {
- if (fWatchCreditCached)
- credit += nWatchCreditCached;
- else
- {
- nWatchCreditCached = pwallet->GetCredit(*this, MINE_WATCH_ONLY);
- fWatchCreditCached = true;
- credit += nWatchCreditCached;
- }
- }
- return credit;
- }
-
- int64_t GetImmatureCredit(bool fUseCache=true) const
- {
- if (IsCoinBase() && GetBlocksToMaturity() > 0 && IsInMainChain())
- {
- if (fUseCache && fImmatureCreditCached)
- return nImmatureCreditCached;
- nImmatureCreditCached = pwallet->GetCredit(*this, MINE_SPENDABLE);
- fImmatureCreditCached = true;
- return nImmatureCreditCached;
- }
-
- return 0;
- }
-
- int64_t GetImmatureWatchOnlyCredit(bool fUseCache=true) const
- {
- if (IsCoinBase() && GetBlocksToMaturity() > 0 && IsInMainChain())
- {
- if (fUseCache && fImmatureWatchCreditCached)
- return nImmatureWatchCreditCached;
- nImmatureWatchCreditCached = pwallet->GetCredit(*this, MINE_WATCH_ONLY);
- fImmatureWatchCreditCached = true;
- return nImmatureWatchCreditCached;
- }
-
- return 0;
- }
-
-
- int64_t GetAvailableCredit(bool fUseCache=true) const
- {
- // Must wait until coinbase is safely deep enough in the chain before valuing it
- if ((IsCoinBase() || IsCoinStake()) && GetBlocksToMaturity() > 0)
- return 0;
-
- if (fUseCache) {
- if (fAvailableCreditCached)
- return nAvailableCreditCached;
- }
-
- int64_t nCredit = 0;
- for (unsigned int i = 0; i < vout.size(); i++)
- {
- if (!IsSpent(i))
- {
- const CTxOut &txout = vout[i];
- nCredit += pwallet->GetCredit(txout, MINE_SPENDABLE);
- if (!MoneyRange(nCredit))
- throw std::runtime_error("CWalletTx::GetAvailableCredit() : value out of range");
- }
- }
-
- nAvailableCreditCached = nCredit;
- fAvailableCreditCached = true;
-
- return nCredit;
- }
-
- int64_t GetAvailableWatchCredit(bool fUseCache=true) const
- {
- // Must wait until coinbase is safely deep enough in the chain before valuing it
- if ((IsCoinBase() || IsCoinStake()) && GetBlocksToMaturity() > 0)
- return 0;
-
- if (fUseCache) {
- if (fAvailableWatchCreditCached)
- return nAvailableWatchCreditCached;
- }
-
- int64_t nCredit = 0;
- for (unsigned int i = 0; i < vout.size(); i++)
- {
- if (!IsSpent(i))
- {
- const CTxOut &txout = vout[i];
- nCredit += pwallet->GetCredit(txout, MINE_WATCH_ONLY);
- if (!MoneyRange(nCredit))
- throw std::runtime_error("CWalletTx::GetAvailableCredit() : value out of range");
- }
- }
-
- nAvailableWatchCreditCached = nCredit;
- fAvailableWatchCreditCached = true;
-
- return nCredit;
- }
-
- int64_t GetChange() const
- {
- if (fChangeCached)
- return nChangeCached;
- nChangeCached = pwallet->GetChange(*this);
- fChangeCached = true;
- return nChangeCached;
- }
-
- void GetAmounts(int64_t& nGeneratedImmature, int64_t& nGeneratedMature, std::list<std::pair<CTxDestination, int64_t> >& listReceived,
- std::list<std::pair<CTxDestination, int64_t> >& listSent, int64_t& nFee, std::string& strSentAccount, const isminefilter& filter) const;
+ void MarkDirty();
+ void BindWallet(CWallet *pwalletIn);
+ void MarkSpent(unsigned int nOut);
+ void MarkUnspent(unsigned int nOut);
+ bool IsSpent(unsigned int nOut) const;
+
+ int64_t GetDebit(const isminefilter& filter) const;
+ int64_t GetCredit(const isminefilter& filter) const;
+ int64_t GetImmatureCredit(bool fUseCache=true) const;
+ int64_t GetImmatureWatchOnlyCredit(bool fUseCache=true) const;
+ int64_t GetAvailableCredit(bool fUseCache=true) const;
+ int64_t GetAvailableWatchCredit(bool fUseCache=true) const;
+ int64_t GetChange() const;
+
+ void GetAmounts(int64_t& nGeneratedImmature, int64_t& nGeneratedMature, std::list<std::pair<CBitcoinAddress, int64_t> >& listReceived,
+ std::list<std::pair<CBitcoinAddress, int64_t> >& listSent, int64_t& nFee, std::string& strSentAccount, const isminefilter& filter) const;
void GetAccountAmounts(const std::string& strAccount, int64_t& nGenerated, int64_t& nReceived,
int64_t& nSent, int64_t& nFee, const isminefilter& filter) const;
return (GetDebit(filter) > 0);
}
- bool IsTrusted() const
- {
- // Quick answer in most cases
- if (!IsFinal())
- return false;
- if (GetDepthInMainChain() >= 1)
- return true;
- if (fConfChange || !IsFromMe(MINE_ALL)) // using wtx's cached debit
- return false;
-
- // If no confirmations but it's from us, we can still
- // consider it confirmed if all dependencies are confirmed
- std::map<uint256, const CMerkleTx*> mapPrev;
- std::vector<const CMerkleTx*> vWorkQueue;
- vWorkQueue.reserve(vtxPrev.size()+1);
- vWorkQueue.push_back(this);
- for (unsigned int i = 0; i < vWorkQueue.size(); i++)
- {
- const CMerkleTx* ptx = vWorkQueue[i];
-
- if (!ptx->IsFinal())
- return false;
- if (ptx->GetDepthInMainChain() >= 1)
- continue;
- if (!pwallet->IsFromMe(*ptx))
- return false;
-
- if (mapPrev.empty())
- {
- BOOST_FOREACH(const CMerkleTx& tx, vtxPrev)
- mapPrev[tx.GetHash()] = &tx;
- }
-
- BOOST_FOREACH(const CTxIn& txin, ptx->vin)
- {
- if (!mapPrev.count(txin.prevout.hash))
- return false;
- vWorkQueue.push_back(mapPrev[txin.prevout.hash]);
- }
- }
-
- return true;
- }
+ bool InMempool() const;
+ bool IsTrusted() const;
bool WriteToDisk();
bool AcceptWalletTransaction(CTxDB& txdb, bool fCheckInputs=true);
bool AcceptWalletTransaction();
- void RelayWalletTransaction(CTxDB& txdb);
- void RelayWalletTransaction();
+ bool RelayWalletTransaction(CTxDB& txdb);
+ bool RelayWalletTransaction();
};
{
return strprintf("COutput(%s, %d, %d, %d) [%s]", tx->GetHash().ToString().substr(0,10).c_str(), i, fSpendable, nDepth, FormatMoney(tx->vout[i].nValue).c_str());
}
-
- void print() const
- {
- printf("%s\n", ToString().c_str());
- }
};
git://git.novaco.in / novacoin.git / blobdiff