Merge 3212d104f4 into merged_master (Bitcoin PR bitcoin/bitcoin#23829)

This commit is contained in:
Tom Trevethan 2025-04-01 15:23:27 +00:00
commit 694c51a39f
23 changed files with 47 additions and 47 deletions

View file

@ -2128,7 +2128,7 @@ bool DescriptorScriptPubKeyMan::TopUp(unsigned int size)
if (size > 0) {
target_size = size;
} else {
target_size = std::max(gArgs.GetIntArg("-keypool", DEFAULT_KEYPOOL_SIZE), (int64_t) 1);
target_size = std::max(gArgs.GetIntArg("-keypool", DEFAULT_KEYPOOL_SIZE), int64_t{1});
}
// Calculate the new range_end