Merge e078ee9d9d into merged_master (Bitcoin PR bitcoin/bitcoin#25664)

This commit is contained in:
Byron Hambly 2024-11-01 15:14:19 +02:00
commit 52699c29d7
8 changed files with 4 additions and 34 deletions

View file

@ -1461,7 +1461,8 @@ void LegacyScriptPubKeyMan::LearnRelatedScripts(const CPubKey& key, OutputType t
CTxDestination witdest = WitnessV0KeyHash(key.GetID());
CScript witprog = GetScriptForDestination(witdest);
// Make sure the resulting program is solvable.
assert(IsSolvable(*this, witprog));
const auto desc = InferDescriptor(witprog, *this);
assert(desc && desc->IsSolvable());
AddCScript(witprog);
}
}