/bitcoin

Restores mempool only BIP113 enforcement #6934

Merged
merged 2 commits into from Nov 5, 2015

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
Projects
None yet
Milestone
No milestone
7 participants
@gmaxwell @btcdrak @luke-jr @petertodd @sipa @dcousens @laanwj
@gmaxwell
Member

gmaxwell commented Nov 3, 2015

This undoes my prior revert to restore BIP113 (MedianTimePast) mempool only.

After careful analysis and testing I determined that the behavior is, in fact, safe-- I and others were just suffering momentary confusion related to locktime semantics.

The block time must be beyond the tx lock time for the transaction to be included. The MTP is already required to be before the blocktime, so using it instead is strictly more strict.

gmaxwell added some commits Nov 3, 2015

@gmaxwell
Restore MedianTimePast for locktime. 
Revert "Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations""
This reverts commit 40cd32e.

After careful analysis it was determined that the change was, in fact, safe and several people were suffering
momentary confusion about locktime semantics.
e4e5334
@gmaxwell
Revert "Revert "Enable policy enforcing GetMedianTimePast as the end … 
…point of lock-time constraints""

This reverts commit 8537ecd.
d1c3762

@gmaxwell gmaxwell changed the title from Restores mempool only BIP113 enforces to Restores mempool only BIP113 enforcement Nov 4, 2015

@btcdrak

This comment has been minimized.

Show comment
Hide comment
@btcdrak

btcdrak Nov 4, 2015

Member

utACK
Member

btcdrak commented Nov 4, 2015

utACK
@luke-jr

This comment has been minimized.

Show comment
Hide comment
@luke-jr

luke-jr Nov 4, 2015

Member

Concept ACK
Member

luke-jr commented Nov 4, 2015

Concept ACK

@laanwj laanwj added the Mempool label Nov 4, 2015

@petertodd

This comment has been minimized.

Show comment
Hide comment
@petertodd

petertodd Nov 4, 2015

Contributor

ACK
Contributor

petertodd commented Nov 4, 2015

ACK
@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Nov 4, 2015

Member

ACK
Member

sipa commented Nov 4, 2015

ACK
@dcousens

This comment has been minimized.

Show comment
Hide comment
@dcousens

dcousens Nov 5, 2015

Contributor

ACK
Contributor

dcousens commented Nov 5, 2015

ACK

@btcdrak btcdrak referenced this pull request Nov 5, 2015

Merged

Backport #6566, median-past locktime, rebased against 0.11 #6884

@laanwj laanwj merged commit d1c3762 into bitcoin:master Nov 5, 2015
1 check passed

1 check passed

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

laanwj added a commit that referenced this pull request Nov 5, 2015

@laanwj
Merge pull request #6934 
d1c3762 Revert "Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints"" (Gregory Maxwell)
e4e5334 Restore MedianTimePast for locktime. (Gregory Maxwell)
Verified
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
3038eb6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment