diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index be54bc1dd..40dca0039 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -4,14 +4,14 @@ TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} SRCDIR=${SRCDIR:-$TOPDIR/src} MANDIR=${MANDIR:-$TOPDIR/doc/man} -ZCASHD=${ZCASHD:-$SRCDIR/zcashd} -ZCASHCLI=${ZCASHCLI:-$SRCDIR/zcash-cli} -ZCASHTX=${ZCASHTX:-$SRCDIR/zcash-tx} +HUSHD=${HUSHD:-$SRCDIR/hushd} +HUSHCLI=${HUSHCLI:-$SRCDIR/hush-cli} +HUSHTX=${HUSHTX:-$SRCDIR/hush-tx} -[ ! -x $ZCASHD ] && echo "$ZCASHD not found or not executable." && exit 1 +[ ! -x $HUSHD ] && echo "$HUSHD not found or not executable." && exit 1 # The autodetected version git tag can screw up manpage output a little bit -ZECVERSTR=$($ZCASHCLI --version | head -n1 | awk '{ print $NF }') +ZECVERSTR=$($HUSHCLI --version | head -n1 | awk '{ print $NF }') ZECVER=$(echo $ZECVERSTR | awk -F- '{ OFS="-"; NF--; print $0; }') ZECCOMMIT=$(echo $ZECVERSTR | awk -F- '{ print $NF }') @@ -19,9 +19,9 @@ ZECCOMMIT=$(echo $ZECVERSTR | awk -F- '{ print $NF }') # This gets autodetected fine for zcashd if --version-string is not set, # but has different outcomes for zcash-cli. echo "[COPYRIGHT]" > footer.h2m -$ZCASHD --version | sed -n '1!p' >> footer.h2m +$HUSHD --version | sed -n '1!p' >> footer.h2m -for cmd in $ZCASHD $ZCASHCLI $ZCASHTX; do +for cmd in $HUSHD $HUSHCLI $HUSHTX; do cmdname="${cmd##*/}" help2man -N --version-string=$ZECVER --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} sed -i "s/\\\-$ZECCOMMIT//g" ${MANDIR}/${cmdname}.1 diff --git a/src/bitcoin-cli-res.rc b/src/bitcoin-cli-res.rc index d365e0b49..1952f00e3 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", "Hush" + VALUE "FileDescription", "hush-cli (JSON-RPC client for hush)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "zcash-cli" + VALUE "InternalName", "hush-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", "hush-cli.exe" + VALUE "ProductName", "hush-cli" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 2a4764d9e..5bb9b7e59 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -28,7 +28,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)"), "hush.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 " @@ -69,10 +69,10 @@ 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" + PrivacyInfo(); + std::string strUsage = _("Hush RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (!mapArgs.count("-version")) { strUsage += "\n" + _("Usage:") + "\n" + - " hush-cli [options] [params] " + _("Send command to Zcash") + "\n" + + " hush-cli [options] [params] " + _("Send command to Hush") + "\n" + " hush-cli [options] help " + _("List commands") + "\n" + " hush-cli [options] help " + _("Get help for a command") + "\n"; diff --git a/src/bitcoin-tx-res.rc b/src/bitcoin-tx-res.rc index bc8d57134..d9cd852db 100644 --- a/src/bitcoin-tx-res.rc +++ b/src/bitcoin-tx-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Zcash" - VALUE "FileDescription", "zcash-tx (CLI Zcash transaction editor utility)" + VALUE "CompanyName", "Hush" + VALUE "FileDescription", "hush-tx (CLI Hush transaction editor utility)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "zcash-tx" + VALUE "InternalName", "hush-tx" 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-tx.exe" - VALUE "ProductName", "zcash-tx" + VALUE "OriginalFilename", "hush-tx.exe" + VALUE "ProductName", "hush-tx" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 0ba7e9a43..f1edd0dd3 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -44,10 +44,10 @@ static bool AppInitRawTx(int argc, char* argv[]) if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help")) { // First part of help message is specific to this utility - std::string strUsage = _("Zcash zcash-tx utility version") + " " + FormatFullVersion() + "\n\n" + + std::string strUsage = _("Hush hush-tx utility version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " zcash-tx [options] [commands] " + _("Update hex-encoded zcash transaction") + "\n" + - " zcash-tx [options] -create [commands] " + _("Create hex-encoded zcash transaction") + "\n" + + " hush-tx [options] [commands] " + _("Update hex-encoded zcash transaction") + "\n" + + " hush-tx [options] -create [commands] " + _("Create hex-encoded zcash transaction") + "\n" + "\n"; fprintf(stdout, "%s", strUsage.c_str()); diff --git a/src/clientversion.h b/src/clientversion.h index 3bd8540c3..afc88e8be 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -1,5 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin Core developers // Copyright (c) 2016-2017 The Zcash developers +// Copyright (c) 2017 The Hush developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -39,7 +40,7 @@ #define DO_STRINGIZE(X) #X //! Copyright string used in Windows .rc files -#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers and The Zcash developers" +#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers and The Zcash developers and The Hush developers" /** * bitcoind-res.rc includes this file, but it cannot cope with real c++ code. diff --git a/src/deprecation.cpp b/src/deprecation.cpp index 7f5749319..5e355c61d 100644 --- a/src/deprecation.cpp +++ b/src/deprecation.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2017 The Zcash developers +// Copyright (c) 2017 The Hush developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -24,7 +25,7 @@ void EnforceNodeDeprecation(int nHeight, bool forceLogging) { if (blocksToDeprecation == 0 || forceLogging) { auto msg = strprintf(_("This version has been deprecated as of block height %d."), DEPRECATION_HEIGHT) + " " + - _("You should upgrade to the latest version of Zcash."); + _("You should upgrade to the latest version of Hush."); if (!disableDeprecation) { msg += " " + strprintf(_("To disable deprecation for this version, set %s%s."), "-disabledeprecation=", CLIENT_VERSION_STR); @@ -41,15 +42,15 @@ void EnforceNodeDeprecation(int nHeight, bool forceLogging) { if (disableDeprecation) { msg = strprintf(_("This version will be deprecated at block height %d."), DEPRECATION_HEIGHT) + " " + - _("You should upgrade to the latest version of Zcash."); + _("You should upgrade to the latest version of Hush."); } else { msg = strprintf(_("This version will be deprecated at block height %d, and will automatically shut down."), DEPRECATION_HEIGHT) + " " + - _("You should upgrade to the latest version of Zcash.") + " " + + _("You should upgrade to the latest version of Hush.") + " " + strprintf(_("To disable deprecation for this version, set %s%s."), "-disabledeprecation=", CLIENT_VERSION_STR); } LogPrintf("*** %s\n", msg); uiInterface.ThreadSafeMessageBox(msg, "", CClientUIInterface::MSG_WARNING); } -} \ No newline at end of file +} diff --git a/src/init.cpp b/src/init.cpp index e701536cf..1bc88ac53 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin Core developers +// Copyright (c) 2017 The Hush developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -682,7 +683,7 @@ static void ZC_LoadParams() if (!(boost::filesystem::exists(pk_path) && boost::filesystem::exists(vk_path))) { uiInterface.ThreadSafeMessageBox(strprintf( - _("Cannot find the Zcash network parameters in the following directory:\n" + _("Cannot find the Hush network parameters in the following directory:\n" "%s\n" "Please run 'zcash-fetch-params' or './zcutil/fetch-params.sh' and then restart."), ZC_GetParamsDir()), @@ -802,7 +803,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) fLogIPs = GetBoolArg("-logips", false); LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - LogPrintf("Zcash version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); + LogPrintf("Hush version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); // when specifying an explicit binding address, you want to listen on it // even when -connect or -proxy is specified @@ -1047,7 +1048,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) // Sanity check if (!InitSanityCheck()) - return InitError(_("Initialization sanity check failed. Zcash is shutting down.")); + return InitError(_("Initialization sanity check failed. Hush is shutting down.")); std::string strDataDir = GetDataDir().string(); #ifdef ENABLE_WALLET @@ -1063,9 +1064,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) try { static boost::interprocess::file_lock lock(pathLockFile.string().c_str()); if (!lock.try_lock()) - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Zcash is probably already running."), strDataDir)); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Hush is probably already running."), strDataDir)); } catch(const boost::interprocess::interprocess_exception& e) { - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Zcash is probably already running.") + " %s.", strDataDir, e.what())); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Hush is probably already running.") + " %s.", strDataDir, e.what())); } #ifndef WIN32 @@ -1586,10 +1587,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) #ifdef ENABLE_MINING #ifndef ENABLE_WALLET if (GetBoolArg("-minetolocalwallet", false)) { - return InitError(_("Zcash was not built with wallet support. Set -minetolocalwallet=0 to use -mineraddress, or rebuild Zcash with wallet support.")); + return InitError(_("Hush was not built with wallet support. Set -minetolocalwallet=0 to use -mineraddress, or rebuild Hush with wallet support.")); } if (GetArg("-mineraddress", "").empty() && GetBoolArg("-gen", false)) { - return InitError(_("Zcash was not built with wallet support. Set -mineraddress, or rebuild Zcash with wallet support.")); + return InitError(_("Hush was not built with wallet support. Set -mineraddress, or rebuild Hush with wallet support.")); } #endif // !ENABLE_WALLET diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index b63d223bb..194ffdb1e 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -245,10 +245,10 @@ UniValue stop(const UniValue& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "stop\n" - "\nStop Zcash server."); + "\nStop Hush server."); // Shutdown will take long enough that the response should get back StartShutdown(); - return "Zcash server stopping"; + return "Hush server stopping"; } /** diff --git a/src/timedata.cpp b/src/timedata.cpp index 1dcef2de3..9605cf588 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2014 The Bitcoin Core developers +// Copyright (c) 2017 The Hush developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -57,7 +58,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample) vTimeOffsets.input(nOffsetSample); LogPrintf("Added time data, samples %d, offset %+d (%+d minutes)\n", vTimeOffsets.size(), nOffsetSample, nOffsetSample/60); - // There is a known issue here (see issue #4521): + // There is a known issue here (see zcash issue #4521): // // - The structure vTimeOffsets contains up to 200 elements, after which // any new element added to it will not increase its size, replacing the @@ -99,7 +100,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample) if (!fMatch) { fDone = true; - string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Zcash will not work properly."); + string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Hush will not work properly."); strMiscWarning = strMessage; LogPrintf("*** %s\n", strMessage); uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING);