|
|
@ -3001,7 +3001,7 @@ void CWallet::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool int |
|
|
|
throw std::runtime_error(std::string(__func__) + ": read failed"); |
|
|
|
throw std::runtime_error(std::string(__func__) + ": read failed"); |
|
|
|
if (!HaveKey(tmpKeypool.vchPubKey.GetID())) |
|
|
|
if (!HaveKey(tmpKeypool.vchPubKey.GetID())) |
|
|
|
throw std::runtime_error(std::string(__func__) + ": unknown key in key pool"); |
|
|
|
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; |
|
|
|
nIndex = id; |
|
|
|
keypool = tmpKeypool; |
|
|
|
keypool = tmpKeypool; |
|
|
|