Merge pull request #6183

28bf062 Fix off-by-one error w/ nLockTime in the wallet (Peter Todd)

1 files changed, 12 insertions, 1 deletions

diff --git a/src/main.h b/src/main.h
index 9bf7bbb2f8..3b25217869 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