diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-10-01 19:53:24 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-10-01 21:28:45 +0200 |
| commit | cd78c2a421ae5aa1773c8fb84dadc2c61a01e5e8 (patch) | |
| tree | 391ecd1cf9ea432a1558ae2e70d9a1fbb91d5dd3 /src/script/script.h | |
| parent | Merge pull request #6732 (diff) | |
| parent | Accept any sequence of PUSHDATAs in OP_RETURN outputs (diff) | |
| download | discoin-cd78c2a421ae5aa1773c8fb84dadc2c61a01e5e8.tar.xz discoin-cd78c2a421ae5aa1773c8fb84dadc2c61a01e5e8.zip | |
Merge pull request #6424
da894ab Accept any sequence of PUSHDATAs in OP_RETURN outputs (Peter Todd)
5d8709c Add IsPushOnly(const_iterator pc) (Peter Todd)
6a07eb6 Make TX_SCRIPTHASH clear vSolutionsRet first (Peter Todd)
Diffstat (limited to 'src/script/script.h')
| -rw-r--r-- | src/script/script.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script.h b/src/script/script.h index f0725bbbf..cdc9a71bb 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -167,7 +167,6 @@ enum opcodetype // template matching params - OP_SMALLDATA = 0xf9, OP_SMALLINTEGER = 0xfa, OP_PUBKEYS = 0xfb, OP_PUBKEYHASH = 0xfd, @@ -589,6 +588,7 @@ public: bool IsPayToScriptHash() const; /** Called by IsStandardTx and P2SH/BIP62 VerifyScript (which makes it consensus-critical). */ + bool IsPushOnly(const_iterator pc) const; bool IsPushOnly() const; /** |