diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-12 17:03:43 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-12 17:03:46 +0100 |
| commit | 80d1f2e48364f05b2cdf44239b3a1faa0277e58e (patch) | |
| tree | 39fc8fe0304591eebc89b30b6f53cd328983962f /src/script/interpreter.cpp | |
| parent | 621940e04090919f87d452723cfddd427e561812 (diff) | |
| parent | b043c4b746c8199ce948aa5e8b186e0d1a61ad68 (diff) | |
| download | bitcoin-80d1f2e48364f05b2cdf44239b3a1faa0277e58e.tar.xz | |
Merge #7184: Implement SequenceLocks functions for BIP 68
b043c4b fix sdaftuar's nits again (Alex Morcos)
a51c79b Bug fix to RPC test (Alex Morcos)
da6ad5f Add RPC test exercising BIP68 (mempool only) (Suhas Daftuar)
c6c2f0f Implement SequenceLocks functions (Alex Morcos)
Diffstat (limited to 'src/script/interpreter.cpp')
| -rw-r--r-- | src/script/interpreter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 265131ae0d..901f901f01 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1150,7 +1150,7 @@ bool TransactionSignatureChecker::CheckLockTime(const CScriptNum& nLockTime) con // prevent this condition. Alternatively we could test all // inputs, but testing just this input minimizes the data // required to prove correct CHECKLOCKTIMEVERIFY execution. - if (txTo->vin[nIn].IsFinal()) + if (CTxIn::SEQUENCE_FINAL == txTo->vin[nIn].nSequence) return false; return true; |