diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-05-03 09:10:59 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-05-03 09:11:45 +0200 |
| commit | d3dce0eb67e8691745be6cf7e04b920f5e419bd9 (patch) | |
| tree | 24cc063761eb68289261949f5d9bafb770dd1947 /src/wallet/wallet.h | |
| parent | 83073de4bdd8026cfaf64fae59328353df601104 (diff) | |
| parent | 185c7f08be68eec878f4b32b3a52145dd57e13bd (diff) | |
| download | bitcoin-d3dce0eb67e8691745be6cf7e04b920f5e419bd9.tar.xz | |
Merge #10115: Avoid reading the old hd master key during wallet encryption
185c7f0 Avoid reading the old hd master key during wallet encryption (Matt Corallo)
Tree-SHA512: b744e8490c0e948355bb77b2695902bb99f89a68af46aa2be9120bd2ccf3c340eb8a56340fec117f9a935192298028945c9b18120ee6b8b23e7da8ffdb635745
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 8015cc8492..81f7ec59f5 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1100,9 +1100,10 @@ public: CPubKey GenerateNewHDMasterKey(); /* Set the current HD master key (will reset the chain child index counters) - If possibleOldChain is provided, the parameters from the old chain (version) - will be preserved. */ - bool SetHDMasterKey(const CPubKey& key, CHDChain *possibleOldChain = nullptr); + Sets the master key's version based on the current wallet version (so the + caller must ensure the current wallet version is correct before calling + this function). */ + bool SetHDMasterKey(const CPubKey& key); }; /** A key allocated from the key pool. */ |