diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2019-04-06 12:56:15 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2020-04-13 13:28:04 -0400 |
| commit | 0d32d661481f099af572e7a08a50e17bcc165c44 (patch) | |
| tree | 0dea76e5e383f305f5a9ff6e9f470b41283e1a8c /src/wallet/wallet.cpp | |
| parent | 92263cce5b6c6b66296dadda5f29724611db0160 (diff) | |
Remove -upgradewallet startup option
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index c16fb80b9e..081bb4320b 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3830,12 +3830,6 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain, } } - if (gArgs.GetBoolArg("-upgradewallet", false)) { - if (!UpgradeWallet(gArgs.GetBoolArg("-upgradewallet", 0), error, warnings)) { - return nullptr; - } - } - if (fFirstRun) { // ensure this wallet.dat can only be opened by clients supporting HD with chain split and expects no default key @@ -4121,7 +4115,7 @@ bool CWallet::UpgradeWallet(int version, std::string& error, std::vector<std::st // Do not upgrade versions to any version between HD_SPLIT and FEATURE_PRE_SPLIT_KEYPOOL unless already supporting HD_SPLIT 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; + error = _("Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use version 169900 or no version specified.").translated; return false; } |