Make sure we hand out keypool keys if HD_SPLIT is not enabled
This commit is contained in:
parent
469a47b760
commit
9af8f00a75
1 changed files with 1 additions and 1 deletions
|
@ -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 && CanSupportFeature(FEATURE_HD_SPLIT)))
|
if (!IsHDEnabled() || !CanSupportFeature(FEATURE_HD_SPLIT) || tmpKeypool.fInternal == internal)
|
||||||
{
|
{
|
||||||
nIndex = id;
|
nIndex = id;
|
||||||
keypool = tmpKeypool;
|
keypool = tmpKeypool;
|
||||||
|
|
Loading…
Reference in a new issue