mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Merge f9032a4abb into merged_master (Bitcoin PR bitcoin/bitcoin#31242)
This commit is contained in:
commit
6124af4526
8 changed files with 60 additions and 24 deletions
|
|
@ -2473,7 +2473,11 @@ std::unique_ptr<FlatSigningProvider> DescriptorScriptPubKeyMan::GetSigningProvid
|
|||
int32_t index = it->second;
|
||||
|
||||
// Always try to get the signing provider with private keys. This function should only be called during signing anyways
|
||||
return GetSigningProvider(index, true);
|
||||
std::unique_ptr<FlatSigningProvider> out = GetSigningProvider(index, true);
|
||||
if (!out->HaveKey(pubkey.GetID())) {
|
||||
return nullptr;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
std::unique_ptr<FlatSigningProvider> DescriptorScriptPubKeyMan::GetSigningProvider(int32_t index, bool include_private) const
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue