Browse Source

Make sure ReserveKeyFromKeyPool only hands out internal keys if HD_SPLIT is supported

0.15
Jonas Schnelli 8 years ago
parent
commit
469a47b760
No known key found for this signature in database
GPG Key ID: 1EB776BB03C7922D
  1. 2
      src/wallet/wallet.cpp

2
src/wallet/wallet.cpp

@ -3001,7 +3001,7 @@ void CWallet::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool int @@ -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;

Loading…
Cancel
Save