diff options
| author | MarcoFalke <[email protected]> | 2018-04-29 19:34:57 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2018-05-29 16:49:52 -0400 |
| commit | fa7a6cf1b36284db70e941bd2915fd6edbb0f9d6 (patch) | |
| tree | 7a69ae65066c91fec3f7a0c23debf8905d793f55 /src/validation.cpp | |
| parent | Merge #13340: doc: remove leftover check-doc documentation (diff) | |
| download | discoin-fa7a6cf1b36284db70e941bd2915fd6edbb0f9d6.tar.xz discoin-fa7a6cf1b36284db70e941bd2915fd6edbb0f9d6.zip | |
policy: Treat segwit as always active
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 9791d6e2d..60b48d38c 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -577,15 +577,9 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool if (tx.IsCoinBase()) return state.DoS(100, false, REJECT_INVALID, "coinbase"); - // Reject transactions with witness before segregated witness activates (override with -prematurewitness) - bool witnessEnabled = IsWitnessEnabled(chainActive.Tip(), chainparams.GetConsensus()); - if (!gArgs.GetBoolArg("-prematurewitness", false) && tx.HasWitness() && !witnessEnabled) { - return state.DoS(0, false, REJECT_NONSTANDARD, "no-witness-yet", true); - } - // Rather not work on nonstandard transactions (unless -testnet/-regtest) std::string reason; - if (fRequireStandard && !IsStandardTx(tx, reason, witnessEnabled)) + if (fRequireStandard && !IsStandardTx(tx, reason)) return state.DoS(0, false, REJECT_NONSTANDARD, reason); // Do not work on transactions that are too small. |