diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -37,6 +37,8 @@ CreateBaseChainParams(CBaseChainParams::MAIN); const auto testnetBaseParams = CreateBaseChainParams(CBaseChainParams::TESTNET); + const auto regtestBaseParams = + CreateBaseChainParams(CBaseChainParams::REGTEST); gArgs.AddArg("-?", "This help message", false, OptionsCategory::OPTIONS); gArgs.AddArg("-version", "Print version and exit", false, @@ -71,11 +73,13 @@ "Location of the auth cookie. Relative paths will be prefixed " "by a net-specific datadir location. (default: data dir)", false, OptionsCategory::OPTIONS); - gArgs.AddArg( - "-rpcport=", - strprintf("Connect to JSON-RPC on (default: %u or testnet: %u)", - defaultBaseParams->RPCPort(), testnetBaseParams->RPCPort()), - false, OptionsCategory::OPTIONS); + gArgs.AddArg("-rpcport=", + strprintf("Connect to JSON-RPC on (default: %u, " + "testnet: %u, regtest: %u)", + defaultBaseParams->RPCPort(), + testnetBaseParams->RPCPort(), + regtestBaseParams->RPCPort()), + false, OptionsCategory::OPTIONS); gArgs.AddArg("-rpcwait", "Wait for RPC server to start", false, OptionsCategory::OPTIONS); gArgs.AddArg("-rpcuser=", "Username for JSON-RPC connections", false, diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -336,9 +336,13 @@ CreateBaseChainParams(CBaseChainParams::MAIN); const auto testnetBaseParams = CreateBaseChainParams(CBaseChainParams::TESTNET); + const auto regtestBaseParams = + CreateBaseChainParams(CBaseChainParams::REGTEST); const auto defaultChainParams = CreateChainParams(CBaseChainParams::MAIN); const auto testnetChainParams = CreateChainParams(CBaseChainParams::TESTNET); + const auto regtestChainParams = + CreateChainParams(CBaseChainParams::REGTEST); // Hidden Options std::vector hidden_args = { @@ -624,13 +628,13 @@ strprintf("Relay non-P2SH multisig (default: %d)", DEFAULT_PERMIT_BAREMULTISIG), false, OptionsCategory::CONNECTION); - gArgs.AddArg( - "-port=", - strprintf( - "Listen for connections on (default: %u or testnet: %u)", - defaultChainParams->GetDefaultPort(), - testnetChainParams->GetDefaultPort()), - false, OptionsCategory::CONNECTION); + gArgs.AddArg("-port=", + strprintf("Listen for connections on (default: %u, " + "testnet: %u, regtest: %u)", + defaultChainParams->GetDefaultPort(), + testnetChainParams->GetDefaultPort(), + regtestChainParams->GetDefaultPort()), + false, OptionsCategory::CONNECTION); gArgs.AddArg("-proxy=", _("Connect through SOCKS5 proxy"), false, OptionsCategory::CONNECTION); gArgs.AddArg("-proxyrandomize", @@ -729,16 +733,21 @@ "(0-4, default: %u)", DEFAULT_CHECKLEVEL), true, OptionsCategory::DEBUG_TEST); - gArgs.AddArg("-checkblockindex", - strprintf("Do a full consistency check for mapBlockIndex, " - "setBlockIndexCandidates, ::ChainActive() and " - "mapBlocksUnlinked occasionally. (default: %u)", - defaultChainParams->DefaultConsistencyChecks()), - true, OptionsCategory::DEBUG_TEST); - gArgs.AddArg("-checkmempool=", - strprintf("Run checks every transactions (default: %u)", - defaultChainParams->DefaultConsistencyChecks()), - true, OptionsCategory::DEBUG_TEST); + gArgs.AddArg( + "-checkblockindex", + strprintf("Do a full consistency check for mapBlockIndex, " + "setBlockIndexCandidates, ::ChainActive() and " + "mapBlocksUnlinked occasionally. (default: %u, regtest: %u)", + defaultChainParams->DefaultConsistencyChecks(), + regtestChainParams->DefaultConsistencyChecks()), + true, OptionsCategory::DEBUG_TEST); + gArgs.AddArg( + "-checkmempool=", + strprintf( + "Run checks every transactions (default: %u, regtest: %u)", + defaultChainParams->DefaultConsistencyChecks(), + regtestChainParams->DefaultConsistencyChecks()), + true, OptionsCategory::DEBUG_TEST); gArgs.AddArg("-checkpoints", strprintf("Only accept block chain matching built-in " "checkpoints (default: %d)", @@ -971,9 +980,10 @@ false, OptionsCategory::RPC); gArgs.AddArg("-rpcport=", strprintf("Listen for JSON-RPC connections on " - "(default: %u or testnet: %u)", + "(default: %u, testnet: %u, regtest: %u)", defaultBaseParams->RPCPort(), - testnetBaseParams->RPCPort()), + testnetBaseParams->RPCPort(), + regtestBaseParams->RPCPort()), false, OptionsCategory::RPC); gArgs.AddArg("-rpcallowip=", "Allow JSON-RPC connections from specified source. Valid for "