From 1f707de9bf56fb2f7f0d0cfca1a1193ad9bbd3e3 Mon Sep 17 00:00:00 2001 From: bitcoinz Date: Tue, 26 Sep 2017 23:13:41 -0700 Subject: [PATCH] Update ticker to BTCZ + rebranding --- README.md | 6 +- configure.ac | 4 +- .../examples/{zcash.conf => bitcoinz.conf} | 0 contrib/gitian-descriptors/gitian-linux.yml | 2 +- qa/zcash/performance-measurements.sh | 6 +- src/amount.cpp | 2 +- src/bitcoin-cli.cpp | 4 +- src/bitcoin-tx.cpp | 6 +- src/bitcoind.cpp | 12 +- src/chainparams.cpp | 6 +- src/clientversion.h | 6 +- src/deprecation.cpp | 6 +- src/init.cpp | 16 +- src/main.cpp | 4 +- src/metrics.cpp | 2 +- src/rpcmining.cpp | 6 +- src/rpcserver.cpp | 4 +- src/sendalert.cpp | 2 +- src/test/data/tx_invalid.json | 6 +- src/timedata.cpp | 2 +- src/util.cpp | 3 +- src/util.h | 2 +- src/wallet/rpcdump.cpp | 8 +- src/wallet/rpcwallet.cpp | 74 +++++----- zcutil/build-mac.sh | 92 ------------ zcutil/build-win.sh | 47 ------ zcutil/init-mac.sh | 139 ------------------ 27 files changed, 95 insertions(+), 372 deletions(-) rename contrib/debian/examples/{zcash.conf => bitcoinz.conf} (100%) delete mode 100755 zcutil/build-mac.sh delete mode 100755 zcutil/build-win.sh delete mode 100755 zcutil/init-mac.sh diff --git a/README.md b/README.md index 29f5147a4..18ef6503e 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -![BTZ](https://raw.githubusercontent.com/wiki/bitcoinz-pod/bitcoinz/BitcoinZ.png) +![BTCZ](https://raw.githubusercontent.com/wiki/bitcoinz-pod/bitcoinz/BitcoinZ.png) # BitcoinZ - Your Financial Freedom Community gift to the World. - Type: Cryptocurrency -- Ticker: BTZ +- Ticker: BTCZ - Algo: Equihash - Max supply 21B coins / Current supply: 12500 coins every 2.5 minutes -- Current block size is similar to BCC/BCH (BTZ = 2MB every 2.5 mins ~ BCC/BCH = 8MB every 10 min) +- Current block size is similar to BCC/BCH (BTCZ = 2MB every 2.5 mins ~ BCC/BCH = 8MB every 10 min) - Technology / Mother coins: ZCL spirit, ZEC privacy, BTC fundamentals ## BitcoinZ Principles: diff --git a/configure.ac b/configure.ac index 4802aa03a..cfaeddc8e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) -define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 11) +define(_CLIENT_VERSION_MINOR, 1) +define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 50) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) diff --git a/contrib/debian/examples/zcash.conf b/contrib/debian/examples/bitcoinz.conf similarity index 100% rename from contrib/debian/examples/zcash.conf rename to contrib/debian/examples/bitcoinz.conf diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 892de5287..86d70c48c 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.11" +name: "bitcoinz-1.1.0" enable_cache: true distro: "debian" suites: diff --git a/qa/zcash/performance-measurements.sh b/qa/zcash/performance-measurements.sh index 08d2ab9a5..0b33958aa 100755 --- a/qa/zcash/performance-measurements.sh +++ b/qa/zcash/performance-measurements.sh @@ -72,7 +72,7 @@ function zcashd_start { *) rm -rf "$DATADIR" mkdir -p "$DATADIR/regtest" - touch "$DATADIR/zcash.conf" + touch "$DATADIR/bitcoinz.conf" esac ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & ZCASHD_PID=$! @@ -102,7 +102,7 @@ function zcashd_massif_start { *) rm -rf "$DATADIR" mkdir -p "$DATADIR/regtest" - touch "$DATADIR/zcash.conf" + touch "$DATADIR/bitcoinz.conf" esac rm -f massif.out valgrind --tool=massif --time-unit=ms --massif-out-file=massif.out ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & @@ -119,7 +119,7 @@ function zcashd_massif_stop { function zcashd_valgrind_start { rm -rf "$DATADIR" mkdir -p "$DATADIR/regtest" - touch "$DATADIR/zcash.conf" + touch "$DATADIR/bitcoinz.conf" rm -f valgrind.out valgrind --leak-check=yes -v --error-limit=no --log-file="valgrind.out" ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & ZCASHD_PID=$! diff --git a/src/amount.cpp b/src/amount.cpp index 25ba2855b..e9e8c3b5d 100644 --- a/src/amount.cpp +++ b/src/amount.cpp @@ -7,7 +7,7 @@ #include "tinyformat.h" -const std::string CURRENCY_UNIT = "BTZ"; +const std::string CURRENCY_UNIT = "BTCZ"; CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nSize) { diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 92d6b023b..984950dd6 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -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 = _("BitcoinZ RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (!mapArgs.count("-version")) { strUsage += "\n" + _("Usage:") + "\n" + - " zcash-cli [options] [params] " + _("Send command to Zcash") + "\n" + + " zcash-cli [options] [params] " + _("Send command to BitcoinZ") + "\n" + " zcash-cli [options] help " + _("List commands") + "\n" + " zcash-cli [options] help " + _("Get help for a command") + "\n"; diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index c6c7c93ed..1d9446e43 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 = _("BitcoinZ zcash-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" + + " zcash-tx [options] [commands] " + _("Update hex-encoded BitcoinZ transaction") + "\n" + + " zcash-tx [options] -create [commands] " + _("Create hex-encoded BitcoinZ transaction") + "\n" + "\n"; fprintf(stdout, "%s", strUsage.c_str()); diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 6feee7e90..a6f1e64e0 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -73,7 +73,7 @@ bool AppInit(int argc, char* 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" + PrivacyInfo(); + std::string strUsage = _("BitcoinZ Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (mapArgs.count("-version")) { @@ -82,7 +82,7 @@ bool AppInit(int argc, char* argv[]) else { strUsage += "\n" + _("Usage:") + "\n" + - " zcashd [options] " + _("Start Zcash Daemon") + "\n"; + " zcashd [options] " + _("Start BitcoinZ Daemon") + "\n"; strUsage += "\n" + HelpMessage(HMM_BITCOIND); } @@ -112,12 +112,12 @@ bool AppInit(int argc, char* argv[]) "\n" "You can look at the example configuration file for suggestions of default\n" "options that you may want to change. It should be in one of these locations,\n" - "depending on how you installed Zcash:\n") + + "depending on how you installed BitcoinZ:\n") + _("- Source code: %s\n" "- .deb package: %s\n")).c_str(), GetConfigFile().string().c_str(), - "contrib/debian/examples/zcash.conf", - "/usr/share/doc/zcash/examples/zcash.conf"); + "contrib/debian/examples/bitcoinz.conf", + "/usr/share/doc/zcash/examples/bitcoinz.conf"); return false; } catch (const std::exception& e) { fprintf(stderr,"Error reading configuration file: %s\n", e.what()); @@ -144,7 +144,7 @@ bool AppInit(int argc, char* argv[]) fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { - fprintf(stdout, "Zcash server starting\n"); + fprintf(stdout, "BitcoinZ server starting\n"); // Daemonize pid_t pid = fork(); diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 17f88dea1..3339d5ee8 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -38,7 +38,7 @@ class CMainParams : public CChainParams { public: CMainParams() { strNetworkID = "main"; - strCurrencyUnits = "BTZ"; + strCurrencyUnits = "BTCZ"; consensus.fCoinbaseMustBeProtected = true; consensus.nSubsidySlowStartInterval = 2; consensus.nSubsidyHalvingInterval = 840000; @@ -100,7 +100,7 @@ class CMainParams : public CChainParams { vFixedSeeds.clear(); vSeeds.clear(); // use name as: echo -n hostname | sha256sum - vSeeds.push_back(CDNSSeedData("4437c91da6e4c4edca56b57bd52c2e11a3fd7d8b04bd9dec9584fb5220f54b05.btz", "btzseed.blockhub.info")); + vSeeds.push_back(CDNSSeedData("4437c91da6e4c4edca56b57bd52c2e11a3fd7d8b04bd9dec9584fb5220f54b05.BTCZ", "btzseed.blockhub.info")); // guarantees the first 2 characters, when base58 encoded, are "t1" base58Prefixes[PUBKEY_ADDRESS] = {0x1C,0xB8}; @@ -143,7 +143,7 @@ class CMainParams : public CChainParams { ( 2008, uint256S("0x000001877891c7c11f77acf00d35f10b24bac5a7e1f5526ff9adc6c660e233ff")) ( 2011, uint256S("0x00000189d75d3f0a0f2d4bb8d5235b38b28ebafb3f3aca9770a656ed61ec24cc")) ( 2016, uint256S("0x000000dba6dde8505b0dde0e8be0f3f731e3686087dc43f30b2baf2f904ebeac")) - ( 4121, uint256S("0x0000005f730aad045c803d6a6732994ed1b7536f47d542c3a07944b90011ad18")), + ( 10000, uint256S("0x00000002ccb858ec2c35fb79ce2079333461efa50f2b59814558b9ae3ce62a40")), 1505597832, 6821, 953 diff --git a/src/clientversion.h b/src/clientversion.h index 61813106f..0df647d32 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -16,8 +16,8 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 1 -#define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 11 +#define CLIENT_VERSION_MINOR 1 +#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build @@ -39,7 +39,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 BitcoinZ 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..a8275846d 100644 --- a/src/deprecation.cpp +++ b/src/deprecation.cpp @@ -24,7 +24,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 BitcoinZ."); if (!disableDeprecation) { msg += " " + strprintf(_("To disable deprecation for this version, set %s%s."), "-disabledeprecation=", CLIENT_VERSION_STR); @@ -41,11 +41,11 @@ 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 BitcoinZ."); } 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 BitcoinZ.") + " " + strprintf(_("To disable deprecation for this version, set %s%s."), "-disabledeprecation=", CLIENT_VERSION_STR); } diff --git a/src/init.cpp b/src/init.cpp index ccc6eb3ea..cfa38e5fc 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -338,7 +338,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)"), "bitcoinz.conf")); if (mode == HMM_BITCOIND) { #if !defined(WIN32) @@ -679,7 +679,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 BitcoinZ network parameters in the following directory:\n" "%s\n" "Please run 'zcash-fetch-params' or './zcutil/fetch-params.sh' and then restart."), ZC_GetParamsDir()), @@ -799,7 +799,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("BitcoinZ 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 @@ -1050,7 +1050,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. BitcoinZ is shutting down.")); std::string strDataDir = GetDataDir().string(); #ifdef ENABLE_WALLET @@ -1066,9 +1066,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. BitcoinZ 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. BitcoinZ is probably already running.") + " %s.", strDataDir, e.what())); } #ifndef WIN32 @@ -1589,10 +1589,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(_("BitcoinZ was not built with wallet support. Set -minetolocalwallet=0 to use -mineraddress, or rebuild BitcoinZ 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(_("BitcoinZ was not built with wallet support. Set -mineraddress, or rebuild BitcoinZ with wallet support.")); } #endif // !ENABLE_WALLET diff --git a/src/main.cpp b/src/main.cpp index 121654a06..93f6426e2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,7 +41,7 @@ using namespace std; #if defined(NDEBUG) -# error "Zcash cannot be compiled without assertions." +# error "BitcoinZ cannot be compiled without assertions." #endif /** @@ -94,7 +94,7 @@ static void CheckBlockIndex(); /** Constant stuff for coinbase transactions we create: */ CScript COINBASE_FLAGS; -const string strMessageMagic = "Zcash Signed Message:\n"; +const string strMessageMagic = "BitcoinZ Signed Message:\n"; // Internal stuff namespace { diff --git a/src/metrics.cpp b/src/metrics.cpp index 0b3508a09..61e2b8182 100644 --- a/src/metrics.cpp +++ b/src/metrics.cpp @@ -265,7 +265,7 @@ int printMiningStatus(bool mining) lines++; } else { std::cout << _("You are currently not mining.") << std::endl; - std::cout << _("To enable mining, add 'gen=1' to your zcash.conf and restart.") << std::endl; + std::cout << _("To enable mining, add 'gen=1' to your bitcoinz.conf and restart.") << std::endl; lines += 2; } std::cout << std::endl; diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 83ba5715d..7132446bd 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -144,7 +144,7 @@ UniValue getgenerate(const UniValue& 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 bitcoinz.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" @@ -553,10 +553,10 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode"); if (vNodes.empty()) - throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Zcash is not connected!"); + throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "BitcoinZ is not connected!"); if (IsInitialBlockDownload()) - throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Zcash is downloading blocks..."); + throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "BitcoinZ is downloading blocks..."); static unsigned int nTransactionsUpdatedLast; diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 9094916ca..499dacb5d 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 BitcoinZ server."); // Shutdown will take long enough that the response should get back StartShutdown(); - return "Zcash server stopping"; + return "BitcoinZ server stopping"; } /** diff --git a/src/sendalert.cpp b/src/sendalert.cpp index 3b7b53734..e52ba6889 100644 --- a/src/sendalert.cpp +++ b/src/sendalert.cpp @@ -88,7 +88,7 @@ void ThreadSendAlert() // 4000 or higher will put the RPC into safe mode alert.nPriority = 4000; alert.strComment = ""; - alert.strStatusBar = "Your client version 1.0.10 has degraded networking behavior. Please update to the most recent version of Zcash (1.0.10-1 or later)."; + alert.strStatusBar = "Your client version 1.0.10 has degraded networking behavior. Please update to the most recent version of BitcoinZ (1.0.10-1 or later)."; alert.strRPCError = alert.strStatusBar; // Set specific client version/versions here. If setSubVer is empty, no filtering on subver is done: diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json index b99a72da9..7c785a5da 100644 --- a/src/test/data/tx_invalid.json +++ b/src/test/data/tx_invalid.json @@ -11,13 +11,13 @@ ["A nearly-standard transaction with CHECKSIGVERIFY 1 instead of CHECKSIG,"], ["but with the signature duplicated in the scriptPubKey with the proper pushdata prefix."], -["Valid in Bitcoin because of FindAndDelete, but invalid for Zcash."], +["Valid in Bitcoin because of FindAndDelete, but invalid for BitcoinZ."], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "DUP HASH160 0x14 0x5b6462475454710f3c22f5fdf0b40704c92f25c3 EQUALVERIFY CHECKSIGVERIFY 1 0x47 0x3044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b924f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e99e883e7a01"]], "01000000010001000000000000000000000000000000000000000000000000000000000000000000006a473044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b924f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e99e883e7a012103ba8c8b86dea131c22ab967e6dd99bdae8eff7a1f75a2c35f1f944109e3fe5e22ffffffff010000000000000000015100000000", "P2SH"], ["Same as above, but with the signature duplicated in the scriptPubKey with"], ["a non-standard pushdata prefix. Invalid in both Bitcoin (FindAndDelete only"], -["removes if it uses the same pushdata prefix as is standard) and Zcash (no"], +["removes if it uses the same pushdata prefix as is standard) and BitcoinZ (no"], ["FindAndDelete)."], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "DUP HASH160 0x14 0x5b6462475454710f3c22f5fdf0b40704c92f25c3 EQUALVERIFY CHECKSIGVERIFY 1 0x4c 0x47 0x3044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b924f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e99e883e7a01"]], "01000000010001000000000000000000000000000000000000000000000000000000000000000000006a473044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b924f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e99e883e7a012103ba8c8b86dea131c22ab967e6dd99bdae8eff7a1f75a2c35f1f944109e3fe5e22ffffffff010000000000000000015100000000", "P2SH"], @@ -29,7 +29,7 @@ ["This is the nearly-standard transaction with CHECKSIGVERIFY 1 instead of CHECKSIG,"], ["but with the signature duplicated in the scriptPubKey with a different hashtype suffix"], ["Invalid in both Bitcoin (FindAndDelete only removes if the signature, including the hash"], -["type, matches) and Zcash (no FindAndDelete)."], +["type, matches) and BitcoinZ (no FindAndDelete)."], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "DUP HASH160 0x14 0x5b6462475454710f3c22f5fdf0b40704c92f25c3 EQUALVERIFY CHECKSIGVERIFY 1 0x47 0x3044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b924f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e99e883e7a81"]], "01000000010001000000000000000000000000000000000000000000000000000000000000000000006a473044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b924f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e99e883e7a012103ba8c8b86dea131c22ab967e6dd99bdae8eff7a1f75a2c35f1f944109e3fe5e22ffffffff010000000000000000015100000000", "P2SH"], diff --git a/src/timedata.cpp b/src/timedata.cpp index 1dcef2de3..202bad25c 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -99,7 +99,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 BitcoinZ will not work properly."); strMiscWarning = strMessage; LogPrintf("*** %s\n", strMessage); uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING); diff --git a/src/util.cpp b/src/util.cpp index 855d642da..0b7200742 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -423,7 +423,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 = "BitcoinZ"; #endif if (pex) return strprintf( @@ -901,6 +901,7 @@ std::string LicenseInfo() FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + FormatParagraph(strprintf(_("Copyright (C) 2015-%i The Zcash Developers"), COPYRIGHT_YEAR)) + "\n" + FormatParagraph(strprintf(_("Copyright (C) 2015-%i zdeveloper.org"), COPYRIGHT_YEAR)) + "\n" + + FormatParagraph(strprintf(_("Copyright (C) 2017-%i BitcoinZ team"), COPYRIGHT_YEAR)) + "\n" + "\n" + FormatParagraph(_("This is experimental software.")) + "\n" + "\n" + diff --git a/src/util.h b/src/util.h index 392ddff9c..0659987d1 100644 --- a/src/util.h +++ b/src/util.h @@ -130,7 +130,7 @@ void CreatePidFile(const boost::filesystem::path &path, pid_t pid); #endif class missing_zcash_conf : public std::runtime_error { public: - missing_zcash_conf() : std::runtime_error("Missing zcash.conf") { } + missing_zcash_conf() : std::runtime_error("Missing bitcoinz.conf") { } }; void ReadConfigFile(std::map& mapSettingsRet, std::map >& mapMultiSettingsRet); #ifdef WIN32 diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 936532837..22ec298a9 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -181,7 +181,7 @@ UniValue importaddress(const UniValue& params, bool fHelp) std::vector data(ParseHex(params[0].get_str())); script = CScript(data.begin(), data.end()); } else { - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address or script"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid BitcoinZ address or script"); } string strLabel = ""; @@ -391,7 +391,7 @@ UniValue dumpprivkey(const UniValue& params, bool fHelp) "\nReveals the private key corresponding to 'zcashaddress'.\n" "Then the importprivkey can be used with this output\n" "\nArguments:\n" - "1. \"zcashaddress\" (string, required) The zcash address for the private key\n" + "1. \"zcashaddress\" (string, required) The BitcoinZ address for the private key\n" "\nResult:\n" "\"key\" (string) The private key\n" "\nExamples:\n" @@ -407,7 +407,7 @@ UniValue dumpprivkey(const UniValue& params, bool fHelp) string strAddress = params[0].get_str(); CBitcoinAddress address; if (!address.SetString(strAddress)) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid BitcoinZ address"); CKeyID keyID; if (!address.GetKeyID(keyID)) throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key"); @@ -502,7 +502,7 @@ UniValue dumpwallet_impl(const UniValue& params, bool fHelp, bool fDumpZKeys) std::sort(vKeyBirth.begin(), vKeyBirth.end()); // produce output - file << strprintf("# Wallet dump created by Zcash %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); + file << strprintf("# Wallet dump created by BitcoinZ %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime())); file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString()); file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime())); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index adeadf6e9..26702768a 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -114,11 +114,11 @@ UniValue getnewaddress(const UniValue& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "getnewaddress ( \"account\" )\n" - "\nReturns a new Zcash address for receiving payments.\n" + "\nReturns a new BitcoinZ address for receiving payments.\n" "\nArguments:\n" "1. \"account\" (string, optional) DEPRECATED. If provided, it MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n" "\nResult:\n" - "\"zcashaddress\" (string) The new zcash address\n" + "\"zcashaddress\" (string) The new BitcoinZ address\n" "\nExamples:\n" + HelpExampleCli("getnewaddress", "") + HelpExampleRpc("getnewaddress", "") @@ -191,11 +191,11 @@ UniValue getaccountaddress(const UniValue& params, bool fHelp) if (fHelp || params.size() != 1) throw runtime_error( "getaccountaddress \"account\"\n" - "\nDEPRECATED. Returns the current Zcash address for receiving payments to this account.\n" + "\nDEPRECATED. Returns the current BitcoinZ address for receiving payments to this account.\n" "\nArguments:\n" "1. \"account\" (string, required) MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n" "\nResult:\n" - "\"zcashaddress\" (string) The account zcash address\n" + "\"zcashaddress\" (string) The account BitcoinZ address\n" "\nExamples:\n" + HelpExampleCli("getaccountaddress", "") + HelpExampleCli("getaccountaddress", "\"\"") @@ -223,7 +223,7 @@ UniValue getrawchangeaddress(const UniValue& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "getrawchangeaddress\n" - "\nReturns a new Zcash address, for receiving change.\n" + "\nReturns a new BitcoinZ address, for receiving change.\n" "This is for use with raw transactions, NOT normal use.\n" "\nResult:\n" "\"address\" (string) The address\n" @@ -260,7 +260,7 @@ UniValue setaccount(const UniValue& params, bool fHelp) "setaccount \"zcashaddress\" \"account\"\n" "\nDEPRECATED. Sets the account associated with the given address.\n" "\nArguments:\n" - "1. \"zcashaddress\" (string, required) The zcash address to be associated with an account.\n" + "1. \"zcashaddress\" (string, required) The BitcoinZ address to be associated with an account.\n" "2. \"account\" (string, required) MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n" "\nExamples:\n" + HelpExampleCli("setaccount", "\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\" \"tabby\"") @@ -271,7 +271,7 @@ UniValue setaccount(const UniValue& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid BitcoinZ address"); string strAccount; if (params.size() > 1) @@ -306,7 +306,7 @@ UniValue getaccount(const UniValue& params, bool fHelp) "getaccount \"zcashaddress\"\n" "\nDEPRECATED. Returns the account associated with the given address.\n" "\nArguments:\n" - "1. \"zcashaddress\" (string, required) The zcash address for account lookup.\n" + "1. \"zcashaddress\" (string, required) The BitcoinZ address for account lookup.\n" "\nResult:\n" "\"accountname\" (string) the account address\n" "\nExamples:\n" @@ -318,7 +318,7 @@ UniValue getaccount(const UniValue& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid BitcoinZ address"); string strAccount; map::iterator mi = pwalletMain->mapAddressBook.find(address.Get()); @@ -341,7 +341,7 @@ UniValue getaddressesbyaccount(const UniValue& params, bool fHelp) "1. \"account\" (string, required) MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n" "\nResult:\n" "[ (json array of string)\n" - " \"zcashaddress\" (string) a zcash address associated with the given account\n" + " \"zcashaddress\" (string) a BitcoinZ address associated with the given account\n" " ,...\n" "]\n" "\nExamples:\n" @@ -407,7 +407,7 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp) "\nSend an amount to a given address. The amount is a real and is rounded to the nearest 0.00000001\n" + HelpRequiringPassphrase() + "\nArguments:\n" - "1. \"zcashaddress\" (string, required) The zcash address to send to.\n" + "1. \"zcashaddress\" (string, required) The BitcoinZ address to send to.\n" "2. \"amount\" (numeric, required) The amount in " + CURRENCY_UNIT + " to send. eg 0.1\n" "3. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" " This is not part of the transaction, just kept in your wallet.\n" @@ -415,7 +415,7 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp) " to which you're sending the transaction. This is not part of the \n" " transaction, just kept in your wallet.\n" "5. subtractfeefromamount (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n" - " The recipient will receive less zcash than you enter in the amount field.\n" + " The recipient will receive less BitcoinZ than you enter in the amount field.\n" "\nResult:\n" "\"transactionid\" (string) The transaction id.\n" "\nExamples:\n" @@ -429,7 +429,7 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid BitcoinZ address"); // Amount CAmount nAmount = AmountFromValue(params[1]); @@ -469,7 +469,7 @@ UniValue listaddressgroupings(const UniValue& params, bool fHelp) "[\n" " [\n" " [\n" - " \"zcashaddress\", (string) The zcash address\n" + " \"zcashaddress\", (string) The BitcoinZ address\n" " amount, (numeric) The amount in " + CURRENCY_UNIT + "\n" " \"account\" (string, optional) The account (DEPRECATED)\n" " ]\n" @@ -516,7 +516,7 @@ UniValue signmessage(const UniValue& params, bool fHelp) "\nSign a message with the private key of an address" + HelpRequiringPassphrase() + "\n" "\nArguments:\n" - "1. \"zcashaddress\" (string, required) The zcash address to use for the private key.\n" + "1. \"zcashaddress\" (string, required) The BitcoinZ address to use for the private key.\n" "2. \"message\" (string, required) The message to create a signature of.\n" "\nResult:\n" "\"signature\" (string) The signature of the message encoded in base 64\n" @@ -571,7 +571,7 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp) "getreceivedbyaddress \"zcashaddress\" ( minconf )\n" "\nReturns the total amount received by the given zcashaddress in transactions with at least minconf confirmations.\n" "\nArguments:\n" - "1. \"zcashaddress\" (string, required) The zcash address for transactions.\n" + "1. \"zcashaddress\" (string, required) The BitcoinZ address for transactions.\n" "2. minconf (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n" "\nResult:\n" "amount (numeric) The total amount in " + CURRENCY_UNIT + " received at this address.\n" @@ -591,7 +591,7 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp) // Bitcoin address CBitcoinAddress address = CBitcoinAddress(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid BitcoinZ address"); CScript scriptPubKey = GetScriptForDestination(address.Get()); if (!IsMine(*pwalletMain,scriptPubKey)) return (double)0.0; @@ -877,12 +877,12 @@ UniValue sendfrom(const UniValue& params, bool fHelp) if (fHelp || params.size() < 3 || params.size() > 6) throw runtime_error( "sendfrom \"fromaccount\" \"tozcashaddress\" amount ( minconf \"comment\" \"comment-to\" )\n" - "\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a zcash address.\n" + "\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a BitcoinZ address.\n" "The amount is a real and is rounded to the nearest 0.00000001." + HelpRequiringPassphrase() + "\n" "\nArguments:\n" "1. \"fromaccount\" (string, required) MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n" - "2. \"tozcashaddress\" (string, required) The zcash address to send funds to.\n" + "2. \"tozcashaddress\" (string, required) The BitcoinZ address to send funds to.\n" "3. amount (numeric, required) The amount in " + CURRENCY_UNIT + " (transaction fee is added on top).\n" "4. minconf (numeric, optional, default=1) Only use funds with at least this many confirmations.\n" "5. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" @@ -906,7 +906,7 @@ UniValue sendfrom(const UniValue& params, bool fHelp) string strAccount = AccountFromValue(params[0]); CBitcoinAddress address(params[1].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid BitcoinZ address"); CAmount nAmount = AmountFromValue(params[2]); if (nAmount <= 0) throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send"); @@ -948,7 +948,7 @@ UniValue sendmany(const UniValue& params, bool fHelp) "1. \"fromaccount\" (string, required) MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n" "2. \"amounts\" (string, required) A json object with addresses and amounts\n" " {\n" - " \"address\":amount (numeric) The zcash address is the key, the numeric amount in " + CURRENCY_UNIT + " is the value\n" + " \"address\":amount (numeric) The BitcoinZ address is the key, the numeric amount in " + CURRENCY_UNIT + " is the value\n" " ,...\n" " }\n" "3. minconf (numeric, optional, default=1) Only use the balance confirmed at least this many times.\n" @@ -1001,7 +1001,7 @@ UniValue sendmany(const UniValue& params, bool fHelp) { CBitcoinAddress address(name_); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Zcash address: ")+name_); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid BitcoinZ address: ")+name_); if (setAddress.count(address)) throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+name_); @@ -1057,20 +1057,20 @@ UniValue addmultisigaddress(const UniValue& params, bool fHelp) { string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n" "\nAdd a nrequired-to-sign multisignature address to the wallet.\n" - "Each key is a Zcash address or hex-encoded public key.\n" + "Each key is a BitcoinZ address or hex-encoded public key.\n" "If 'account' is specified (DEPRECATED), assign address to that account.\n" "\nArguments:\n" "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" - "2. \"keysobject\" (string, required) A json array of zcash addresses or hex-encoded public keys\n" + "2. \"keysobject\" (string, required) A json array of BitcoinZ addresses or hex-encoded public keys\n" " [\n" - " \"address\" (string) zcash address or hex-encoded public key\n" + " \"address\" (string) BitcoinZ address or hex-encoded public key\n" " ...,\n" " ]\n" "3. \"account\" (string, optional) DEPRECATED. If provided, MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n" "\nResult:\n" - "\"zcashaddress\" (string) A zcash address associated with the keys.\n" + "\"zcashaddress\" (string) A BitcoinZ address associated with the keys.\n" "\nExamples:\n" "\nAdd a multisig address from 2 addresses\n" @@ -1417,7 +1417,7 @@ UniValue listtransactions(const UniValue& params, bool fHelp) " {\n" " \"account\":\"accountname\", (string) DEPRECATED. The account name associated with the transaction. \n" " It will be \"\" for the default account.\n" - " \"address\":\"zcashaddress\", (string) The zcash address of the transaction. Not present for \n" + " \"address\":\"zcashaddress\", (string) The BitcoinZ address of the transaction. Not present for \n" " move transactions (category = move).\n" " \"category\":\"send|receive|move\", (string) The transaction category. 'move' is a local (off blockchain)\n" " transaction between accounts, and not associated with an address,\n" @@ -1617,7 +1617,7 @@ UniValue listsinceblock(const UniValue& params, bool fHelp) "{\n" " \"transactions\": [\n" " \"account\":\"accountname\", (string) DEPRECATED. The account name associated with the transaction. Will be \"\" for the default account.\n" - " \"address\":\"zcashaddress\", (string) The zcash address of the transaction. Not present for move transactions (category = move).\n" + " \"address\":\"zcashaddress\", (string) The BitcoinZ address of the transaction. Not present for move transactions (category = move).\n" " \"category\":\"send|receive\", (string) The transaction category. 'send' has negative amounts, 'receive' has positive amounts.\n" " \"amount\": x.xxx, (numeric) The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and for the 'move' category for moves \n" " outbound. It is positive for the 'receive' category, and for the 'move' category for inbound funds.\n" @@ -1716,7 +1716,7 @@ UniValue gettransaction(const UniValue& params, bool fHelp) " \"details\" : [\n" " {\n" " \"account\" : \"accountname\", (string) DEPRECATED. The account name involved in the transaction, can be \"\" for the default account.\n" - " \"address\" : \"zcashaddress\", (string) The zcash address involved in the transaction\n" + " \"address\" : \"zcashaddress\", (string) The BitcoinZ address involved in the transaction\n" " \"category\" : \"send|receive\", (string) The category, either 'send' or 'receive'\n" " \"amount\" : x.xxx (numeric) The amount in " + CURRENCY_UNIT + "\n" " \"vout\" : n, (numeric) the vout value\n" @@ -1876,7 +1876,7 @@ UniValue walletpassphrase(const UniValue& params, bool fHelp) throw runtime_error( "walletpassphrase \"passphrase\" timeout\n" "\nStores the wallet decryption key in memory for 'timeout' seconds.\n" - "This is needed prior to performing transactions related to private keys such as sending zcash\n" + "This is needed prior to performing transactions related to private keys such as sending BitcoinZ\n" "\nArguments:\n" "1. \"passphrase\" (string, required) The wallet passphrase\n" "2. timeout (numeric, required) The time to keep the decryption key in seconds.\n" @@ -2041,7 +2041,7 @@ UniValue encryptwallet(const UniValue& params, bool fHelp) "\nExamples:\n" "\nEncrypt you wallet\n" + HelpExampleCli("encryptwallet", "\"my pass phrase\"") + - "\nNow set the passphrase to use the wallet, such as for signing or sending zcash\n" + "\nNow set the passphrase to use the wallet, such as for signing or sending BitcoinZ\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\"") + "\nNow we can so something like sign\n" + HelpExampleCli("signmessage", "\"zcashaddress\" \"test message\"") + @@ -2079,7 +2079,7 @@ UniValue encryptwallet(const UniValue& params, bool fHelp) // slack space in .dat files; that is bad if the old data is // unencrypted private keys. So: StartShutdown(); - return "wallet encrypted; Zcash server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup."; + return "wallet encrypted; BitcoinZ server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup."; } UniValue lockunspent(const UniValue& params, bool fHelp) @@ -2092,7 +2092,7 @@ UniValue lockunspent(const UniValue& params, bool fHelp) "lockunspent unlock [{\"txid\":\"txid\",\"vout\":n},...]\n" "\nUpdates list of temporarily unspendable outputs.\n" "Temporarily lock (unlock=false) or unlock (unlock=true) specified transaction outputs.\n" - "A locked transaction output will not be chosen by automatic coin selection, when spending zcash.\n" + "A locked transaction output will not be chosen by automatic coin selection, when spending BitcoinZ.\n" "Locks are stored in memory only. Nodes start with zero locked outputs, and the locked output list\n" "is always cleared (by virtue of process exit) when a node stops or fails.\n" "Also see the listunspent call\n" @@ -2325,9 +2325,9 @@ UniValue listunspent(const UniValue& params, bool fHelp) "\nArguments:\n" "1. minconf (numeric, optional, default=1) The minimum confirmations to filter\n" "2. maxconf (numeric, optional, default=9999999) The maximum confirmations to filter\n" - "3. \"addresses\" (string) A json array of zcash addresses to filter\n" + "3. \"addresses\" (string) A json array of BitcoinZ addresses to filter\n" " [\n" - " \"address\" (string) zcash address\n" + " \"address\" (string) BitcoinZ address\n" " ,...\n" " ]\n" "\nResult\n" @@ -2336,7 +2336,7 @@ UniValue listunspent(const UniValue& params, bool fHelp) " \"txid\" : \"txid\", (string) the transaction id \n" " \"vout\" : n, (numeric) the vout value\n" " \"generated\" : true|false (boolean) true if txout is a coinbase transaction output\n" - " \"address\" : \"address\", (string) the zcash address\n" + " \"address\" : \"address\", (string) the BitcoinZ address\n" " \"account\" : \"account\", (string) DEPRECATED. The associated account, or \"\" for the default account\n" " \"scriptPubKey\" : \"key\", (string) the script key\n" " \"amount\" : x.xxx, (numeric) the transaction amount in " + CURRENCY_UNIT + "\n" @@ -2368,7 +2368,7 @@ UniValue listunspent(const UniValue& params, bool fHelp) const UniValue& input = inputs[idx]; CBitcoinAddress address(input.get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Zcash address: ")+input.get_str()); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid BitcoinZ address: ")+input.get_str()); if (setAddress.count(address)) throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+input.get_str()); setAddress.insert(address); diff --git a/zcutil/build-mac.sh b/zcutil/build-mac.sh deleted file mode 100755 index 4bb500c22..000000000 --- a/zcutil/build-mac.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash -export CC=gcc-5 -export CXX=g++-5 -export LIBTOOL=libtool -export AR=ar -export RANLIB=ranlib -export STRIP=strip -export OTOOL=otool -export NM=nm - -set -eu -o pipefail - -if [ "x$*" = 'x--help' ] -then - cat </$lockfile" - # acquire the lock - flock -n 200 \ - && return 0 \ - || return 1 - fi -} - -function exit_locked_error { - echo "Only one instance of fetch-params.sh can be run at a time." >&2 - exit 1 -} - -function main() { - - lock fetch-params.sh \ - || exit_locked_error - - cat <> "$README_PATH" < ~/Library/Application\ Support/BitcoinZ/bitcoinz.conf - PASSWORD=$(cat /dev/urandom | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) - echo "rpcpassword=$PASSWORD" >> "$HOME/Library/Application Support/BitcoinZ/bitcoinz.conf" - echo "Complete!" -fi - -exit 0 - -