diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-03-27 09:51:55 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-03-27 09:51:55 +0200 |
| commit | 9382f0425e87b30e4621e0e23a99d6e880ec2200 (patch) | |
| tree | 6be2142f3b28b2918962928f09c2572e3abcd150 /src/wallet/wallet.h | |
| parent | 1df08d1580fbab9e58017cf6c1ecb73550bf6ed7 (diff) | |
| download | bitcoin-9382f0425e87b30e4621e0e23a99d6e880ec2200.tar.xz | |
Do not break backward compatibility during wallet encryption
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 0b762cd897..ccede60097 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1055,8 +1055,10 @@ public: /* 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 CPubKey& key); + /* 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); }; /** A key allocated from the key pool. */ |