foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-12 11:19:08 -05:00
Code Issues Activity

rpc: Allow importmulti watchonly imports with locked wallet

Browse source
This commit is contained in:
Aurèle Oulès 2022-09-17 21:38:35 +02:00
parent a688ff9046
commit 1fcf9e6e81
No known key found for this signature in database
GPG key ID: 55F3976F7001D998
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/wallet/rpc/backup.cpp
View file

@ -1363,7 +1363,18 @@ RPCHelpMan importmulti()
UniValue response(UniValue::VARR); UniValue response(UniValue::VARR);
{ {
LOCK(pwallet->cs_wallet); LOCK(pwallet->cs_wallet);
EnsureWalletIsUnlocked(*pwallet);
// Check all requests are watchonly
bool is_watchonly{true};
for (size_t i = 0; i < requests.size(); ++i) {
const UniValue& request = requests[i];
if (!request.exists("watchonly") || !request["watchonly"].get_bool()) {
is_watchonly = false;
break;
}
}
// Wallet does not need to be unlocked if all requests are watchonly
if (!is_watchonly) EnsureWalletIsUnlocked(wallet);
// Verify all timestamps are present before importing any keys. // Verify all timestamps are present before importing any keys.
CHECK_NONFATAL(pwallet->chain().findBlock(pwallet->GetLastBlockHash(), FoundBlock().time(nLowestTimestamp).mtpTime(now))); CHECK_NONFATAL(pwallet->chain().findBlock(pwallet->GetLastBlockHash(), FoundBlock().time(nLowestTimestamp).mtpTime(now)));