Make UpgradeWallet a member function of CWallet

achow101 · achow101 · commit 1e48796c99b6 · 2020-04-13T13:21:41.000-04:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3831,7 +3831,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
     }
 
     if (gArgs.GetBoolArg("-upgradewallet", false)) {
-        if (!UpgradeWallet(walletInstance, gArgs.GetBoolArg("-upgradewallet", 0), error, warnings)) {
+        if (!UpgradeWallet(gArgs.GetBoolArg("-upgradewallet", 0), error, warnings)) {
             return nullptr;
         }
     }
@@ -4097,38 +4097,37 @@ const CAddressBookData* CWallet::FindAddressBookEntry(const CTxDestination& dest
     return &address_book_it->second;
 }
 
-bool CWallet::UpgradeWallet(std::shared_ptr<CWallet> walletInstance, int version, std::string& error, std::vector<std::string>& warnings)
+bool CWallet::UpgradeWallet(int version, std::string& error, std::vector<std::string>& warnings)
 {
-    int prev_version = walletInstance->GetVersion();
+    int prev_version = GetVersion();
     int nMaxVersion = version;
     if (nMaxVersion == 0) // the -upgradewallet without argument case
     {
-        walletInstance->WalletLogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);
+        WalletLogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);
         nMaxVersion = FEATURE_LATEST;
-        walletInstance->SetMinVersion(FEATURE_LATEST); // permanently upgrade the wallet immediately
+        SetMinVersion(FEATURE_LATEST); // permanently upgrade the wallet immediately
     }
     else
-        walletInstance->WalletLogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);
-    if (nMaxVersion < walletInstance->GetVersion())
+        WalletLogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);
+    if (nMaxVersion < GetVersion())
     {
         error = _("Cannot downgrade wallet").translated;
         return false;
     }
-    walletInstance->SetMaxVersion(nMaxVersion);
+    SetMaxVersion(nMaxVersion);
 
-    LOCK(walletInstance->cs_wallet);
+    LOCK(cs_wallet);
 
     // Do not upgrade versions to any version between HD_SPLIT and FEATURE_PRE_SPLIT_KEYPOOL unless already supporting HD_SPLIT
-    int max_version = walletInstance->GetVersion();
-    if (!walletInstance->CanSupportFeature(FEATURE_HD_SPLIT) && max_version >= FEATURE_HD_SPLIT && max_version < FEATURE_PRE_SPLIT_KEYPOOL) {
+    int max_version = GetVersion();
+    if (!CanSupportFeature(FEATURE_HD_SPLIT) && max_version >= FEATURE_HD_SPLIT && max_version < FEATURE_PRE_SPLIT_KEYPOOL) {
         error = _("Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.").translated;
         return false;
     }
 
-        for (auto spk_man : walletInstance->GetActiveScriptPubKeyMans()) {
-            if (!spk_man->Upgrade(prev_version, error)) {
-                return false;
-            }
+    for (auto spk_man : GetActiveScriptPubKeyMans()) {
+        if (!spk_man->Upgrade(prev_version, error)) {
+            return false;
         }
     }
     return true;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1176,7 +1176,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     };
 
     /** Upgrade the wallet */
-    static bool UpgradeWallet(std::shared_ptr<CWallet> wallet, int version, std::string& error, std::vector<std::string>& warnings);
+    bool UpgradeWallet(int version, std::string& error, std::vector<std::string>& warnings);
 
     //! Returns all unique ScriptPubKeyMans in m_internal_spk_managers and m_external_spk_managers
     std::set<ScriptPubKeyMan*> GetActiveScriptPubKeyMans() const;

Original file line number	Diff line number	Diff line change
`@@ -3831,7 +3831,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,`
`3831`	`3831`	`}`
`3832`	`3832`
`3833`	`3833`	`if (gArgs.GetBoolArg("-upgradewallet", false)) {`
`3834`		`- if (!UpgradeWallet(walletInstance, gArgs.GetBoolArg("-upgradewallet", 0), error, warnings)) {`
	`3834`	`+ if (!UpgradeWallet(gArgs.GetBoolArg("-upgradewallet", 0), error, warnings)) {`
`3835`	`3835`	`return nullptr;`
`3836`	`3836`	`}`
`3837`	`3837`	`}`
`@@ -4097,38 +4097,37 @@ const CAddressBookData* CWallet::FindAddressBookEntry(const CTxDestination& dest`
`4097`	`4097`	`return &address_book_it->second;`
`4098`	`4098`	`}`
`4099`	`4099`
`4100`		`-bool CWallet::UpgradeWallet(std::shared_ptr<CWallet> walletInstance, int version, std::string& error, std::vector<std::string>& warnings)`
	`4100`	`+bool CWallet::UpgradeWallet(int version, std::string& error, std::vector<std::string>& warnings)`
`4101`	`4101`	`{`
`4102`		`- int prev_version = walletInstance->GetVersion();`
	`4102`	`+ int prev_version = GetVersion();`
`4103`	`4103`	`int nMaxVersion = version;`
`4104`	`4104`	`if (nMaxVersion == 0) // the -upgradewallet without argument case`
`4105`	`4105`	`{`
`4106`		`- walletInstance->WalletLogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);`
	`4106`	`+ WalletLogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);`
`4107`	`4107`	`nMaxVersion = FEATURE_LATEST;`
`4108`		`- walletInstance->SetMinVersion(FEATURE_LATEST); // permanently upgrade the wallet immediately`
	`4108`	`+ SetMinVersion(FEATURE_LATEST); // permanently upgrade the wallet immediately`
`4109`	`4109`	`}`
`4110`	`4110`	`else`
`4111`		`- walletInstance->WalletLogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);`
`4112`		`- if (nMaxVersion < walletInstance->GetVersion())`
	`4111`	`+ WalletLogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);`
	`4112`	`+ if (nMaxVersion < GetVersion())`
`4113`	`4113`	`{`
`4114`	`4114`	`error = _("Cannot downgrade wallet").translated;`
`4115`	`4115`	`return false;`
`4116`	`4116`	`}`
`4117`		`- walletInstance->SetMaxVersion(nMaxVersion);`
	`4117`	`+ SetMaxVersion(nMaxVersion);`
`4118`	`4118`
`4119`		`- LOCK(walletInstance->cs_wallet);`
	`4119`	`+ LOCK(cs_wallet);`
`4120`	`4120`
`4121`	`4121`	`// Do not upgrade versions to any version between HD_SPLIT and FEATURE_PRE_SPLIT_KEYPOOL unless already supporting HD_SPLIT`
`4122`		`- int max_version = walletInstance->GetVersion();`
`4123`		`- if (!walletInstance->CanSupportFeature(FEATURE_HD_SPLIT) && max_version >= FEATURE_HD_SPLIT && max_version < FEATURE_PRE_SPLIT_KEYPOOL) {`
	`4122`	`+ int max_version = GetVersion();`
	`4123`	`+ if (!CanSupportFeature(FEATURE_HD_SPLIT) && max_version >= FEATURE_HD_SPLIT && max_version < FEATURE_PRE_SPLIT_KEYPOOL) {`
`4124`	`4124`	`error = _("Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.").translated;`
`4125`	`4125`	`return false;`
`4126`	`4126`	`}`
`4127`	`4127`
`4128`		`- for (auto spk_man : walletInstance->GetActiveScriptPubKeyMans()) {`
`4129`		`- if (!spk_man->Upgrade(prev_version, error)) {`
`4130`		`- return false;`
`4131`		`- }`
	`4128`	`+ for (auto spk_man : GetActiveScriptPubKeyMans()) {`
	`4129`	`+ if (!spk_man->Upgrade(prev_version, error)) {`
	`4130`	`+ return false;`
`4132`	`4131`	`}`
`4133`	`4132`	`}`
`4134`	`4133`	`return true;`