zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add IsPushOnly(const_iterator pc) 

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 Jack Grigg
parent cf6cf56a68
commit 6962f1d2f0
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
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

@ -223,9 +223,8 @@ bool CScript::IsPayToScriptHash() const
(*this)[22] == OP_EQUAL);
}
bool CScript::IsPushOnly() const
bool CScript::IsPushOnly(const_iterator pc) const
{
const_iterator pc = begin();
while (pc < end())
{
opcodetype opcode;
@ -241,6 +240,11 @@ bool CScript::IsPushOnly() const
return true;
}
bool CScript::IsPushOnly() const
{
return this->IsPushOnly(begin());
}
// insightexplorer
CScript::ScriptType CScript::GetType() const
{

1
src/script/script.h
View File

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