Skip to content

[BUG][RPC] Fix check in wallet upgrade RPC #2047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
random-zebra merged 1 commit into from
Dec 11, 2020
Merged

[BUG][RPC] Fix check in wallet upgrade RPC #2047

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/wallet/rpcwallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,15 +380,15 @@ UniValue upgradewallet(const JSONRPCRequest& request)
);

EnsureWallet();
EnsureWalletIsUnlocked();

LOCK2(cs_main, pwalletMain->cs_wallet);

// Do not do anything to non-HD wallets
if (pwalletMain->HasSaplingSPKM()) {
// Do not do anything to wallets already upgraded
if (pwalletMain->CanSupportFeature(FEATURE_LATEST)) {
throw JSONRPCError(RPC_WALLET_ERROR, "Cannot upgrade the wallet. The wallet is already running the latest version");
}

EnsureWalletIsUnlocked();

// Get version
int prev_version = pwalletMain->GetVersion();
// Upgrade wallet's version
Expand Down