aboutsummaryrefslogtreecommitdiff
path: root/src/script/script.cpp
diff options
context:
space:
mode:
authorPeter Todd <pete@petertodd.org>2014-10-13 10:18:05 -0400
committerJorge Timón <jtimon@jtimon.cc>2015-10-01 18:28:13 +0200
commitda894ab5da222ad317039eb008ec6443fb9113d9 (patch)
tree391ecd1cf9ea432a1558ae2e70d9a1fbb91d5dd3 /src/script/script.cpp
parent5d8709c3b7fcc66fbf537ec0b6c1a98d69214e25 (diff)
downloadbitcoin-da894ab5da222ad317039eb008ec6443fb9113d9.tar.xz
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.cpp')
-rw-r--r--src/script/script.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 0a8ec9fa7b..9a0c067a33 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -144,7 +144,7 @@ const char* GetOpName(opcodetype opcode)
case OP_INVALIDOPCODE : return "OP_INVALIDOPCODE";
// Note:
- // The template matching params OP_SMALLDATA/etc are defined in opcodetype enum
+ // The template matching params OP_SMALLINTEGER/etc are defined in opcodetype enum
// as kind of implementation hack, they are *NOT* real opcodes. If found in real
// Script, just let the default: case deal with them.