diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-06-01 11:30:20 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-06-01 11:33:33 +0200 |
| commit | 87550eefc1131132e940efcaf296bb399eeb02df (patch) | |
| tree | 29feaceee6f4f0aa73bf2dba0ab8698e73a6aced /src/main.h | |
| parent | Merge pull request #6164 (diff) | |
| parent | Fix off-by-one error w/ nLockTime in the wallet (diff) | |
| download | discoin-87550eefc1131132e940efcaf296bb399eeb02df.tar.xz discoin-87550eefc1131132e940efcaf296bb399eeb02df.zip | |
Merge pull request #6183
28bf062 Fix off-by-one error w/ nLockTime in the wallet (Peter Todd)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 9bf7bbb2f..3b2521786 100644 --- a/src/main.h +++ b/src/main.h @@ -324,7 +324,18 @@ bool CheckTransaction(const CTransaction& tx, CValidationState& state); */ bool IsStandardTx(const CTransaction& tx, std::string& reason); -bool IsFinalTx(const CTransaction &tx, int nBlockHeight = 0, int64_t nBlockTime = 0); +/** + * Check if transaction is final and can be included in a block with the + * specified height and time. Consensus critical. + */ +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. + */ +bool CheckFinalTx(const CTransaction &tx); /** * Closure representing one script verification |