Merge 5b2fe5563b into merged_master (Elements PR #642)

FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:21 +00:00
commit 9cc26a716a
50 changed files with 1912 additions and 801 deletions

View file

@ -334,6 +334,11 @@ std::string CScriptWitness::ToString() const
return ret + ")";
}
uint32_t CScriptWitness::GetSerializedSize() const
{
return ::GetSerializeSize(stack, 0);
}
bool CScript::HasValidOps() const
{
CScript::const_iterator it = begin();