Merge pull request #3457

d78f35a Explicitly ensure that wallet is unlocked in `importprivkey` (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2013-12-24 09:41:48 +01:00
commit 086d7ec2b8
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -86,6 +86,8 @@ Value importprivkey(const Array& params, bool fHelp)
+ HelpExampleRpc("importprivkey", "\"mykey\", \"testing\", false") + HelpExampleRpc("importprivkey", "\"mykey\", \"testing\", false")
); );
EnsureWalletIsUnlocked();
string strSecret = params[0].get_str(); string strSecret = params[0].get_str();
string strLabel = ""; string strLabel = "";
if (params.size() > 1) if (params.size() > 1)