sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 05:23:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Define CWallet::DeriveNewChildKey() as private

Browse Source
This commit is contained in:
Jonas Schnelli 2017-03-24 10:57:31 +01:00
parent ed79e4f497
commit cd468d07d5
No known key found for this signature in database
GPG Key ID: 1EB776BB03C7922D
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/wallet.h
View File

@ -118,7 +118,8 @@ public:
READWRITE(fInternal); READWRITE(fInternal);
} }
catch (std::ios_base::failure&) { catch (std::ios_base::failure&) {
/* flag as external address if we can't read the internal boolean */ /* flag as external address if we can't read the internal boolean
(this will be the case for any wallet before the HD chain split version) */
fInternal = false; fInternal = false;
} }
} }
@ -663,6 +664,9 @@ private:
/* the HD chain data model (external chain counters) */ /* the HD chain data model (external chain counters) */
CHDChain hdChain; CHDChain hdChain;
/* HD derive new child key (on internal or external chain) */
void DeriveNewChildKey(CKeyMetadata& metadata, CKey& secret, bool internal = false);
bool fFileBacked; bool fFileBacked;
std::set<int64_t> setKeyPool; std::set<int64_t> setKeyPool;
@ -791,7 +795,6 @@ public:
* Generate a new key * Generate a new key
*/ */
CPubKey GenerateNewKey(bool internal = false); CPubKey GenerateNewKey(bool internal = false);
void DeriveNewChildKey(CKeyMetadata& metadata, CKey& secret, bool internal = false);
//! Adds a key to the store, and saves it to disk. //! Adds a key to the store, and saves it to disk.
bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override; bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override;
//! Adds a key to the store, without saving it to disk (used by LoadWallet) //! Adds a key to the store, without saving it to disk (used by LoadWallet)