Permalink
Browse files

Policy: Adjust default transaction replacement mode to full RBF

  • Loading branch information...
luke-jr committed Mar 22, 2018
1 parent f46e772 commit 278758df0a5fe91c39bb32a3cfe93c9ab33cd7fb
Showing with 4 additions and 2 deletions.
  1. +2 −1 src/init.cpp
  2. +1 −1 src/validation.h
  3. +1 −0 test/functional/mempool_accept.py
@@ -788,6 +788,7 @@ void InitParameterInteraction()
gArgs.SoftSetArg("-permitbaremultisig", "1");
gArgs.SoftSetArg("-datacarriersize", "83");

gArgs.SoftSetArg("-mempoolreplacement", "fee,optin");
gArgs.SoftSetArg("-spkreuse", "allow");
gArgs.SoftSetArg("-blockprioritysize", "0");
gArgs.SoftSetArg("-blockmaxsize", "4000000");
@@ -1195,7 +1196,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);
}
@@ -123,7 +123,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;

@@ -39,6 +39,7 @@ def set_test_params(self):
'-txindex',
'-reindex', # Need reindex for txindex
'-acceptnonstdtxn=0', # Try to mimic main-net
'-mempoolreplacement=fee,optin', # Test opt-out of RBF
]] * self.num_nodes

def skip_test_if_missing_module(self):

0 comments on commit 278758d

Please sign in to comment.