aboutsummaryrefslogtreecommitdiff
path: root/src/script/script.h
diff options
context:
space:
mode:
authorPeter Todd <[email protected]>2014-10-13 10:18:05 -0400
committerJorge Timón <[email protected]>2015-10-01 18:28:13 +0200
commitda894ab5da222ad317039eb008ec6443fb9113d9 (patch)
tree391ecd1cf9ea432a1558ae2e70d9a1fbb91d5dd3 /src/script/script.h
parentAdd IsPushOnly(const_iterator pc) (diff)
downloaddiscoin-da894ab5da222ad317039eb008ec6443fb9113d9.tar.xz
discoin-da894ab5da222ad317039eb008ec6443fb9113d9.zip
Accept any sequence of PUSHDATAs in OP_RETURN outputs
Previously only one PUSHDATA was allowed, needlessly limiting applications such as matching OP_RETURN contents with bloom filters that operate on a per-PUSHDATA level. Now any combination that passes IsPushOnly() is allowed, so long as the total size of the scriptPubKey is less than 42 bytes. (unchanged modulo non-minimal PUSHDATA encodings) Also, this fixes the odd bug where previously the PUSHDATA could be replaced by any single opcode, even sigops consuming opcodes such as CHECKMULTISIG. (20 sigops!)
Diffstat (limited to 'src/script/script.h')
-rw-r--r--src/script/script.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/script/script.h b/src/script/script.h
index 3923a559b..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,