From cd468d07d5dc3bc953f3fa07784aa842ecfd6b9f Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Fri, 24 Mar 2017 10:57:31 +0100 Subject: [PATCH] Define CWallet::DeriveNewChildKey() as private --- src/wallet/wallet.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 21c7f47f9..0b762cd89 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -118,7 +118,8 @@ public: READWRITE(fInternal); } 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; } } @@ -663,6 +664,9 @@ private: /* the HD chain data model (external chain counters) */ CHDChain hdChain; + /* HD derive new child key (on internal or external chain) */ + void DeriveNewChildKey(CKeyMetadata& metadata, CKey& secret, bool internal = false); + bool fFileBacked; std::set setKeyPool; @@ -791,7 +795,6 @@ public: * Generate a new key */ 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. bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override; //! Adds a key to the store, without saving it to disk (used by LoadWallet)