Skip to content

Commit 470b526

Browse files
laanwjcodablock
authored andcommitted
Merge bitcoin#9299: Remove no longer needed check for premature v2 txs
b919179 remove no longer needed check for premature v2 txs (Alex Morcos)
1 parent 7322489 commit 470b526

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/validation.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -590,14 +590,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
590590
if (fRequireStandard && !IsStandardTx(tx, reason))
591591
return state.DoS(0, false, REJECT_NONSTANDARD, reason);
592592

593-
// Don't relay version 2 transactions until CSV is active, and we can be
594-
// sure that such transactions will be mined (unless we're on
595-
// -testnet/-regtest).
596-
const CChainParams& chainparams = Params();
597-
if (fRequireStandard && tx.nVersion >= 2 && VersionBitsTipState(chainparams.GetConsensus(), Consensus::DEPLOYMENT_CSV) != THRESHOLD_ACTIVE) {
598-
return state.DoS(0, false, REJECT_NONSTANDARD, "premature-version2-tx");
599-
}
600-
601593
// Only accept nLockTime-using transactions that can be mined in the next
602594
// block; we don't want our mempool filled up with transactions that can't
603595
// be mined yet.

0 commit comments

Comments
 (0)