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.

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

libconsensus: Expose a flag for BIP112 #8412

Merged
merged 1 commit into from Jul 28, 2016

Conversation

Projects
None yet
8 participants
@jtimon
Member

jtimon commented Jul 27, 2016

We added the segwit one, but we forgot CHECKSEQUENCEVERIFY.
@laanwj this needs backport to 0.13, right?
In fact, I'm thinking that this should have been included in 0.12.1...

Ping @sipa @TheBlueMatt

Bikeshedding: I removed "FLAGS_" in this one and added "_BIP112" at the end instead because I believe it's more useful. I'm happy to change the name of the flag.

EDIT: Note that the bit positions have to correspond with those in the flags for scripts in script/interpreter.h.

@btcdrak

This comment has been minimized.

Show comment
Hide comment
@btcdrak

btcdrak Jul 27, 2016

Member

Why arent you following the status quo for naming?

Member

btcdrak commented Jul 27, 2016

Why arent you following the status quo for naming?

@jtimon

This comment has been minimized.

Show comment
Hide comment
@jtimon

jtimon Jul 27, 2016

Member

I'm saying it, I thought adding bip112 at the end would be more useful, changing back already...
Or are you complaining only about the missing "FLAGS_"?

Member

jtimon commented Jul 27, 2016

I'm saying it, I thought adding bip112 at the end would be more useful, changing back already...
Or are you complaining only about the missing "FLAGS_"?

libconsensus: Expose a flag for BIP112
We added the segwit one, but we forgot CHECKSEQUENCEVERIFY
@jtimon

This comment has been minimized.

Show comment
Hide comment
@jtimon

jtimon Jul 27, 2016

Member

Updated following the style and without adding BIP112 at the end.

Member

jtimon commented Jul 27, 2016

Updated following the style and without adding BIP112 at the end.

@btcdrak

This comment has been minimized.

Show comment
Hide comment
@btcdrak
Member

btcdrak commented Jul 28, 2016

ACK d12b732

@jonasschnelli jonasschnelli added this to the 0.13.0 milestone Jul 28, 2016

@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Jul 28, 2016

Member

utACK d12b732

Member

sipa commented Jul 28, 2016

utACK d12b732

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli
Member

jonasschnelli commented Jul 28, 2016

utACK d12b732

@NicolasDorier

This comment has been minimized.

Show comment
Hide comment
@NicolasDorier
Member

NicolasDorier commented Jul 28, 2016

utACK d12b732

@sipa sipa merged commit d12b732 into bitcoin:master Jul 28, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

sipa added a commit that referenced this pull request Jul 28, 2016

Merge #8412: libconsensus: Expose a flag for BIP112
d12b732 libconsensus: Expose a flag for BIP112 (Jorge Timón)

sipa added a commit that referenced this pull request Jul 28, 2016

libconsensus: Expose a flag for BIP112
We added the segwit one, but we forgot CHECKSEQUENCEVERIFY

Github-Pull: #8412
Rebased-From: d12b732

@MarcoFalke MarcoFalke modified the milestones: 0.13.0, 0.12.0 Jul 31, 2016

@laanwj laanwj modified the milestones: 0.12.2, 0.12.0 Sep 26, 2016

codablock added a commit to codablock/dash that referenced this pull request Sep 19, 2017

Merge #8412: libconsensus: Expose a flag for BIP112
d12b732 libconsensus: Expose a flag for BIP112 (Jorge Timón)

codablock added a commit to codablock/dash that referenced this pull request Dec 29, 2017

Merge #8412: libconsensus: Expose a flag for BIP112
d12b732 libconsensus: Expose a flag for BIP112 (Jorge Timón)

codablock added a commit to codablock/dash that referenced this pull request Jan 8, 2018

Merge #8412: libconsensus: Expose a flag for BIP112
d12b732 libconsensus: Expose a flag for BIP112 (Jorge Timón)

@fanquake fanquake removed the Needs backport label Mar 7, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment