diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1413,7 +1413,7 @@ }; /** Upgrade the wallet */ - static bool UpgradeWallet(std::shared_ptr wallet, + static bool UpgradeWallet(std::shared_ptr wallet, int version, bilingual_str &error, std::vector &warnings); diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4146,7 +4146,8 @@ } if (gArgs.GetBoolArg("-upgradewallet", false)) { - if (!UpgradeWallet(walletInstance, error, warnings)) { + if (!UpgradeWallet(walletInstance, gArgs.GetArg("-upgradewallet", 0), + error, warnings)) { return nullptr; } } @@ -4458,10 +4459,10 @@ } bool CWallet::UpgradeWallet(std::shared_ptr walletInstance, - bilingual_str &error, + int version, bilingual_str &error, std::vector &warnings) { int prev_version = walletInstance->GetVersion(); - int nMaxVersion = gArgs.GetArg("-upgradewallet", 0); + int nMaxVersion = version; // The -upgradewallet without argument case if (nMaxVersion == 0) { walletInstance->WalletLogPrintf("Performing wallet upgrade to %i\n",