highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 23:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6934

Browse Source 
d1c3762 Revert "Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints"" (Gregory Maxwell)
e4e5334 Restore MedianTimePast for locktime. (Gregory Maxwell)
This commit is contained in:
Wladimir J. van der Laan
2015-11-05 12:12:50 +01:00
parent 3694b74fa9 d1c3762ae8
commit 3038eb63e8
6 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.h
View File

@@ -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