Add IsPushOnly(const_iterator pc)

Allows IsPushOnly() to be applied to just part of the script for OP_RETURN outputs.
bitcoin · Oct 1, 2015 · 5d8709c · 5d8709c
1 parent 6a07eb6
commit 5d8709c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/script/script.cpp b/src/script/script.cpp
@@ -210,9 +210,8 @@ bool CScript::IsPayToScriptHash() const
             this->at(22) == OP_EQUAL);
 }
 
-bool CScript::IsPushOnly() const
+bool CScript::IsPushOnly(const_iterator pc) const
 {
-    const_iterator pc = begin();
     while (pc < end())
     {
         opcodetype opcode;
@@ -227,3 +226,8 @@ bool CScript::IsPushOnly() const
     }
     return true;
 }
+
+bool CScript::IsPushOnly() const
+{
+    return this->IsPushOnly(begin());
+}
diff --git a/src/script/script.h b/src/script/script.h
@@ -589,6 +589,7 @@ class CScript : public std::vector<unsigned char>
     bool IsPayToScriptHash() const;
 
     /** Called by IsStandardTx and P2SH/BIP62 VerifyScript (which makes it consensus-critical). */
+    bool IsPushOnly(const_iterator pc) const;
     bool IsPushOnly() const;
 
     /**