diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -345,6 +345,15 @@ _("Execute command when a relevant alert is received or we " "see a really long fork (%s in cmd is replaced by message)"), false, OptionsCategory::OPTIONS); + gArgs.AddArg( + "-assumevalid=", + strprintf( + _("If this block is in the chain assume that it and its ancestors " + "are valid and potentially skip their script verification (0 to " + "verify all, default: %s, testnet: %s)"), + defaultChainParams->GetConsensus().defaultAssumeValid.GetHex(), + testnetChainParams->GetConsensus().defaultAssumeValid.GetHex()), + false, OptionsCategory::OPTIONS); gArgs.AddArg("-blocksdir=", _("Specify directory to hold blocks subdirectory for *.dat " "files (default: )"), @@ -353,20 +362,17 @@ _("Execute command when the best block changes (%s in cmd is " "replaced by block hash)"), false, OptionsCategory::OPTIONS); + gArgs.AddArg( + "-blockreconstructionextratxn=", + strprintf(_("Extra transactions to keep in memory for compact block " + "reconstructions (default: %u)"), + DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN), + false, OptionsCategory::OPTIONS); gArgs.AddArg( "-blocksonly", strprintf(_("Whether to operate in a blocks only mode (default: %d)"), DEFAULT_BLOCKSONLY), true, OptionsCategory::OPTIONS); - gArgs.AddArg( - "-assumevalid=", - strprintf( - _("If this block is in the chain assume that it and its ancestors " - "are valid and potentially skip their script verification (0 to " - "verify all, default: %s, testnet: %s)"), - defaultChainParams->GetConsensus().defaultAssumeValid.GetHex(), - testnetChainParams->GetConsensus().defaultAssumeValid.GetHex()), - false, OptionsCategory::OPTIONS); gArgs.AddArg("-conf=", strprintf(_("Specify configuration file (default: %s)"), BITCOIN_CONF_FILENAME), @@ -384,6 +390,13 @@ _("Set database cache size in megabytes (%d to %d, default: %d)"), nMinDbCache, nMaxDbCache, nDefaultDbCache), false, OptionsCategory::OPTIONS); + gArgs.AddArg( + "-debuglogfile=", + strprintf( + _("Specify location of debug log file: this can be an absolute " + "path or a path relative to the data directory (default: %s)"), + DEFAULT_DEBUGLOGFILE), + false, OptionsCategory::OPTIONS); gArgs.AddArg("-feefilter", strprintf("Tell other nodes to filter invs to us by " "our mempool min fee (default: %d)", @@ -409,23 +422,16 @@ gArgs.AddArg("-loadblock=", _("Imports blocks from external blk000??.dat file on startup"), false, OptionsCategory::OPTIONS); - gArgs.AddArg( - "-debuglogfile=", - strprintf( - _("Specify location of debug log file: this can be an absolute " - "path or a path relative to the data directory (default: %s)"), - DEFAULT_DEBUGLOGFILE), - false, OptionsCategory::OPTIONS); - gArgs.AddArg("-maxorphantx=", - strprintf(_("Keep at most unconnectable " - "transactions in memory (default: %u)"), - DEFAULT_MAX_ORPHAN_TRANSACTIONS), - false, OptionsCategory::OPTIONS); gArgs.AddArg("-maxmempool=", strprintf(_("Keep the transaction memory pool " "below megabytes (default: %u)"), DEFAULT_MAX_MEMPOOL_SIZE), false, OptionsCategory::OPTIONS); + gArgs.AddArg("-maxorphantx=", + strprintf(_("Keep at most unconnectable " + "transactions in memory (default: %u)"), + DEFAULT_MAX_ORPHAN_TRANSACTIONS), + false, OptionsCategory::OPTIONS); gArgs.AddArg("-mempoolexpiry=", strprintf(_("Do not keep transactions in the mempool " "longer than hours (default: %u)"), @@ -439,17 +445,6 @@ defaultChainParams->GetConsensus().nMinimumChainWork.GetHex(), testnetChainParams->GetConsensus().nMinimumChainWork.GetHex()), true, OptionsCategory::OPTIONS); - gArgs.AddArg("-persistmempool", - strprintf(_("Whether to save the mempool on shutdown " - "and load on restart (default: %u)"), - DEFAULT_PERSIST_MEMPOOL), - false, OptionsCategory::OPTIONS); - gArgs.AddArg( - "-blockreconstructionextratxn=", - strprintf(_("Extra transactions to keep in memory for compact block " - "reconstructions (default: %u)"), - DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN), - false, OptionsCategory::OPTIONS); gArgs.AddArg( "-par=", strprintf(_("Set the number of script verification threads (%u to %d, " @@ -457,6 +452,11 @@ -GetNumCores(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS), false, OptionsCategory::OPTIONS); + gArgs.AddArg("-persistmempool", + strprintf(_("Whether to save the mempool on shutdown " + "and load on restart (default: %u)"), + DEFAULT_PERSIST_MEMPOOL), + false, OptionsCategory::OPTIONS); #ifndef WIN32 gArgs.AddArg( "-pid=", @@ -587,15 +587,15 @@ "-onlynet=", _("Only connect to nodes in network (ipv4, ipv6 or onion)"), false, OptionsCategory::CONNECTION); - gArgs.AddArg("-permitbaremultisig", - strprintf(_("Relay non-P2SH multisig (default: %d)"), - DEFAULT_PERMIT_BAREMULTISIG), - false, OptionsCategory::CONNECTION); gArgs.AddArg("-peerbloomfilters", strprintf(_("Support filtering of blocks and transaction with " "bloom filters (default: %d)"), DEFAULT_PEERBLOOMFILTERS), false, OptionsCategory::CONNECTION); + gArgs.AddArg("-permitbaremultisig", + strprintf(_("Relay non-P2SH multisig (default: %d)"), + DEFAULT_PERMIT_BAREMULTISIG), + false, OptionsCategory::CONNECTION); gArgs.AddArg( "-port=", strprintf(