GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge e2182b02b5 into merged_master (Bitcoin PR #16171)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-06 15:20:15 +00:00
commit 83f93df4d0
5 changed files with 5 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/validation.cpp
View file

@ -114,8 +114,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;
bool fReplacementHonourOptOut = DEFAULT_REPLACEMENT_HONOUR_OPTOUT;
uint256 hashAssumeValid;
arith_uint256 nMinimumChainWork;
@ -503,20 +501,13 @@ 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)
{
if (fReplacementHonourOptOut) {
for (const CTxIn &_txin : ptxConflicting->vin)
if (_txin.nSequence <= MAX_BIP125_RBF_SEQUENCE)
{
if (_txin.nSequence <= MAX_BIP125_RBF_SEQUENCE)
{
fReplacementOptOut = false;
break;
}
}
} else {
fReplacementOptOut = false;
}
break;
}
}
if (fReplacementOptOut) {
return state.Invalid(ValidationInvalidReason::TX_MEMPOOL_POLICY, false, REJECT_DUPLICATE, "txn-mempool-conflict");