GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove -mempoolreplacement option

Browse source
This commit is contained in:
Jorge Timón 2017-08-26 05:21:09 +02:00
parent 283fa9fc60
commit e17e0b81b6
No known key found for this signature in database
GPG key ID: 8866C18EA1C944A2
5 changed files with 4 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/validation.cpp
View file

@ -80,7 +80,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;
@ -1099,15 +1098,10 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
// unconfirmed ancestors anyway; doing otherwise is hopelessly
// insecure.
bool fReplacementOptOut = true;
if (fEnableReplacement)
{
BOOST_FOREACH(const CTxIn &_txin, ptxConflicting->vin)
{
if (_txin.nSequence < std::numeric_limits<unsigned int>::max()-1)
{
fReplacementOptOut = false;
break;
}
BOOST_FOREACH(const CTxIn &_txin, ptxConflicting->vin) {
if (_txin.nSequence < std::numeric_limits<unsigned int>::max()-1) {
fReplacementOptOut = false;
break;
}
}
if (fReplacementOptOut)