diff --git a/src/Makefile.am b/src/Makefile.am index 28b73431d..d88528678 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,11 +62,11 @@ bin_PROGRAMS = TESTS = if BUILD_BITCOIND - bin_PROGRAMS += zcashd + bin_PROGRAMS += komodod endif if BUILD_BITCOIN_UTILS - bin_PROGRAMS += zcash-cli bitcoin-tx + bin_PROGRAMS += komodo-cli bitcoin-tx endif # TODO: rename to libzcash @@ -335,15 +335,15 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # # bitcoind binary # -zcashd_SOURCES = bitcoind.cpp -zcashd_CPPFLAGS = $(BITCOIN_INCLUDES) -zcashd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +komodod_SOURCES = bitcoind.cpp +komodod_CPPFLAGS = $(BITCOIN_INCLUDES) +komodod_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -zcashd_SOURCES += bitcoind-res.rc +komodod_SOURCES += bitcoind-res.rc endif -zcashd_LDADD = \ +komodod_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UNIVALUE) \ @@ -355,10 +355,10 @@ zcashd_LDADD = \ $(LIBSECP256K1) if ENABLE_WALLET -zcashd_LDADD += libbitcoin_wallet.a +komodod_LDADD += libbitcoin_wallet.a endif -zcashd_LDADD += \ +komodod_LDADD += \ $(BOOST_LIBS) \ $(BDB_LIBS) \ $(SSL_LIBS) \ @@ -370,15 +370,15 @@ zcashd_LDADD += \ # # bitcoin-cli binary # -zcash_cli_SOURCES = bitcoin-cli.cpp -zcash_cli_CPPFLAGS = $(BITCOIN_INCLUDES) -zcash_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +komodo_cli_SOURCES = bitcoin-cli.cpp +komodo_cli_CPPFLAGS = $(BITCOIN_INCLUDES) +komodo_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -zcash_cli_SOURCES += bitcoin-cli-res.rc +komodo_cli_SOURCES += bitcoin-cli-res.rc endif -zcash_cli_LDADD = \ +komodo_cli_LDADD = \ $(LIBBITCOIN_CLI) \ $(LIBBITCOIN_UTIL) \ $(BOOST_LIBS) \ diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include index bd6bae83d..01e57e772 100644 --- a/src/Makefile.gtest.include +++ b/src/Makefile.gtest.include @@ -1,8 +1,8 @@ -TESTS += zcash-gtest -bin_PROGRAMS += zcash-gtest +TESTS += komodo-gtest +bin_PROGRAMS += komodo-gtest # tool for generating our public parameters -zcash_gtest_SOURCES = \ +komodo_gtest_SOURCES = \ gtest/main.cpp \ gtest/json_test_vectors.cpp \ gtest/test_jsonspirit.cpp \ @@ -22,17 +22,17 @@ zcash_gtest_SOURCES = \ gtest/test_proofs.cpp \ wallet/gtest/test_wallet.cpp -zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC +komodo_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC -zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +komodo_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) if ENABLE_WALLET -zcash_gtest_LDADD += $(LIBBITCOIN_WALLET) +komodo_gtest_LDADD += $(LIBBITCOIN_WALLET) endif -zcash_gtest_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBZCASH) $(LIBZCASH_LIBS) +komodo_gtest_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBZCASH) $(LIBZCASH_LIBS) -zcash_gtest_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static +komodo_gtest_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static -zcash-gtest_check: zcash-gtest FORCE - ./zcash-gtest +komodo-gtest_check: komodo-gtest FORCE + ./komodo-gtest diff --git a/src/bitcoin-cli-res.rc b/src/bitcoin-cli-res.rc index d365e0b49..3e46f5a16 100644 --- a/src/bitcoin-cli-res.rc +++ b/src/bitcoin-cli-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Zcash" - VALUE "FileDescription", "zcash-cli (JSON-RPC client for Zcash)" + VALUE "CompanyName", "Komodo" + VALUE "FileDescription", "komodo-cli (JSON-RPC client for Komodo)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "zcash-cli" + VALUE "InternalName", "komodo-cli" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "zcash-cli.exe" - VALUE "ProductName", "zcash-cli" + VALUE "OriginalFilename", "komodo-cli.exe" + VALUE "ProductName", "komodo-cli" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 4954a44a2..7f213596e 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -20,7 +20,7 @@ std::string HelpMessageCli() string strUsage; strUsage += HelpMessageGroup(_("Options:")); strUsage += HelpMessageOpt("-?", _("This help message")); - strUsage += HelpMessageOpt("-conf=", strprintf(_("Specify configuration file (default: %s)"), "zcash.conf")); + strUsage += HelpMessageOpt("-conf=", strprintf(_("Specify configuration file (default: %s)"), "komodo.conf")); strUsage += HelpMessageOpt("-datadir=", _("Specify data directory")); strUsage += HelpMessageOpt("-testnet", _("Use the test network")); strUsage += HelpMessageOpt("-regtest", _("Enter regression test mode, which uses a special chain in which blocks can be " @@ -63,12 +63,12 @@ static bool AppInitRPC(int argc, char* argv[]) // ParseParameters(argc, argv); if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) { - std::string strUsage = _("Zcash RPC client version") + " " + FormatFullVersion() + "\n"; + std::string strUsage = _("Komodo RPC client version") + " " + FormatFullVersion() + "\n"; if (!mapArgs.count("-version")) { strUsage += "\n" + _("Usage:") + "\n" + - " zcash-cli [options] [params] " + _("Send command to Zcash") + "\n" + - " zcash-cli [options] help " + _("List commands") + "\n" + - " zcash-cli [options] help " + _("Get help for a command") + "\n"; + " komodo-cli [options] [params] " + _("Send command to Komodo") + "\n" + + " komodo-cli [options] help " + _("List commands") + "\n" + + " komodo-cli [options] help " + _("Get help for a command") + "\n"; strUsage += "\n" + HelpMessageCli(); } diff --git a/src/bitcoind-res.rc b/src/bitcoind-res.rc index eeb6fde52..246ba98ac 100644 --- a/src/bitcoind-res.rc +++ b/src/bitcoind-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Zcash" - VALUE "FileDescription", "zcashd (Zcash node with a JSON-RPC server)" + VALUE "CompanyName", "Komodo" + VALUE "FileDescription", "komodod (Komodo node with a JSON-RPC server)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "zcashd" + VALUE "InternalName", "komodod" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "zcashd.exe" - VALUE "ProductName", "zcashd" + VALUE "OriginalFilename", "komodod.exe" + VALUE "ProductName", "komodod" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 2ec14ccc6..c616046dc 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -63,13 +63,13 @@ bool AppInit(int argc, char* argv[]) // // Parameters // - // If Qt is used, parameters/zcash.conf are parsed in qt/bitcoin.cpp's main() + // If Qt is used, parameters/komodo.conf are parsed in qt/bitcoin.cpp's main() ParseParameters(argc, argv); // Process help and version before taking care about datadir if (mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) { - std::string strUsage = _("Zcash Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n"; + std::string strUsage = _("Komodo Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n"; if (mapArgs.count("-version")) { @@ -78,7 +78,7 @@ bool AppInit(int argc, char* argv[]) else { strUsage += "\n" + _("Usage:") + "\n" + - " zcashd [options] " + _("Start Zcash Daemon") + "\n"; + " komodod [options] " + _("Start Komodo Daemon") + "\n"; strUsage += "\n" + HelpMessage(HMM_BITCOIND); } @@ -110,19 +110,19 @@ bool AppInit(int argc, char* argv[]) // Command-line RPC bool fCommandLine = false; for (int i = 1; i < argc; i++) - if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "zcash:")) + if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "komodo:")) fCommandLine = true; if (fCommandLine) { - fprintf(stderr, "Error: There is no RPC client functionality in zcashd. Use the zcash-cli utility instead.\n"); + fprintf(stderr, "Error: There is no RPC client functionality in komodod. Use the komodo-cli utility instead.\n"); exit(1); } #ifndef WIN32 fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { - fprintf(stdout, "Zcash server starting\n"); + fprintf(stdout, "Komodo server starting\n"); // Daemonize pid_t pid = fork(); diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 867f291ea..a4309d6d9 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -168,7 +168,7 @@ public: vFixedSeeds.clear(); vSeeds.clear(); - //vSeeds.push_back(CDNSSeedData("z.cash", "dns.testnet.z.cash")); // Zcash + //vSeeds.push_back(CDNSSeedData("z.cash", "dns.testnet.z.cash")); // Komodo base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,0); base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,5); diff --git a/src/init.cpp b/src/init.cpp index a25179612..c169d10c4 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -280,7 +280,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-blocknotify=", _("Execute command when the best block changes (%s in cmd is replaced by block hash)")); strUsage += HelpMessageOpt("-checkblocks=", strprintf(_("How many blocks to check at startup (default: %u, 0 = all)"), 288)); strUsage += HelpMessageOpt("-checklevel=", strprintf(_("How thorough the block verification of -checkblocks is (0-4, default: %u)"), 3)); - strUsage += HelpMessageOpt("-conf=", strprintf(_("Specify configuration file (default: %s)"), "zcash.conf")); + strUsage += HelpMessageOpt("-conf=", strprintf(_("Specify configuration file (default: %s)"), "komodo.conf")); if (mode == HMM_BITCOIND) { #if !defined(WIN32) @@ -294,7 +294,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-par=", strprintf(_("Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)"), -(int)boost::thread::hardware_concurrency(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS)); #ifndef WIN32 - strUsage += HelpMessageOpt("-pid=", strprintf(_("Specify pid file (default: %s)"), "zcashd.pid")); + strUsage += HelpMessageOpt("-pid=", strprintf(_("Specify pid file (default: %s)"), "komodod.pid")); #endif strUsage += HelpMessageOpt("-prune=", strprintf(_("Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. " "Warning: Reverting this setting requires re-downloading the entire blockchain. " diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 1c05acf02..fbf5e92c1 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -559,7 +559,7 @@ int main(int argc, char *argv[]) // User language is set up: pick a data directory Intro::pickDataDirectory(); - /// 6. Determine availability of data directory and parse zcash.conf + /// 6. Determine availability of data directory and parse komodo.conf /// - Do not call GetDataDir(true) before this step finishes if (!boost::filesystem::is_directory(GetDataDir(false))) { diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index c4445c41e..c9d0b7b60 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -191,7 +191,7 @@ void Intro::pickDataDirectory() settings.setValue("strDataDir", dataDir); } /* Only override -datadir if different from the default, to make it possible to - * override -datadir in the zcash.conf file in the default data directory + * override -datadir in the komodo.conf file in the default data directory * (to be consistent with bitcoind behavior) */ if(dataDir != getDefaultDataDirectory()) diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index fb6b0a565..68a84a6c4 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -102,7 +102,7 @@ Value getgenerate(const Array& params, bool fHelp) throw runtime_error( "getgenerate\n" "\nReturn if the server is set to generate coins or not. The default is false.\n" - "It is set with the command line argument -gen (or zcash.conf setting gen)\n" + "It is set with the command line argument -gen (or komodo.conf setting gen)\n" "It can also be set with the setgenerate call.\n" "\nResult\n" "true|false (boolean) If the server is set to generate coins or not\n" diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 28aa3bc62..6e94b3a60 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -257,10 +257,10 @@ Value stop(const Array& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "stop\n" - "\nStop Zcash server."); + "\nStop Komodo server."); // Shutdown will take long enough that the response should get back StartShutdown(); - return "Zcash server stopping"; + return "Komodo server stopping"; } diff --git a/src/util.cpp b/src/util.cpp index 0b3153175..37da7ca01 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -381,7 +381,7 @@ static std::string FormatException(const std::exception* pex, const char* pszThr char pszModule[MAX_PATH] = ""; GetModuleFileNameA(NULL, pszModule, sizeof(pszModule)); #else - const char* pszModule = "Zcash"; + const char* pszModule = "Komodo"; #endif if (pex) return strprintf( @@ -408,7 +408,7 @@ boost::filesystem::path GetDefaultDataDir() // Unix: ~/.zcash #ifdef WIN32 // Windows - return GetSpecialFolderPath(CSIDL_APPDATA) / "Zcash"; + return GetSpecialFolderPath(CSIDL_APPDATA) / "Komodo"; #else fs::path pathRet; char* pszHome = getenv("HOME"); @@ -420,10 +420,10 @@ boost::filesystem::path GetDefaultDataDir() // Mac pathRet /= "Library/Application Support"; TryCreateDirectory(pathRet); - return pathRet / "Zcash"; + return pathRet / "Komodo"; #else // Unix - return pathRet / ".zcash"; + return pathRet / ".komodo"; #endif #endif } @@ -521,7 +521,7 @@ void ClearDatadirCache() boost::filesystem::path GetConfigFile() { - boost::filesystem::path pathConfigFile(GetArg("-conf", "zcash.conf")); + boost::filesystem::path pathConfigFile(GetArg("-conf", "komodo.conf")); if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile; @@ -533,14 +533,14 @@ void ReadConfigFile(map& mapSettingsRet, { boost::filesystem::ifstream streamConfig(GetConfigFile()); if (!streamConfig.good()) - return; // No zcash.conf file is OK + return; // No komodo.conf file is OK set setOptions; setOptions.insert("*"); for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it) { - // Don't overwrite existing settings so command line settings override zcash.conf + // Don't overwrite existing settings so command line settings override komodo.conf string strKey = string("-") + it->string_key; if (mapSettingsRet.count(strKey) == 0) { @@ -557,7 +557,7 @@ void ReadConfigFile(map& mapSettingsRet, #ifndef WIN32 boost::filesystem::path GetPidFile() { - boost::filesystem::path pathPidFile(GetArg("-pid", "zcashd.pid")); + boost::filesystem::path pathPidFile(GetArg("-pid", "komodod.pid")); if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile; return pathPidFile; }