diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2017-09-05 15:37:45 -0700 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2017-09-07 16:37:07 -0700 |
| commit | d4c18f7330b1a967b8144df3d49a857514310a55 (patch) | |
| tree | 969fe554cd54b9454e3acdb5ce1b00e6bc4af992 | |
| parent | ba05971bf4e7b9647002aa39ceb384339995195e (diff) | |
| download | bitcoin-d4c18f7330b1a967b8144df3d49a857514310a55.tar.xz | |
Bump wallet version number to 159900
| -rw-r--r-- | src/wallet/wallet.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index d1d2060b0c..7cc25eb79b 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3832,8 +3832,8 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile) // Create new keyUser and set as default key if (gArgs.GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && !walletInstance->IsHDEnabled()) { - // ensure this wallet.dat can only be opened by clients supporting HD with chain split - walletInstance->SetMinVersion(FEATURE_HD_SPLIT); + // ensure this wallet.dat can only be opened by clients supporting HD with chain split and expects no default key + walletInstance->SetMinVersion(FEATURE_NO_DEFAULT_KEY); // generate a new master key CPubKey masterPubKey = walletInstance->GenerateNewHDMasterKey(); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 73ad3bdeca..5bd0bcd32d 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -96,6 +96,8 @@ enum WalletFeature FEATURE_HD_SPLIT = 139900, // Wallet with HD chain split (change outputs will use m/0'/1'/k) + FEATURE_NO_DEFAULT_KEY = 159900, // Wallet without a default key written + FEATURE_LATEST = FEATURE_COMPRPUBKEY // HD is optional, use FEATURE_COMPRPUBKEY as latest version }; |