diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-28 13:10:13 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-28 13:10:31 +0200 |
commit | c3c82c48d9d7b07e1c7db134afe086b31fea34c5 (patch) | |
tree | 915b927fe737242de3a56591153d39857e9af0aa /src/wallet/wallet.h | |
parent | 45eba4b1e0658639bb92730723b987f05e171529 (diff) | |
parent | de45c065f0648c4c41b57cb492420ceeed29dd11 (diff) | |
download | bitcoin-c3c82c48d9d7b07e1c7db134afe086b31fea34c5.tar.xz |
Merge #8389: [0.13] Create a new HD seed after encrypting the wallet
de45c06 [Wallet] Add CKeyMetadata record for HDMasterKey(s), factor out HD key generation (Jonas Schnelli)
f142c11 [0.13] Create a new HD seed after encrypting the wallet (Jonas Schnelli)
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. */ |