diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-07-21 21:19:02 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-28 13:22:33 +0200 |
| commit | 2266b43e3317a889b9150e614169acda50383bf5 (patch) | |
| tree | 5b59edb89e4f652e2cd29c25b425ea6c7d1864ce /src/wallet/wallet.h | |
| parent | 806b9e7570a217ee432c3cc77278b841baf1660f (diff) | |
| download | bitcoin-2266b43e3317a889b9150e614169acda50383bf5.tar.xz | |
Port from 0.13: Create a new HD seed after encrypting the wallet
Forward-ports two commits from 0.13:
- [0.13] Create a new HD seed after encrypting the wallet
- [Wallet] Add CKeyMetadata record for HDMasterKey(s), factor out HD key generation
Github-Pull: #8389
Rebased-From: f142c11ac634df487cc4bc65a5f1c9a3e3563dd9 de45c065f0648c4c41b57cb492420ceeed29dd11
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index efed2ba11d..0c95fdf4b0 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -901,8 +901,11 @@ public: bool SetHDChain(const CHDChain& chain, bool memonly); const CHDChain& GetHDChain() { return hdChain; } + /* Generates a new HD master key (will not be activated) */ + CPubKey GenerateNewHDMasterKey(); + /* Set the current HD master key (will reset the chain child index counters) */ - bool SetHDMasterKey(const CKey& key); + bool SetHDMasterKey(const CPubKey& key); }; /** A key allocated from the key pool. */ |