Skip to content

Fix has_priv_key in fuzzer and add coverage #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sjors wants to merge 2 commits into
base: list-descriptors-with-partial-keys
Choose a base branch
from
Open

Fix has_priv_key in fuzzer and add coverage #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3026b1
fuzz: add HasPrivKey miniscript helper
Sjors Jan 6, 2026
fa02243
fuzz: verify has_priv_key
Sjors Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions src/test/fuzz/miniscript.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ struct TestData {
return &it->second;
}
}

//! Whether signing material is available for this pubkey in this script context.
bool HasPrivKey(const MsCtx script_ctx, const Key& key) const {
const auto sig_ptr = GetSig(script_ctx, key);
return sig_ptr && sig_ptr->second;
}
} TEST_DATA;

/**
Expand All @@ -126,13 +132,10 @@ struct ParserContext {

std::optional<std::string> ToString(const Key& key, bool& has_priv_key) const
{
has_priv_key = false;
auto it = TEST_DATA.dummy_key_idx_map.find(key);
if (it == TEST_DATA.dummy_key_idx_map.end()) {
return HexStr(key);
}
has_priv_key = true;
uint8_t idx = it->second;
const auto it = TEST_DATA.dummy_key_idx_map.find(key);
assert(it != TEST_DATA.dummy_key_idx_map.end());
has_priv_key = TEST_DATA.HasPrivKey(script_ctx, key);
const uint8_t idx = it->second;
return HexStr(std::span{&idx, 1});
}

Expand Down Expand Up @@ -1037,8 +1040,23 @@ void TestNode(const MsCtx script_ctx, const NodeRef& node, FuzzedDataProvider& p

// Check that it roundtrips to text representation
const ParserContext parser_ctx{script_ctx};
std::optional<std::string> str{node->ToString(parser_ctx)};
bool has_priv_key{false};
std::optional<std::string> str{node->ToString(parser_ctx, has_priv_key)};
assert(str);

// Check has_priv_key against expectation
bool expected_has_priv_key{false};
std::vector<const Node*> nodes{node.get()};
while (!nodes.empty() && !expected_has_priv_key) {
const Node* n{nodes.back()};
nodes.pop_back();
expected_has_priv_key = std::any_of(n->keys.begin(), n->keys.end(), [&](const auto& key) {
return TEST_DATA.HasPrivKey(script_ctx, key);
});
for (const auto& sub : n->subs) nodes.push_back(sub.get());
}
assert(has_priv_key == expected_has_priv_key);

auto parsed = miniscript::FromString(*str, parser_ctx);
assert(parsed);
assert(*parsed == *node);
Expand Down Expand Up @@ -1162,8 +1180,7 @@ void TestNode(const MsCtx script_ctx, const NodeRef& node, FuzzedDataProvider& p
// are identical, this implies that for such nodes, the non-malleable
// satisfaction will also match the expected policy.
const auto is_key_satisfiable = [script_ctx](const CPubKey& pubkey) -> bool {
auto sig_ptr{TEST_DATA.GetSig(script_ctx, pubkey)};
return sig_ptr != nullptr && sig_ptr->second;
return TEST_DATA.HasPrivKey(script_ctx, pubkey);
};
bool satisfiable = node->IsSatisfiable([&](const Node& node) -> bool {
switch (node.fragment) {
Expand Down