Merge pull request #6124
41076aad0cbdUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge pull request #6124

ffd75ad Enable CHECKLOCKTIMEVERIFY as a standard script verify flag (Peter Todd)
bc60b2b Replace NOP2 with CHECKLOCKTIMEVERIFY (BIP65) (Peter Todd)
48e9c57 Move LOCKTIME_THRESHOLD to src/script/script.h (Peter Todd)
99088d6 Make CScriptNum() take nMaxNumSize as an argument (Peter Todd)

Details

Provenance

Wladimir J. van der Laan <laanwj@gmail.com>	Authored on Jun 26 2015, 12:33
deadalnix	Pushed on May 14 2017, 22:04

Parents

rABCffd75adce01a: Enable CHECKLOCKTIMEVERIFY as a standard script verify flag
rABC5aa34c79440f: Merge pull request #6333

Branches

Unknown

Tags

Unknown

Event Timeline

Wladimir J. van der Laan <laanwj@gmail.com> committed rABC41076aad0cbd: Merge pull request #6124 (authored by Wladimir J. van der Laan <laanwj@gmail.com>).Jun 26 2015, 12:42