diff options
| author | Matt Corallo <git@bluematt.me> | 2019-06-08 08:58:46 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2019-06-08 09:32:33 -0400 |
| commit | 8053e5cdade87550f0381d51feab81dedfec6c46 (patch) | |
| tree | 82c7cf378a2f045cd0998b6be99777f153884734 /src/validation.cpp | |
| parent | 5d2ccf0ce9ca1571c650a69319fb9c1e0b626ecb (diff) | |
Remove -mempoolreplacement to prevent needless block prop slowness.
At this point there is no reasonable excuse to disable opt-in RBF,
and, unlike when this option was added, there are now significant
issues created when disabling it (in the form of compact block
reconstruction failures). Further, it breaks a lot of modern wallet
behavior.
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index b2925efe32..3026df34fe 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -111,7 +111,6 @@ bool fCheckpointsEnabled = DEFAULT_CHECKPOINTS_ENABLED; size_t nCoinCacheUsage = 5000 * 300; uint64_t nPruneTarget = 0; int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE; -bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT; uint256 hashAssumeValid; arith_uint256 nMinimumChainWork; @@ -486,15 +485,12 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool // unconfirmed ancestors anyway; doing otherwise is hopelessly // insecure. bool fReplacementOptOut = true; - if (fEnableReplacement) + for (const CTxIn &_txin : ptxConflicting->vin) { - for (const CTxIn &_txin : ptxConflicting->vin) + if (_txin.nSequence <= MAX_BIP125_RBF_SEQUENCE) { - if (_txin.nSequence <= MAX_BIP125_RBF_SEQUENCE) - { - fReplacementOptOut = false; - break; - } + fReplacementOptOut = false; + break; } } if (fReplacementOptOut) { |