Default HSC is now HUSH3 and some doc fixes
This commit is contained in:
@@ -28,7 +28,7 @@
|
|||||||
#include <event2/buffer.h>
|
#include <event2/buffer.h>
|
||||||
#include <event2/keyvalq_struct.h>
|
#include <event2/keyvalq_struct.h>
|
||||||
#include "support/events.h"
|
#include "support/events.h"
|
||||||
uint16_t BITCOIND_RPCPORT = 7771;
|
uint16_t BITCOIND_RPCPORT = 18031;
|
||||||
char SMART_CHAIN_SYMBOL[65];
|
char SMART_CHAIN_SYMBOL[65];
|
||||||
|
|
||||||
#include <univalue.h>
|
#include <univalue.h>
|
||||||
@@ -43,13 +43,13 @@ std::string HelpMessageCli()
|
|||||||
std::string strUsage;
|
std::string strUsage;
|
||||||
strUsage += HelpMessageGroup(_("Options:"));
|
strUsage += HelpMessageGroup(_("Options:"));
|
||||||
strUsage += HelpMessageOpt("-?", _("This help message"));
|
strUsage += HelpMessageOpt("-?", _("This help message"));
|
||||||
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "komodo.conf"));
|
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "HUSH3.conf"));
|
||||||
strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
|
strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
|
||||||
strUsage += HelpMessageOpt("-testnet", _("Use the test network"));
|
strUsage += HelpMessageOpt("-testnet", _("Use the test network"));
|
||||||
strUsage += HelpMessageOpt("-regtest", _("Enter regression test mode, which uses a special chain in which blocks can be "
|
strUsage += HelpMessageOpt("-regtest", _("Enter regression test mode, which uses a special chain in which blocks can be "
|
||||||
"solved instantly. This is intended for regression testing tools and app development."));
|
"solved instantly. This is intended for regression testing tools and app development."));
|
||||||
strUsage += HelpMessageOpt("-rpcconnect=<ip>", strprintf(_("Send commands to node running on <ip> (default: %s)"), "127.0.0.1"));
|
strUsage += HelpMessageOpt("-rpcconnect=<ip>", strprintf(_("Send commands to node running on <ip> (default: %s)"), "127.0.0.1"));
|
||||||
strUsage += HelpMessageOpt("-rpcport=<port>", strprintf(_("Connect to JSON-RPC on <port> (default: %u or testnet: %u)"), 8232, 18232));
|
strUsage += HelpMessageOpt("-rpcport=<port>", strprintf(_("Connect to JSON-RPC on <port> (default: %u )"), 18030));
|
||||||
strUsage += HelpMessageOpt("-rpcwait", _("Wait for RPC server to start"));
|
strUsage += HelpMessageOpt("-rpcwait", _("Wait for RPC server to start"));
|
||||||
strUsage += HelpMessageOpt("-rpcuser=<user>", _("Username for JSON-RPC connections"));
|
strUsage += HelpMessageOpt("-rpcuser=<user>", _("Username for JSON-RPC connections"));
|
||||||
strUsage += HelpMessageOpt("-rpcpassword=<pw>", _("Password for JSON-RPC connections"));
|
strUsage += HelpMessageOpt("-rpcpassword=<pw>", _("Password for JSON-RPC connections"));
|
||||||
@@ -82,7 +82,10 @@ static int AppInitRPC(int argc, char* argv[])
|
|||||||
// Parameters
|
// Parameters
|
||||||
ParseParameters(argc, argv);
|
ParseParameters(argc, argv);
|
||||||
std:string name;
|
std:string name;
|
||||||
name = GetArg("-ac_name","");
|
|
||||||
|
// default HSC is HUSH3 itself, which to the internals, is also an HSC
|
||||||
|
name = GetArg("-ac_name","HUSH3");
|
||||||
|
|
||||||
if ( !name.empty() )
|
if ( !name.empty() )
|
||||||
strncpy(SMART_CHAIN_SYMBOL,name.c_str(),sizeof(SMART_CHAIN_SYMBOL)-1);
|
strncpy(SMART_CHAIN_SYMBOL,name.c_str(),sizeof(SMART_CHAIN_SYMBOL)-1);
|
||||||
|
|
||||||
|
|||||||
11
src/util.cpp
11
src/util.cpp
@@ -652,15 +652,10 @@ void ClearDatadirCache()
|
|||||||
boost::filesystem::path GetConfigFile()
|
boost::filesystem::path GetConfigFile()
|
||||||
{
|
{
|
||||||
char confname[512];
|
char confname[512];
|
||||||
if ( SMART_CHAIN_SYMBOL[0] != 0 )
|
if ( SMART_CHAIN_SYMBOL[0] != 0 ) {
|
||||||
sprintf(confname,"%s.conf",SMART_CHAIN_SYMBOL);
|
sprintf(confname,"%s.conf",SMART_CHAIN_SYMBOL);
|
||||||
else
|
} else {
|
||||||
{
|
strcpy(confname,"HUSH3.conf");
|
||||||
#ifdef __APPLE__
|
|
||||||
strcpy(confname,"Komodo.conf");
|
|
||||||
#else
|
|
||||||
strcpy(confname,"komodo.conf");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
boost::filesystem::path pathConfigFile(GetArg("-conf",confname));
|
boost::filesystem::path pathConfigFile(GetArg("-conf",confname));
|
||||||
if (!pathConfigFile.is_complete())
|
if (!pathConfigFile.is_complete())
|
||||||
|
|||||||
Reference in New Issue
Block a user