aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-02-03 10:24:54 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-02-03 10:27:32 +0100
commit5fd95b4490a9eeb0575702c8137a5f2619f2e6c6 (patch)
tree70f2bb137d31007e730981f5e5a040736144896c /src/main.cpp
parentfd13fe7ca01b6104ce591af2b90ee6951ccc5a16 (diff)
parentb922fbe063b46862aae6efb35074d1e010fe7006 (diff)
Merge #7431: Rename permitrbf to mempoolreplacement and provide minimal string-list forward compatibility (needs 0.12 backport)
b922fbe Rename replacebyfee=opt-in to mempoolreplacement=fee (Luke Dashjr) 3b66e54 Simplify check for replacebyfee=opt-in (Luke Dashjr) d65dee9 Accept replacebyfee=opt-in for turning on opt-in RBF (Luke Dashjr) 77b55a0 Rename permitrbf to replacebyfee (Luke Dashjr)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 4d16b9f9ac..b165366ddc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -76,7 +76,7 @@ size_t nCoinCacheUsage = 5000 * 300;
uint64_t nPruneTarget = 0;
bool fAlerts = DEFAULT_ALERTS;
int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
-bool fPermitReplacement = DEFAULT_PERMIT_REPLACEMENT;
+bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT;
CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
@@ -867,7 +867,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState &state, const C
// unconfirmed ancestors anyway; doing otherwise is hopelessly
// insecure.
bool fReplacementOptOut = true;
- if (fPermitReplacement)
+ if (fEnableReplacement)
{
BOOST_FOREACH(const CTxIn &txin, ptxConflicting->vin)
{