Skip to content

Commit d52ce89

Browse files
committed
Merge #9299: Remove no longer needed check for premature v2 txs
b919179 remove no longer needed check for premature v2 txs (Alex Morcos)
2 parents ea33f19 + b919179 commit d52ce89

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
@@ -540,14 +540,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
540540
if (tx.IsCoinBase())
541541
return state.DoS(100, false, REJECT_INVALID, "coinbase");
542542

543-
// Don't relay version 2 transactions until CSV is active, and we can be
544-
// sure that such transactions will be mined (unless we're on
545-
// -testnet/-regtest).
546-
const CChainParams& chainparams = Params();
547-
if (fRequireStandard && tx.nVersion >= 2 && VersionBitsTipState(chainparams.GetConsensus(), Consensus::DEPLOYMENT_CSV) != THRESHOLD_ACTIVE) {
548-
return state.DoS(0, false, REJECT_NONSTANDARD, "premature-version2-tx");
549-
}
550-
551543
// Reject transactions with witness before segregated witness activates (override with -prematurewitness)
552544
bool witnessEnabled = IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus());
553545
if (!GetBoolArg("-prematurewitness",false) && !tx.wit.IsNull() && !witnessEnabled) {

0 commit comments

Comments
 (0)