diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-03 10:24:54 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-03 10:27:32 +0100 |
| commit | 5fd95b4490a9eeb0575702c8137a5f2619f2e6c6 (patch) | |
| tree | 70f2bb137d31007e730981f5e5a040736144896c /src/main.h | |
| parent | fd13fe7ca01b6104ce591af2b90ee6951ccc5a16 (diff) | |
| parent | b922fbe063b46862aae6efb35074d1e010fe7006 (diff) | |
| download | bitcoin-5fd95b4490a9eeb0575702c8137a5f2619f2e6c6.tar.xz | |
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.h')
| -rw-r--r-- | src/main.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h index 793737422e..64b6010b9c 100644 --- a/src/main.h +++ b/src/main.h @@ -115,8 +115,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 -mempoolreplacement */ +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; @@ -153,7 +153,7 @@ extern CAmount maxTxFee; extern bool fAlerts; /** If the tip is older than this (in seconds), the node is considered to be in initial block download. */ 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; |