diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-05-30 16:13:02 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-05-30 16:50:43 +0200 |
| commit | fd96d54f39cf4f66890e0bb40812d47e69728cec (patch) | |
| tree | b356f77bdb2e67f4777a1448d8ed585d51af5b89 /src/script/script.h | |
| parent | 25d2df2aa988cfaa086c45854671d56a95a9a7e1 (diff) | |
| parent | c814e2e7e81fd01fcb07f4a28435741bdc463801 (diff) | |
Merge #13194: Remove template matching and pseudo opcodes
c814e2e7e81fd01fcb07f4a28435741bdc463801 Remove template matching and pseudo opcodes (Pieter Wuille)
Pull request description:
The current code contains a rather complex script template matching engine, which is only used for 3 particular script types (P2PK, P2PKH, multisig). The first two of these are trivial to match for otherwise, and a specialized matcher for multisig is both more compact and more efficient than a generic one.
The goal is being more flexible, so that for example larger standard multisigs inside SegWit outputs are easier to implement.
As a side-effect, it also gets rid of the pseudo opcodes hack.
Tree-SHA512: 643b409c5c36821519f613a43efd399af0ec99b6131f35cd4024decfb2d483d719e0e921cd088bc9832a7ac797cb4a6b1158b8574c82f7fbebb75f1b31b359df
Diffstat (limited to 'src/script/script.h')
| -rw-r--r-- | src/script/script.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/script/script.h b/src/script/script.h index d8b7c06013..a4f377dd94 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -181,13 +181,6 @@ enum opcodetype OP_NOP9 = 0xb8, OP_NOP10 = 0xb9, - - // template matching params - OP_SMALLINTEGER = 0xfa, - OP_PUBKEYS = 0xfb, - OP_PUBKEYHASH = 0xfd, - OP_PUBKEY = 0xfe, - OP_INVALIDOPCODE = 0xff, }; |