Merge e1a13f12e1 into merged_master (Bitcoin PR bitcoin/bitcoin#18096)

This commit is contained in:
Andrew Poelstra 2021-07-29 16:18:42 +00:00
commit 29a49051ba
2 changed files with 12 additions and 3 deletions

View file

@ -2201,9 +2201,9 @@ bool GenericTransactionSignatureChecker<T>::CheckLockTime(const CScriptNum& nLoc
if (nLockTime > (int64_t)txTo->nLockTime)
return false;
// Finally the nLockTime feature can be disabled and thus
// CHECKLOCKTIMEVERIFY bypassed if every txin has been
// finalized by setting nSequence to maxint. The
// Finally the nLockTime feature can be disabled in IsFinalTx()
// and thus CHECKLOCKTIMEVERIFY bypassed if every txin has
// been finalized by setting nSequence to maxint. The
// transaction would be allowed into the blockchain, making
// the opcode ineffective.
//