foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-03 09:56:38 -05:00
Code Issues Activity

Add IsPushOnly(const_iterator pc)

Browse source 
Allows IsPushOnly() to be applied to just part of the script for
OP_RETURN outputs.
This commit is contained in:
Peter Todd 2014-11-04 12:38:56 -05:00 • committed by Jorge Timón
parent 6a07eb676a
commit 5d8709c3b7
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/script/script.cpp
View file

@ -210,9 +210,8 @@ bool CScript::IsPayToScriptHash() const
this->at(22) == OP_EQUAL); this->at(22) == OP_EQUAL);
} }
bool CScript::IsPushOnly() const bool CScript::IsPushOnly(const_iterator pc) const
{ {
const_iterator pc = begin();
while (pc < end()) while (pc < end())
{ {
opcodetype opcode; opcodetype opcode;
@ -227,3 +226,8 @@ bool CScript::IsPushOnly() const
} }
return true; return true;
} }
bool CScript::IsPushOnly() const
{
return this->IsPushOnly(begin());
}

1
src/script/script.h
View file

@ -589,6 +589,7 @@ public:
bool IsPayToScriptHash() const; bool IsPayToScriptHash() const;
/** Called by IsStandardTx and P2SH/BIP62 VerifyScript (which makes it consensus-critical). */ /** Called by IsStandardTx and P2SH/BIP62 VerifyScript (which makes it consensus-critical). */
bool IsPushOnly(const_iterator pc) const;
bool IsPushOnly() const; bool IsPushOnly() const;
/** /**