diff options
| author | Gregory Maxwell <greg@xiph.org> | 2015-11-03 17:12:36 +0000 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2015-11-03 17:12:36 +0000 |
| commit | e4e5334ef8d923993ef9cf704ea8f3d0b5801350 (patch) | |
| tree | a8298dd0e362e318eaa075c468a5e1b556d7d47b /src/main.h | |
| parent | 42f339ef780bff268369e3a7399c8b8f2ef3e8b4 (diff) | |
| download | bitcoin-e4e5334ef8d923993ef9cf704ea8f3d0b5801350.tar.xz | |
Restore MedianTimePast for locktime.
Revert "Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations""
This reverts commit 40cd32e835092c3158175511da5193193ec54939.
After careful analysis it was determined that the change was, in fact, safe and several people were suffering
momentary confusion about locktime semantics.
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 202d2c772b..65732d770f 100644 --- a/src/main.h +++ b/src/main.h @@ -308,8 +308,10 @@ bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime); * Check if transaction will be final in the next block to be created. * * Calls IsFinalTx() with current block height and appropriate block time. + * + * See consensus/consensus.h for flag definitions. */ -bool CheckFinalTx(const CTransaction &tx); +bool CheckFinalTx(const CTransaction &tx, int flags = -1); /** * Closure representing one script verification |