[Wallet] Don't attempt to generate keys when wallet is locked

dave-mann · AmirAbrams · commit 0680705cd560 · 2019-07-22T18:26:50.000-05:00
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -163,8 +163,6 @@ UniValue getnewed25519address(const JSONRPCRequest& request)
             "\nExamples:\n" +
             HelpExampleCli("getnewed25519address", "") + HelpExampleRpc("getnewed25519address", ""));
 
-    EnsureWalletIsUnlocked();
-
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     // Parse the account first so we don't generate a key if there's an error
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4928,12 +4928,11 @@ bool CWallet::GetKeysFromPool(CPubKey& pubkeyWallet, std::vector<unsigned char>&
             pubkeyWallet = keypool.vchPubKey;
         }
 
-        CKey keyRetrieved;
-        GetKey(pubkeyWallet.GetID(), keyRetrieved);
-
         if (nEdIndex == -1) {
             if (IsLocked(true))
                 return false;
+            CKey keyRetrieved;
+            GetKey(pubkeyWallet.GetID(), keyRetrieved);
             vchEd25519PubKey = GenerateNewEdKey(0, fInternal, keyRetrieved);
         }
         else {

Original file line number	Diff line number	Diff line change
`@@ -4928,12 +4928,11 @@ bool CWallet::GetKeysFromPool(CPubKey& pubkeyWallet, std::vector<unsigned char>&`
`4928`	`4928`	`pubkeyWallet = keypool.vchPubKey;`
`4929`	`4929`	`}`
`4930`	`4930`
`4931`		`- CKey keyRetrieved;`
`4932`		`- GetKey(pubkeyWallet.GetID(), keyRetrieved);`
`4933`		`-`
`4934`	`4931`	`if (nEdIndex == -1) {`
`4935`	`4932`	`if (IsLocked(true))`
`4936`	`4933`	`return false;`
	`4934`	`+ CKey keyRetrieved;`
	`4935`	`+ GetKey(pubkeyWallet.GetID(), keyRetrieved);`
`4937`	`4936`	`vchEd25519PubKey = GenerateNewEdKey(0, fInternal, keyRetrieved);`
`4938`	`4937`	`}`
`4939`	`4938`	`else {`