X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fwallet.h;h=4db32e52bec4de18804cc96f133db86cdbcb5039;hp=c1a987ea04846b991b52f54dd3f3e4e97e155cac;hb=9e58e0a8ca28b15a4bfa677f5b23891972db40fd;hpb=056f3b1ef51d160dad763ed43cacc151735999de diff --git a/src/wallet.h b/src/wallet.h index c1a987e..4db32e5 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -17,6 +17,7 @@ #include "ui_interface.h" #include "util.h" #include "walletdb.h" +#include "base58.h" extern unsigned int nStakeMaxAge; extern bool fWalletUnlockMintOnly; @@ -30,11 +31,6 @@ class CCoinControl; // Set of selected transactions typedef std::set > CoinsSet; -// Preloaded coins metadata -// (txid, vout.n) => ((txindex, (tx, vout.n)), (block, modifier)) -typedef std::map, std::pair >, std::pair > > MetaMap; - - /** (client) version numbers for particular wallet features */ enum WalletFeature { @@ -42,7 +38,8 @@ enum WalletFeature FEATURE_WALLETCRYPT = 40000, // wallet encryption FEATURE_COMPRPUBKEY = 60000, // compressed public keys - FEATURE_LATEST = 60000 + FEATURE_MALLKEY = 60017, + FEATURE_LATEST = 60017 }; /** A key pool entry */ @@ -78,10 +75,9 @@ public: class CWallet : public CCryptoKeyStore { private: - bool SelectCoinsSimple(int64_t nTargetValue, int64_t nMinValue, int64_t nMaxValue, unsigned int nSpendTime, int nMinConf, std::set >& setCoinsRet, int64_t& nValueRet) const; bool SelectCoins(int64_t nTargetValue, unsigned int nSpendTime, std::set >& setCoinsRet, int64_t& nValueRet, const CCoinControl *coinControl=NULL) const; - CWalletDB *pwalletdbEncryption; + CWalletDB *pwalletdbEncryption, *pwalletdbDecryption; // the current wallet version: clients below this version are not able to load the wallet int nWalletVersion; @@ -89,9 +85,6 @@ private: // the maximum wallet format version: memory-only variable that specifies to what version this wallet may be upgraded int nWalletMaxVersion; - // selected coins metadata - std::map, std::pair >, std::pair > > mapMeta; - // stake mining statistics uint64_t nKernelsTried; uint64_t nCoinDaysTried; @@ -103,8 +96,12 @@ public: std::string strWalletFile; std::set setKeyPool; + /* std::map mapKeyMetadata; + std::map mapMalleableKeyMetadata; + */ + std::map mapKeyMetadata; typedef std::map MasterKeyMap; MasterKeyMap mapMasterKeys; @@ -112,26 +109,27 @@ public: CWallet() { - nWalletVersion = FEATURE_BASE; - nWalletMaxVersion = FEATURE_BASE; - fFileBacked = false; - nMasterKeyMaxID = 0; - pwalletdbEncryption = NULL; - nOrderPosNext = 0; - nKernelsTried = 0; - nCoinDaysTried = 0; + SetNull(); } CWallet(std::string strWalletFileIn) { - nWalletVersion = FEATURE_BASE; - nWalletMaxVersion = FEATURE_BASE; + SetNull(); + strWalletFile = strWalletFileIn; fFileBacked = true; + } + void SetNull() + { + nWalletVersion = FEATURE_BASE; + nWalletMaxVersion = FEATURE_BASE; + fFileBacked = false; nMasterKeyMaxID = 0; pwalletdbEncryption = NULL; + pwalletdbDecryption = NULL; nOrderPosNext = 0; nKernelsTried = 0; nCoinDaysTried = 0; + nTimeFirstKey = 0; } std::map mapWallet; @@ -139,7 +137,7 @@ public: int64_t nOrderPosNext; std::map mapRequestCount; - std::map mapAddressBook; + std::map mapAddressBook; CPubKey vchDefaultKey; int64_t nTimeFirstKey; @@ -150,20 +148,32 @@ public: void AvailableCoinsMinConf(std::vector& vCoins, int nConf, int64_t nMinValue, int64_t nMaxValue) const; void AvailableCoins(std::vector& vCoins, bool fOnlyConfirmed=true, const CCoinControl *coinControl=NULL) const; bool SelectCoinsMinConf(int64_t nTargetValue, unsigned int nSpendTime, int nConfMine, int nConfTheirs, std::vector vCoins, std::set >& setCoinsRet, int64_t& nValueRet) const; + + // Simple select (without randomization) + bool SelectCoinsSimple(int64_t nTargetValue, int64_t nMinValue, int64_t nMaxValue, unsigned int nSpendTime, int nMinConf, std::set >& setCoinsRet, int64_t& nValueRet) const; + // 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 &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 &vchCryptedSecret); + bool AddCryptedMalleableKey(const CMalleableKeyView& keyView, const std::vector &vchCryptedSecretH); // Adds an encrypted key to the store, without saving it to disk (used by LoadWallet) bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector &vchCryptedSecret) { SetMinVersion(FEATURE_WALLETCRYPT); return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret); } bool AddCScript(const CScript& redeemScript); @@ -178,8 +188,10 @@ public: bool Unlock(const SecureString& strWalletPassphrase); bool ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase); bool EncryptWallet(const SecureString& strWalletPassphrase); + bool DecryptWallet(const SecureString& strWalletPassphrase); - void GetKeyBirthTimes(std::map &mapKeyBirth) const; + void GetAddresses(std::map &mapAddresses) const; + bool GetPEM(const CKeyID &keyID, const std::string &fileName, const SecureString &strPassPhrase) const; /** Increment the next transaction order id @@ -205,7 +217,7 @@ public: int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false); int ScanForWalletTransaction(const uint256& hashTx); void ReacceptWalletTransactions(); - void ResendWalletTransactions(); + void ResendWalletTransactions(bool fForceResend=false); int64_t GetBalance() const; int64_t GetWatchOnlyBalance() const; int64_t GetUnconfirmedBalance() const; @@ -220,15 +232,13 @@ public: bool CreateTransaction(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, const CCoinControl *coinControl=NULL); bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey); - void GetStakeStats(float &nKernelsRate, float &nCoinDaysRate); void GetStakeWeightFromValue(const int64_t& nTime, const int64_t& nValue, uint64_t& nWeight); - bool CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, uint32_t nSearchInterval, CTransaction& txNew, CKey& key); + bool CreateCoinStake(uint256 &hashTx, uint32_t nOut, uint32_t nTime, uint32_t nBits, CTransaction &txNew, CKey& key); bool MergeCoins(const int64_t& nAmount, const int64_t& nMinValue, const int64_t& nMaxValue, std::list& 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(); + bool NewKeyPool(unsigned int nSize = 0); bool TopUpKeyPool(unsigned int nSize = 0); int64_t AddReserveKey(const CKeyPool& keypool); void ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool); @@ -238,8 +248,8 @@ public: int64_t GetOldestKeyPoolTime(); void GetAllReserveKeys(std::set& setAddress) const; - std::set< std::set > GetAddressGroupings(); - std::map GetAddressBalances(); + std::set< std::set > GetAddressGroupings(); + std::map GetAddressBalances(); isminetype IsMine(const CTxIn& txin) const; int64_t GetDebit(const CTxIn& txin, const isminefilter& filter) const; @@ -308,9 +318,13 @@ public: 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); @@ -328,7 +342,7 @@ public: unsigned int GetKeyPoolSize() { - return setKeyPool.size(); + return (unsigned int)(setKeyPool.size()); } bool GetTransaction(const uint256 &hashTx, CWalletTx& wtx); @@ -350,7 +364,7 @@ public: /** Address book entry changed. * @note called with lock cs_wallet held. */ - boost::signals2::signal NotifyAddressBookChanged; + boost::signals2::signal NotifyAddressBookChanged; /** Wallet transaction added, removed or updated. * @note called with lock cs_wallet held. @@ -788,8 +802,8 @@ public: return nChangeCached; } - void GetAmounts(int64_t& nGeneratedImmature, int64_t& nGeneratedMature, std::list >& listReceived, - std::list >& listSent, int64_t& nFee, std::string& strSentAccount, const isminefilter& filter) const; + void GetAmounts(int64_t& nGeneratedImmature, int64_t& nGeneratedMature, std::list >& listReceived, + std::list >& 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;