phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

descriptor: list private descriptors if not all keys present

Browse source 
When parsing descriptors with multiple keys (tr, wsh, sh, miniscript),
we might not have all the private keys but only few of them
(rest being public keys).

`listdescriptors(private=true)` RPC should not
fail in such scenario and instead return those partial private keys,
using public keys for the rest.
This commit is contained in:
rkrux 2025-04-01 19:56:27 +05:30
parent df82a24508
commit 62c261c6f7
No known key found for this signature in database
GPG key ID: 8614B8BD2E144C6D
1 changed files with 54 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/script/descriptor.cpp
View file

@ -635,13 +635,26 @@ public:
virtual bool ToStringSubScriptHelper(const SigningProvider* arg, std::string& ret, const StringType type, const DescriptorCache* cache = nullptr) const
{
size_t pos = 0;
bool has_any_priv = false;
for (const auto& scriptarg : m_subdescriptor_args) {
if (pos++) ret += ",";
std::string tmp;
if (!scriptarg->ToStringHelper(arg, tmp, type, cache)) return false;
bool success = scriptarg->ToStringHelper(arg, tmp, type, cache);
if (type == StringType::PRIVATE) {
if (success) {
has_any_priv = true;
} else {
tmp = "";
if (!scriptarg->ToStringHelper(arg, tmp, StringType::PUBLIC, cache)) {
return false;
}
}
} else if (!success) {
return false;
}
ret += tmp;
}
return true;
return (type == StringType::PRIVATE) ? has_any_priv : true;
}
// NOLINTNEXTLINE(misc-no-recursion)
@ -650,6 +663,7 @@ public:
std::string extra = ToStringExtra();
size_t pos = extra.size() > 0 ? 1 : 0;
std::string ret = m_name + "(" + extra;
bool has_any_priv = false;
for (const auto& pubkey : m_pubkey_args) {
if (pos++) ret += ",";
std::string tmp;
@ -658,7 +672,11 @@ public:
if (!pubkey->ToNormalizedString(*arg, tmp, cache)) return false;
break;
case StringType::PRIVATE:
if (!pubkey->ToPrivateString(*arg, tmp)) return false;
if (!pubkey->ToPrivateString(*arg, tmp)) {
tmp = pubkey->ToString();
} else {
has_any_priv = true;
}
break;
case StringType::PUBLIC:
tmp = pubkey->ToString();
@ -670,7 +688,21 @@ public:
ret += tmp;
}
std::string subscript;
if (!ToStringSubScriptHelper(arg, subscript, type, cache)) return false;
bool is_subscript_successful = ToStringSubScriptHelper(arg, subscript, type, cache);
if (type == StringType::PRIVATE) {
if (!has_any_priv) {
if (subscript.empty()) {
return false;
}
if (!is_subscript_successful) {
return false;
}
}
} else if (!is_subscript_successful) {
return false;
}
if (pos && subscript.size()) ret += ',';
out = std::move(ret) + std::move(subscript) + ")";
return true;
@ -1181,6 +1213,7 @@ protected:
bool ToStringSubScriptHelper(const SigningProvider* arg, std::string& ret, const StringType type, const DescriptorCache* cache = nullptr) const override
{
if (m_depths.empty()) return true;
bool has_any_subscript_key = false;
std::vector<bool> path;
for (size_t pos = 0; pos < m_depths.size(); ++pos) {
if (pos) ret += ',';
@ -1189,7 +1222,19 @@ protected:
path.push_back(false);
}
std::string tmp;
if (!m_subdescriptor_args[pos]->ToStringHelper(arg, tmp, type, cache)) return false;
bool is_subdescriptor_successful = m_subdescriptor_args[pos]->ToStringHelper(arg, tmp, type, cache);
if (type == StringType::PRIVATE) {
if (is_subdescriptor_successful) {
has_any_subscript_key = true;
} else {
tmp = "";
if (!m_subdescriptor_args[pos]->ToStringHelper(arg, tmp, StringType::PUBLIC, cache)) {
return false;
}
}
} else if (!is_subdescriptor_successful) {
return false;
}
ret += tmp;
while (!path.empty() && path.back()) {
if (path.size() > 1) ret += '}';
@ -1197,7 +1242,7 @@ protected:
}
if (!path.empty()) path.back() = true;
}
return true;
return (type == StringType::PRIVATE) ? has_any_subscript_key : true;
}
public:
TRDescriptor(std::unique_ptr<PubkeyProvider> internal_key, std::vector<std::unique_ptr<DescriptorImpl>> descs, std::vector<int> depths) :
@ -1290,7 +1335,9 @@ public:
{
std::string ret;
if (m_private) {
if (!m_pubkeys[key]->ToPrivateString(*m_arg, ret)) return {};
if (!m_pubkeys[key]->ToPrivateString(*m_arg, ret)) {
ret = m_pubkeys[key]->ToString();
}
} else {
ret = m_pubkeys[key]->ToString();
}