Merge 71bdf0bff1 into merged_master (Bitcoin PR bitcoin/bitcoin#22626)

This commit is contained in:
Byron Hambly 2023-04-21 12:36:24 +00:00
commit 8d89f4e102
8 changed files with 45 additions and 176 deletions

View file

@ -198,7 +198,7 @@ bool CheckFinalTx(const CBlockIndex* active_chain_tip, const CTransaction &tx, i
// CheckFinalTx() uses active_chain_tip.Height()+1 to evaluate
// nLockTime because when IsFinalTx() is called within
// CBlock::AcceptBlock(), the height of the block *being*
// AcceptBlock(), the height of the block *being*
// evaluated is what is used. Thus if we want to know if a
// transaction can be part of the *next* block, we need to call
// IsFinalTx() with one more than active_chain_tip.Height().