diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-08 07:51:18 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-08 07:51:35 +0100 |
| commit | d52ce89bd220f95fe4745aa0a76d90586042e63d (patch) | |
| tree | aa46313374a9db13c2e2dd7d0cc4cd880282ee70 | |
| parent | ea33f197ef1edc43b73e9cedff7d650bef7ff6e9 (diff) | |
| parent | b919179cbbe45302de62b47020e09c1aeab19cd3 (diff) | |
| download | bitcoin-d52ce89bd220f95fe4745aa0a76d90586042e63d.tar.xz | |
Merge #9299: Remove no longer needed check for premature v2 txs
b919179 remove no longer needed check for premature v2 txs (Alex Morcos)
| -rw-r--r-- | src/validation.cpp | 8 |
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) { |