GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 2aff9a36c3 into merged_master (Bitcoin PR bitcoin/bitcoin#30352)

Browse source
This commit is contained in:
ivanlele 2026-03-11 09:41:57 +00:00
commit cd6ec40d0f
No known key found for this signature in database
24 changed files with 202 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/script/interpreter.cpp
View file

@ -3313,6 +3313,8 @@ static bool VerifyWitnessProgram(const CScriptWitness& witness, int witversion,
}
return set_success(serror);
}
} else if (!is_p2sh && CScript::IsPayToAnchor(witversion, program)) {
return true;
} else {
if (flags & SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM) {
return set_error(serror, SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM);