GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge afdfd3c8c1 into merged_master (Bitcoin PR #20403)

Browse source
This commit is contained in:
Andrew Poelstra 2021-05-07 21:52:40 +00:00
commit 8d52d54329
5 changed files with 79 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/scriptpubkeyman.cpp
View file

@ -463,7 +463,7 @@ bool LegacyScriptPubKeyMan::Upgrade(int prev_version, int new_version, bilingual
hd_upgrade = true;
}
// Upgrade to HD chain split if necessary
if (IsFeatureSupported(new_version, FEATURE_HD_SPLIT)) {
if (!IsFeatureSupported(prev_version, FEATURE_HD_SPLIT) && IsFeatureSupported(new_version, FEATURE_HD_SPLIT)) {
WalletLogPrintf("Upgrading wallet to use HD chain split\n");
m_storage.SetMinVersion(FEATURE_PRE_SPLIT_KEYPOOL);
split_upgrade = FEATURE_HD_SPLIT > prev_version;