Skip to content
Permalink
Browse files

Merge txrepl_fullrbf_default+knots

  • Loading branch information...
luke-jr committed Jul 30, 2018
3 parents 2786f6f + 3b82242 + 557b088 commit f5c7ca2cd9c756b03f75ceeff6bb51d82726171f
Showing with 3 additions and 2 deletions.
  1. +2 −1 src/init.cpp
  2. +1 −1 src/validation.h
@@ -791,6 +791,7 @@ void InitParameterInteraction()
gArgs.SoftSetArg("-permitbaremultisig", "1");
gArgs.SoftSetArg("-datacarriersize", "83");

gArgs.SoftSetArg("-mempoolreplacement", "rbf,optin");
gArgs.SoftSetArg("-spkreuse", "allow");
gArgs.SoftSetArg("-blockprioritysize", "0");
gArgs.SoftSetArg("-blockmaxsize", "4000000");
@@ -1191,7 +1192,7 @@ bool AppInitParameterInteraction()
boost::split(vstrReplacementModes, strReplacementModeList, boost::is_any_of(",+"));
fEnableReplacement = (std::find(vstrReplacementModes.begin(), vstrReplacementModes.end(), "fee") != vstrReplacementModes.end());
if (fEnableReplacement) {
fReplacementHonourOptOut = (std::find(vstrReplacementModes.begin(), vstrReplacementModes.end(), "-optin") == vstrReplacementModes.end());
fReplacementHonourOptOut = (std::find(vstrReplacementModes.begin(), vstrReplacementModes.end(), "optin") != vstrReplacementModes.end());
if (!fReplacementHonourOptOut) {
nLocalServices = ServiceFlags(nLocalServices | NODE_REPLACE_BY_FEE);
}
@@ -137,7 +137,7 @@ static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100;
static const bool DEFAULT_PERSIST_MEMPOOL = true;
/** Default for -mempoolreplacement */
static const bool DEFAULT_ENABLE_REPLACEMENT = true;
static const bool DEFAULT_REPLACEMENT_HONOUR_OPTOUT = true;
static const bool DEFAULT_REPLACEMENT_HONOUR_OPTOUT = false;
/** Default for using fee filter */
static const bool DEFAULT_FEEFILTER = true;

0 comments on commit f5c7ca2

Please sign in to comment.
You can’t perform that action at this time.