lukechilds
/
miniscript
mirror of https://github.com/lukechilds/miniscript.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #22 from practicalswift/opcodes-documentation 

Use consistent opcode naming in documentation of miniscript-opcode mapping
master
Pieter Wuille 5 years ago
committed by GitHub
parent
64d26b112e 2294d5894a
commit
53d67a28ed
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      bitcoin/script/miniscript.h

4
bitcoin/script/miniscript.h
View File

@ -161,7 +161,7 @@ NodeRef<Key> MakeNodeRef(Args&&... args) { return std::make_shared<const Node<Ke
//! The different node types in miniscript. //! The different node types in miniscript.
enum class NodeType { enum class NodeType {
JUST_0, //!< OP_0 JUST_0, //!< OP_0
JUST_1, //!< OP_1 JUST_1, //!< OP_1
PK, //!< [key] PK, //!< [key]
PK_H, //!< OP_DUP OP_HASH160 [keyhash] OP_EQUALVERIFY PK_H, //!< OP_DUP OP_HASH160 [keyhash] OP_EQUALVERIFY
@ -183,7 +183,7 @@ enum class NodeType {
OR_B, //!< [X] [Y] OP_BOOLOR OR_B, //!< [X] [Y] OP_BOOLOR
OR_C, //!< [X] OP_NOTIF [Y] OP_ENDIF OR_C, //!< [X] OP_NOTIF [Y] OP_ENDIF
OR_D, //!< [X] OP_IFDUP OP_NOTIF [Y] OP_ENDIF OR_D, //!< [X] OP_IFDUP OP_NOTIF [Y] OP_ENDIF
OR_I, //!< IF [X] OP_ELSE [Y] OP_ENDIF OR_I, //!< OP_IF [X] OP_ELSE [Y] OP_ENDIF
ANDOR, //!< [X] OP_NOTIF [Z] OP_ELSE [Y] OP_ENDIF ANDOR, //!< [X] OP_NOTIF [Z] OP_ELSE [Y] OP_ENDIF
THRESH, //!< [X1] ([Xn] OP_ADD)* [k] OP_EQUAL THRESH, //!< [X1] ([Xn] OP_ADD)* [k] OP_EQUAL
THRESH_M, //!< [k] [key_n]* [n] OP_CHECKMULTISIG THRESH_M, //!< [k] [key_n]* [n] OP_CHECKMULTISIG

Write Preview
Loading…
Cancel
Save