DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

komodo strings

Browse Source
This commit is contained in:
jl777
2016-09-13 13:03:02 -03:00
parent 202856091f
commit 5166804f02
13 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Makefile.am
View File

@@ -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) \

20
src/Makefile.gtest.include
View File

@@ -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

10
src/bitcoin-cli-res.rc
View File

@@ -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

10
src/bitcoin-cli.cpp
View File

@@ -20,7 +20,7 @@ std::string HelpMessageCli()
string strUsage;
strUsage += HelpMessageGroup(_("Options:"));
strUsage += HelpMessageOpt("-?", _("This help message"));
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "zcash.conf"));
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "komodo.conf"));
strUsage += HelpMessageOpt("-datadir=<dir>", _("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] <command> [params] " + _("Send command to Zcash") + "\n" +
" zcash-cli [options] help " + _("List commands") + "\n" +
" zcash-cli [options] help <command> " + _("Get help for a command") + "\n";
" komodo-cli [options] <command> [params] " + _("Send command to Komodo") + "\n" +
" komodo-cli [options] help " + _("List commands") + "\n" +
" komodo-cli [options] help <command> " + _("Get help for a command") + "\n";
strUsage += "\n" + HelpMessageCli();
}

10
src/bitcoind-res.rc
View File

@@ -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

12
src/bitcoind.cpp
View File

@@ -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();

2
src/chainparams.cpp
View File

@@ -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<unsigned char>(1,0);
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5);

4
src/init.cpp
View File

@@ -280,7 +280,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-blocknotify=<cmd>", _("Execute command when the best block changes (%s in cmd is replaced by block hash)"));
strUsage += HelpMessageOpt("-checkblocks=<n>", strprintf(_("How many blocks to check at startup (default: %u, 0 = all)"), 288));
strUsage += HelpMessageOpt("-checklevel=<n>", strprintf(_("How thorough the block verification of -checkblocks is (0-4, default: %u)"), 3));
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "zcash.conf"));
strUsage += HelpMessageOpt("-conf=<file>", 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=<n>", 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=<file>", strprintf(_("Specify pid file (default: %s)"), "zcashd.pid"));
strUsage += HelpMessageOpt("-pid=<file>", strprintf(_("Specify pid file (default: %s)"), "komodod.pid"));
#endif
strUsage += HelpMessageOpt("-prune=<n>", 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. "

2
src/qt/bitcoin.cpp
View File

@@ -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)))
{

2
src/qt/intro.cpp
View File

@@ -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())

2
src/rpcmining.cpp
View File

@@ -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"

4
src/rpcserver.cpp
View File

@@ -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";
}

16
src/util.cpp
View File

@@ -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<string, string>& mapSettingsRet,
{
boost::filesystem::ifstream streamConfig(GetConfigFile());
if (!streamConfig.good())
return; // No zcash.conf file is OK
return; // No komodo.conf file is OK
set<string> 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<string, string>& 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;
}