Skip to content

adding OP_CHECKLOCKTIMEVERIFY #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petertodd merged 1 commit into from
Jan 25, 2016
Merged

adding OP_CHECKLOCKTIMEVERIFY #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bitcoin/core/script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ def __new__(cls, n):
# expansion
OP_NOP1 = CScriptOp(0xb0)
OP_NOP2 = CScriptOp(0xb1)
OP_CHECKLOCKTIMEVERIFY = OP_NOP2
OP_NOP3 = CScriptOp(0xb2)
OP_NOP4 = CScriptOp(0xb3)
OP_NOP5 = CScriptOp(0xb4)
Expand Down Expand Up @@ -351,6 +352,7 @@ def __new__(cls, n):
OP_CHECKMULTISIGVERIFY: 'OP_CHECKMULTISIGVERIFY',
OP_NOP1: 'OP_NOP1',
OP_NOP2: 'OP_NOP2',
OP_CHECKLOCKTIMEVERIFY: 'OP_CHECKLOCKTIMEVERIFY',
OP_NOP3: 'OP_NOP3',
OP_NOP4: 'OP_NOP4',
OP_NOP5: 'OP_NOP5',
Expand Down Expand Up @@ -470,6 +472,7 @@ def __new__(cls, n):
'OP_CHECKMULTISIGVERIFY': OP_CHECKMULTISIGVERIFY,
'OP_NOP1': OP_NOP1,
'OP_NOP2': OP_NOP2,
'OP_CHECKLOCKTIMEVERIFY': OP_CHECKLOCKTIMEVERIFY,
'OP_NOP3': OP_NOP3,
'OP_NOP4': OP_NOP4,
'OP_NOP5': OP_NOP5,
Expand Down Expand Up @@ -1030,6 +1033,7 @@ def SignatureHash(script, txTo, inIdx, hashtype):
'OP_CHECKMULTISIGVERIFY',
'OP_NOP1',
'OP_NOP2',
'OP_CHECKLOCKTIMEVERIFY',
'OP_NOP3',
'OP_NOP4',
'OP_NOP5',
Expand Down Expand Up @@ -1061,4 +1065,4 @@ def SignatureHash(script, txTo, inIdx, hashtype):
'RawSignatureHash',
'SignatureHash',
'IsLowDERSignature',
)
)
Copy link

@epheph epheph Oct 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Super pedantic, but can you revert the deletion of the newline?

Copy link
Contributor Author

@PierreRochard PierreRochard Oct 5, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@epheph absolutely, I didn't mean to do that. I'm also not very experienced with git and interested in learning, what would be the best way to revert?