Merge 6419bdfeb1 into merged_master (Bitcoin PR bitcoin/bitcoin#23093)

This commit is contained in:
Byron Hambly 2023-05-11 11:26:51 +00:00
commit d66186c94c
5 changed files with 59 additions and 18 deletions

View file

@ -496,7 +496,7 @@ bool LegacyScriptPubKeyMan::Upgrade(int prev_version, int new_version, bilingual
}
// Regenerate the keypool if upgraded to HD
if (hd_upgrade) {
if (!TopUp()) {
if (!NewKeyPool()) {
error = _("Unable to generate keys");
return false;
}