wallet, rpc: listdescriptors does not need unlocked

achow101 · achow101 · commit e6cf0ed92de3 · 2021-06-24T14:08:46.000-04:00
With the last hardened xpub cache, we don't neeed to have the wallet be
unlocked for listdescriptors.
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -1787,8 +1787,6 @@ RPCHelpMan listdescriptors()
         throw JSONRPCError(RPC_WALLET_ERROR, "listdescriptors is not available for non-descriptor wallets");
     }
 
-    EnsureWalletIsUnlocked(*wallet);
-
     LOCK(wallet->cs_wallet);
 
     UniValue descriptors(UniValue::VARR);
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -2269,9 +2269,6 @@ const std::vector<CScript> DescriptorScriptPubKeyMan::GetScriptPubKeys() const
 bool DescriptorScriptPubKeyMan::GetDescriptorString(std::string& out) const
 {
     LOCK(cs_desc_man);
-    if (m_storage.IsLocked()) {
-        return false;
-    }
 
     FlatSigningProvider provider;
     provider.keys = GetKeys();
diff --git a/test/functional/wallet_listdescriptors.py b/test/functional/wallet_listdescriptors.py
@@ -72,6 +72,10 @@ def run_test(self):
         }
         assert_equal(expected, wallet.listdescriptors())
 
+        self.log.info("Test listdescriptors with encrypted wallet")
+        wallet.encryptwallet("pass")
+        assert_equal(expected, wallet.listdescriptors())
+
         self.log.info('Test non-active non-range combo descriptor')
         node.createwallet(wallet_name='w4', blank=True, descriptors=True)
         wallet = node.get_wallet_rpc('w4')

Original file line number	Diff line number	Diff line change
`@@ -1787,8 +1787,6 @@ RPCHelpMan listdescriptors()`
`1787`	`1787`	`throw JSONRPCError(RPC_WALLET_ERROR, "listdescriptors is not available for non-descriptor wallets");`
`1788`	`1788`	`}`
`1789`	`1789`
`1790`		`- EnsureWalletIsUnlocked(*wallet);`
`1791`		`-`
`1792`	`1790`	`LOCK(wallet->cs_wallet);`
`1793`	`1791`
`1794`	`1792`	`UniValue descriptors(UniValue::VARR);`
Original file line number	Diff line number	Diff line change
`@@ -2269,9 +2269,6 @@ const std::vector<CScript> DescriptorScriptPubKeyMan::GetScriptPubKeys() const`
`2269`	`2269`	`bool DescriptorScriptPubKeyMan::GetDescriptorString(std::string& out) const`
`2270`	`2270`	`{`
`2271`	`2271`	`LOCK(cs_desc_man);`
`2272`		`- if (m_storage.IsLocked()) {`
`2273`		`- return false;`
`2274`		`- }`
`2275`	`2272`
`2276`	`2273`	`FlatSigningProvider provider;`
`2277`	`2274`	`provider.keys = GetKeys();`