diff options
author | MarcoFalke <falke.marco@gmail.com> | 2018-06-23 16:16:54 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2018-06-23 17:02:52 -0400 |
commit | faa24441ec047ec336b86f586016b9d318c1c0ad (patch) | |
tree | 659d9cc2737a388a465b3c6b0543ec0b34dcba52 /src/miner.cpp | |
parent | 6579d80572d2d33aceabbd3db45a6a9f809aa5e3 (diff) |
policy: Remove promiscuousmempoolflags
Diffstat (limited to 'src/miner.cpp')
-rw-r--r-- | src/miner.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index d4527a1d67..db618f88f5 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -133,8 +133,11 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc // Decide whether to include witness transactions // This is only needed in case the witness softfork activation is reverted - // (which would require a very deep reorganization) or when - // -promiscuousmempoolflags is used. + // (which would require a very deep reorganization). + // Note that the mempool would accept transactions with witness data before + // IsWitnessEnabled, but we would only ever mine blocks after IsWitnessEnabled + // unless there is a massive block reorganization with the witness softfork + // not activated. // TODO: replace this with a call to main to assess validity of a mempool // transaction (which in most cases can be a no-op). fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus()) && fMineWitnessTx; |