|
|
@@ -489,7 +489,7 @@ std::string HelpMessage(HelpMessageMode mode) |
|
|
|
strUsage += HelpMessageOpt("-bytespersigop", strprintf(_("Minimum bytes per sigop in transactions we relay and mine (default: %u)"), DEFAULT_BYTES_PER_SIGOP)); |
|
|
|
strUsage += HelpMessageOpt("-datacarrier", strprintf(_("Relay and mine data carrier transactions (default: %u)"), DEFAULT_ACCEPT_DATACARRIER)); |
|
|
|
strUsage += HelpMessageOpt("-datacarriersize", strprintf(_("Maximum size of data in data carrier transactions we relay and mine (default: %u)"), MAX_OP_RETURN_RELAY)); |
|
|
|
strUsage += HelpMessageOpt("-replacebyfee", strprintf(_("Enable transaction replacement in the memory pool (default: %u)"), DEFAULT_ENABLE_REPLACEMENT)); |
|
|
|
strUsage += HelpMessageOpt("-mempoolreplacement", strprintf(_("Enable transaction replacement in the memory pool (default: %u)"), DEFAULT_ENABLE_REPLACEMENT)); |
|
|
|
|
|
|
|
strUsage += HelpMessageGroup(_("Block creation options:")); |
|
|
|
strUsage += HelpMessageOpt("-blockminsize=<n>", strprintf(_("Set minimum block size in bytes (default: %u)"), DEFAULT_BLOCK_MIN_SIZE)); |
|
|
@@ -1033,13 +1033,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) |
|
|
|
|
|
|
|
nMaxTipAge = GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE); |
|
|
|
|
|
|
|
fEnableReplacement = GetBoolArg("-replacebyfee", DEFAULT_ENABLE_REPLACEMENT); |
|
|
|
if ((!fEnableReplacement) && mapArgs.count("-replacebyfee")) { |
|
|
|
fEnableReplacement = GetBoolArg("-mempoolreplacement", DEFAULT_ENABLE_REPLACEMENT); |
|
|
|
if ((!fEnableReplacement) && mapArgs.count("-mempoolreplacement")) { |
|
|
|
// Minimal effort at forwards compatibility |
|
|
|
std::string strReplacementModeList = GetArg("-replacebyfee", ""); // default is impossible |
|
|
|
std::string strReplacementModeList = GetArg("-mempoolreplacement", ""); // default is impossible |
|
|
|
std::vector<std::string> vstrReplacementModes; |
|
|
|
boost::split(vstrReplacementModes, strReplacementModeList, boost::is_any_of(",")); |
|
|
|
fEnableReplacement = (std::find(vstrReplacementModes.begin(), vstrReplacementModes.end(), "opt-in") != vstrReplacementModes.end()); |
|
|
|
fEnableReplacement = (std::find(vstrReplacementModes.begin(), vstrReplacementModes.end(), "fee") != vstrReplacementModes.end()); |
|
|
|
} |
|
|
|
|
|
|
|
// ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log |