diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-01-16 09:05:27 +0100 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-03-24 10:28:38 +0100 |
| commit | 469a47b7601bddeba052415efe95d0e8b0a7b05e (patch) | |
| tree | cbf80270367f8f8909d06166e224746b3c7e7bbc /src | |
| parent | 05a9b493eb93605c8d147634aecfd8bc92006847 (diff) | |
| download | bitcoin-469a47b7601bddeba052415efe95d0e8b0a7b05e.tar.xz | |
Make sure ReserveKeyFromKeyPool only hands out internal keys if HD_SPLIT is supported
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 15dabad7f5..2707567e82 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3001,7 +3001,7 @@ void CWallet::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool int throw std::runtime_error(std::string(__func__) + ": read failed"); if (!HaveKey(tmpKeypool.vchPubKey.GetID())) throw std::runtime_error(std::string(__func__) + ": unknown key in key pool"); - if (!IsHDEnabled() || tmpKeypool.fInternal == internal) + if (!IsHDEnabled() || (tmpKeypool.fInternal == internal && CanSupportFeature(FEATURE_HD_SPLIT))) { nIndex = id; keypool = tmpKeypool; |