[Wallet] Upgrade to HD from a locked wallet error notification + further old comments cleanup.

furszy · furszy · commit 7f7ffae9b587 · 2020-03-05T20:20:00.000-03:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -327,7 +327,7 @@ static void registerSignalHandler(int signal, void(*handler)(int))
 
 bool static InitError(const std::string& str)
 {
-    uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR);
+    uiInterface.ThreadSafeMessageBox(str, "Init Error", CClientUIInterface::MSG_ERROR);
     return false;
 }
 
@@ -1673,17 +1673,27 @@ bool AppInit2()
 
         int prev_version = pwalletMain->GetVersion();
         if (GetBoolArg("-upgradewallet", fFirstRun)) {
-            int nMaxVersion = GetArg("-upgradewallet", 0);
-            if (nMaxVersion == 0) // the -upgradewallet without argument case
-            {
-                LogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);
-                nMaxVersion = FEATURE_LATEST;
-                pwalletMain->SetMinVersion(FEATURE_LATEST); // permanently upgrade the wallet immediately
-            } else
-                LogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);
-            if (nMaxVersion < pwalletMain->GetVersion())
-                strErrors << _("Cannot downgrade wallet") << "\n";
-            pwalletMain->SetMaxVersion(nMaxVersion);
+
+            if (prev_version <= FEATURE_PRE_PIVX && pwalletMain->IsLocked()) {
+                // Cannot upgrade a locked wallet
+                std::string strProblem = "Cannot upgrade a locked wallet.\n";
+                strErrors << _("Error: ") << strProblem;
+                LogPrintf("%s", strErrors.str());
+                return InitError(strProblem);
+            } else {
+
+                int nMaxVersion = GetArg("-upgradewallet", 0);
+                if (nMaxVersion == 0) // the -upgradewallet without argument case
+                {
+                    LogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);
+                    nMaxVersion = FEATURE_LATEST;
+                    pwalletMain->SetMinVersion(FEATURE_LATEST); // permanently upgrade the wallet immediately
+                } else
+                    LogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);
+                if (nMaxVersion < pwalletMain->GetVersion())
+                    strErrors << _("Cannot downgrade wallet") << "\n";
+                pwalletMain->SetMaxVersion(nMaxVersion);
+            }
         }
 
         // Upgrade to HD if explicit upgrade was requested.
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -103,6 +103,7 @@ int64_t ScriptPubKeyMan::GetOldestKeyPoolTime()
     int64_t oldestKey = GetOldestKeyTimeInPool(setExternalKeyPool, batch);
     if (IsHDEnabled()) {
         oldestKey = std::max(GetOldestKeyTimeInPool(setInternalKeyPool, batch), oldestKey);
+        oldestKey = std::max(GetOldestKeyTimeInPool(setStakingKeyPool, batch), oldestKey);
         if (!set_pre_split_keypool.empty()) {
             oldestKey = std::max(GetOldestKeyTimeInPool(set_pre_split_keypool, batch), oldestKey);
         }
@@ -197,7 +198,7 @@ bool ScriptPubKeyMan::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool,
         if (!wallet->GetPubKey(keypool.vchPubKey.GetID(), pk)) {
             throw std::runtime_error(std::string(__func__) + ": unknown key in key pool");
         }
-        // If the key was pre-split keypool, we don't care about what type it is //TODO: Add staking address
+        // If the key was pre-split keypool, we don't care about what type it is
         if (use_split_keypool && keypool.IsInternal() != fReturningInternal) {
             throw std::runtime_error(std::string(__func__) + ": keypool internal entry misclassified");
         }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2937,7 +2937,6 @@ void CWallet::ReturnKey(int64_t nIndex, const bool& internal, const bool& stakin
 
 bool CWallet::GetKeyFromPool(CPubKey& result, const uint8_t& type)
 {
-    // TODO: Modify this for Staking addresses support if needed.
     return m_spk_man->GetKeyFromPool(result, type);
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -80,7 +80,7 @@ enum WalletFeature {
     FEATURE_WALLETCRYPT = 40000, // wallet encryption
     FEATURE_COMPRPUBKEY = 60000, // compressed public keys
 
-    PRE_PIVX = 61000, // inherited version..
+    FEATURE_PRE_PIVX = 61000, // inherited version..
 
     // The following features were implemented in BTC but not in our wallet, we can simply skip them.
     // FEATURE_HD = 130000,  Hierarchical key derivation after BIP32 (HD Wallet)

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ int64_t ScriptPubKeyMan::GetOldestKeyPoolTime()`
`103`	`103`	`int64_t oldestKey = GetOldestKeyTimeInPool(setExternalKeyPool, batch);`
`104`	`104`	`if (IsHDEnabled()) {`
`105`	`105`	`oldestKey = std::max(GetOldestKeyTimeInPool(setInternalKeyPool, batch), oldestKey);`
	`106`	`+ oldestKey = std::max(GetOldestKeyTimeInPool(setStakingKeyPool, batch), oldestKey);`
`106`	`107`	`if (!set_pre_split_keypool.empty()) {`
`107`	`108`	`oldestKey = std::max(GetOldestKeyTimeInPool(set_pre_split_keypool, batch), oldestKey);`
`108`	`109`	`}`
`@@ -197,7 +198,7 @@ bool ScriptPubKeyMan::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool,`
`197`	`198`	`if (!wallet->GetPubKey(keypool.vchPubKey.GetID(), pk)) {`
`198`	`199`	`throw std::runtime_error(std::string(__func__) + ": unknown key in key pool");`
`199`	`200`	`}`
`200`		`- // If the key was pre-split keypool, we don't care about what type it is //TODO: Add staking address`
	`201`	`+ // If the key was pre-split keypool, we don't care about what type it is`
`201`	`202`	`if (use_split_keypool && keypool.IsInternal() != fReturningInternal) {`
`202`	`203`	`throw std::runtime_error(std::string(__func__) + ": keypool internal entry misclassified");`
`203`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2937,7 +2937,6 @@ void CWallet::ReturnKey(int64_t nIndex, const bool& internal, const bool& stakin`
`2937`	`2937`
`2938`	`2938`	`bool CWallet::GetKeyFromPool(CPubKey& result, const uint8_t& type)`
`2939`	`2939`	`{`
`2940`		`- // TODO: Modify this for Staking addresses support if needed.`
`2941`	`2940`	`return m_spk_man->GetKeyFromPool(result, type);`
`2942`	`2941`	`}`
`2943`	`2942`