Skip to content
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

Jump to bottom

Merge CHECKLOCKTIMEVERIFY #25

Closed
meyer9 opened this issue Apr 20, 2018 · 3 comments
Closed

Merge CHECKLOCKTIMEVERIFY #25

meyer9 opened this issue Apr 20, 2018 · 3 comments
Labels
feature merge merging from other repository

Comments

@meyer9
Copy link
Member

meyer9 commented Apr 20, 2018

Merge this commit from the Bitcoin upstream.

petertodd@ab0f54f
@meyer9 meyer9 added feature merge merging from other repository labels Apr 20, 2018
@wqking
Copy link
Collaborator

wqking commented Apr 25, 2018

I think this conflicts with Bitcoin core.
In Bitcoin core,
SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 9),
bitcoin@53e53a3

In the repo in this issue,
SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 5)
petertodd@ab0f54f

I think we should merge all changes from Bitcoin core.

@meyer9
Copy link
Member Author

meyer9 commented Apr 25, 2018 •
edited
Loading

just set it to the next available flag.

merging all commits from BTC Core will take an insane amount of time

@cranberriez
Copy link

Done in 077df26

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
feature merge merging from other repository
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@meyer9 @wqking @cranberriez