Permalink
Browse files

[Wallet] Ensure <0.13 clients can't open HD wallets

  • Loading branch information...
jonasschnelli committed Jul 15, 2016
1 parent 3726910 commit 3b38a6a96a955d7b0192ece6ddcc7d750e155d81
Showing with 7 additions and 1 deletion.
  1. +2 −0 doc/release-notes.md
  2. +3 −0 src/wallet/wallet.cpp
  3. +2 −1 src/wallet/wallet.h
View
@@ -131,6 +131,8 @@ You can't disable HD key generation once you have created a HD wallet.
There is no distinction between internal (change) and external keys.
HD wallets are incompatible with older versions of Bitcoin Core.
[Pull request](https://github.com/bitcoin/bitcoin/pull/8035/files), [BIP 32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki)
Low-level P2P changes
View
@@ -3299,6 +3299,9 @@ bool CWallet::InitLoadWallet()
key.MakeNewKey(true);
if (!walletInstance->SetHDMasterKey(key))
throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed");
// ensure this wallet.dat can only be opened by clients supporting HD
walletInstance->SetMinVersion(FEATURE_HD);
}
CPubKey newDefaultKey;
if (walletInstance->GetKeyFromPool(newDefaultKey)) {
View
@@ -78,7 +78,8 @@ enum WalletFeature
FEATURE_WALLETCRYPT = 40000, // wallet encryption
FEATURE_COMPRPUBKEY = 60000, // compressed public keys
FEATURE_LATEST = 60000
FEATURE_HD = 130000, // Hierarchical key derivation after BIP32 (HD Wallet)
FEATURE_LATEST = FEATURE_COMPRPUBKEY // HD is optional, use FEATURE_COMPRPUBKEY as latest version
};

0 comments on commit 3b38a6a

Please sign in to comment.