Merge 950af7c876 into merged_master (Bitcoin PR bitcoin/bitcoin#28878)

This commit is contained in:
Byron Hambly 2025-11-10 14:27:35 +02:00
commit d46449ab86
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
36 changed files with 74 additions and 86 deletions

View file

@ -369,7 +369,7 @@ void TestSatisfy(const KeyConverter& converter, const std::string& testcase, con
CScriptWitness witness_nonmal;
const bool nonmal_success = node->Satisfy(satisfier, witness_nonmal.stack, true) == miniscript::Availability::YES;
// Compute witness size (excluding script push, control block, and witness count encoding).
const size_t wit_size = GetSerializeSize(witness_nonmal.stack, PROTOCOL_VERSION) - GetSizeOfCompactSize(witness_nonmal.stack.size());
const size_t wit_size = GetSerializeSize(witness_nonmal.stack) - GetSizeOfCompactSize(witness_nonmal.stack.size());
SatisfactionToWitness(converter.MsContext(), witness_nonmal, script, builder);
if (nonmal_success) {