aboutsummaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2016-01-28 05:09:29 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2016-01-28 05:11:06 +0000
commit77b55a00ed4a3a3a22ec3e299539a1812a0bc605 (patch)
treedbd4d04fae69b372facc699d140f08ba33fc1cda /src/main.h
parent9189e30b127b6d9244da132c4c90084e7bb870be (diff)
downloadbitcoin-77b55a00ed4a3a3a22ec3e299539a1812a0bc605.tar.xz
Rename permitrbf to replacebyfee
"permit" is currently used to configure transaction filtering, whereas replacement is more to do with the memory pool state than the transaction itself.
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h
index 98069a225d..ec426003a1 100644
--- a/src/main.h
+++ b/src/main.h
@@ -107,8 +107,8 @@ static const bool DEFAULT_TXINDEX = false;
static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100;
static const bool DEFAULT_TESTSAFEMODE = false;
-/** Default for -permitrbf */
-static const bool DEFAULT_PERMIT_REPLACEMENT = true;
+/** Default for -replacebyfee */
+static const bool DEFAULT_ENABLE_REPLACEMENT = true;
/** Maximum number of headers to announce when relaying blocks with headers message.*/
static const unsigned int MAX_BLOCKS_TO_ANNOUNCE = 8;
@@ -141,7 +141,7 @@ extern size_t nCoinCacheUsage;
extern CFeeRate minRelayTxFee;
extern bool fAlerts;
extern int64_t nMaxTipAge;
-extern bool fPermitReplacement;
+extern bool fEnableReplacement;
/** Best header we've seen so far (used for getheaders queries' starting points). */
extern CBlockIndex *pindexBestHeader;