aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2016-12-07 09:58:20 -0500
committerAlex Morcos <morcos@chaincode.com>2016-12-07 09:58:20 -0500
commitb919179cbbe45302de62b47020e09c1aeab19cd3 (patch)
tree188d36091d64ab756e8c5621691c7e1b600f8b2c
parent09c4fd157c5b88df2d97fad4826c79b094db90c9 (diff)
remove no longer needed check for premature v2 txs
-rw-r--r--src/validation.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index a541978c85..c1efa8bc17 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -540,14 +540,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
if (tx.IsCoinBase())
return state.DoS(100, false, REJECT_INVALID, "coinbase");
- // Don't relay version 2 transactions until CSV is active, and we can be
- // sure that such transactions will be mined (unless we're on
- // -testnet/-regtest).
- const CChainParams& chainparams = Params();
- if (fRequireStandard && tx.nVersion >= 2 && VersionBitsTipState(chainparams.GetConsensus(), Consensus::DEPLOYMENT_CSV) != THRESHOLD_ACTIVE) {
- return state.DoS(0, false, REJECT_NONSTANDARD, "premature-version2-tx");
- }
-
// Reject transactions with witness before segregated witness activates (override with -prematurewitness)
bool witnessEnabled = IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus());
if (!GetBoolArg("-prematurewitness",false) && !tx.wit.IsNull() && !witnessEnabled) {