diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-05 12:12:50 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-05 12:13:04 +0100 |
| commit | 3038eb63e8a674b4818cb5d5e461f1ccf4b2932f (patch) | |
| tree | 1017d21cb0b94b3108b079a8c0611dbc7ba5851e /src/main.h | |
| parent | 3694b74fa9c85e07ddbd3583154b38cd3b39f640 (diff) | |
| parent | d1c3762ae8c8c73ddd47766041507a6c131afaf2 (diff) | |
| download | bitcoin-3038eb63e8a674b4818cb5d5e461f1ccf4b2932f.tar.xz | |
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)
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 c3874be663..273a450867 100644 --- a/src/main.h +++ b/src/main.h @@ -311,8 +311,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 |