HD Split: Avoid redundant upgrades

achow101 · achow101 · commit 415afcccd3e5 · 2020-01-23T16:35:08.000-05:00
This avoids repeaded upgrades when support for more multiple keyman references is added in the next commit: bitcoin/bitcoin#16341 (comment)
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -384,7 +384,7 @@ bool LegacyScriptPubKeyMan::Upgrade(int prev_version, std::string& error)
         hd_upgrade = true;
     }
     // Upgrade to HD chain split if necessary
-    if (m_storage.CanSupportFeature(FEATURE_HD_SPLIT)) {
+    if (m_storage.CanSupportFeature(FEATURE_HD_SPLIT) && CHDChain::VERSION_HD_CHAIN_SPLIT) {
         WalletLogPrintf("Upgrading wallet to use HD chain split\n");
         m_storage.SetMinVersion(FEATURE_PRE_SPLIT_KEYPOOL);
         split_upgrade = FEATURE_HD_SPLIT > prev_version;

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ bool LegacyScriptPubKeyMan::Upgrade(int prev_version, std::string& error)`
`384`	`384`	`hd_upgrade = true;`
`385`	`385`	`}`
`386`	`386`	`// Upgrade to HD chain split if necessary`
`387`		`- if (m_storage.CanSupportFeature(FEATURE_HD_SPLIT)) {`
	`387`	`+ if (m_storage.CanSupportFeature(FEATURE_HD_SPLIT) && CHDChain::VERSION_HD_CHAIN_SPLIT) {`
`388`	`388`	`WalletLogPrintf("Upgrading wallet to use HD chain split\n");`
`389`	`389`	`m_storage.SetMinVersion(FEATURE_PRE_SPLIT_KEYPOOL);`
`390`	`390`	`split_upgrade = FEATURE_HD_SPLIT > prev_version;`