mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-04 03:59:26 +01:00
Merge bitcoin/bitcoin#32471: wallet/rpc: fix listdescriptors RPC fails to return descriptors with private key information when wallet contains descriptors missing any key
9c7e4771b1test: Test listdescs with priv works even with missing priv keys (Novo)ed945a6854walletrpc: reject listdes with priv key on w-only wallets (Novo)9e5e9824f1descriptor: ToPrivateString() pass if at least 1 priv key exists (Novo)5c4db25b61descriptor: refactor ToPrivateString for providers (Novo)2dc74e3f4ewallet/migration: use HavePrivateKeys in place of ToPrivateString (Novo)e842eb90bbdescriptors: add HavePrivateKeys() (Novo) Pull request description: _TLDR: Currently, `listdescriptors [private=true]` will fail for a non-watch-only wallet if any descriptor has a missing private key(e.g `tr()`, `multi()`, etc.). This PR changes that while making sure `listdescriptors [private=true]` still fails if there no private keys. Closes #32078_ In non-watch-only wallets, it's possible to import descriptors as long as at least one private key is included. It's important that users can still view these descriptors when they need to create a backup—even if some private keys are missing ([#32078 (comment)](https://github.com/bitcoin/bitcoin/issues/32078#issuecomment-2781428475)). This change makes it possible to do so. This change also helps prevent `listdescriptors true` from failing completely, because one descriptor is missing some private keys. ### Notes - The new behaviour is applied to all descriptors including miniscript descriptors - `listdescriptors true` still fails for watch-only wallets to preserve existing behaviour https://github.com/bitcoin/bitcoin/pull/24361#discussion_r920801352 - Wallet migration logic previously used `Descriptor::ToPrivateString()` to determine which descriptor was watchonly. This means that modifying the `ToPrivateString()` behaviour caused descriptors that were previously recognized as "watchonly" to be "non-watchonly". **In order to keep the scope of this PR limited to the RPC behaviour, this PR uses a different method to determine `watchonly` descriptors for the purpose of wallet migration.** A follow-up PR can be opened to update migration logic to exclude descriptors with some private keys from the `watchonly` migration wallet. ### Relevant PRs https://github.com/bitcoin/bitcoin/pull/24361 https://github.com/bitcoin/bitcoin/pull/32186 ### Testing Functional tests were added to test the new behaviour EDIT **`listdescriptors [private=true]` will still fail when there are no private keys because non-watchonly wallets must have private keys and calling `listdescriptors [private=true]` for watchonly wallet returns an error** ACKs for top commit: Sjors: ACK9c7e4771b1achow101: ACK9c7e4771b1w0xlt: reACK9c7e4771b1with minor nits rkrux: re-ACK9c7e4771b1Tree-SHA512: f9b3b2c3e5425a26e158882e39e82e15b7cb13ffbfb6a5fa2868c79526e9b178fcc3cd88d3e2e286f64819d041f687353780bbcf5a355c63a136fb8179698b60
This commit is contained in:
@@ -188,7 +188,7 @@ struct KeyConverter {
|
||||
return g_testdata->pkmap.at(keyid);
|
||||
}
|
||||
|
||||
std::optional<std::string> ToString(const Key& key) const {
|
||||
std::optional<std::string> ToString(const Key& key, bool&) const {
|
||||
return HexStr(ToPKBytes(key));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user