~/.zcash -> ~/.zclassic, -r

Author: Jon Layton <jon@seequ.com> Changes to be committed: modified: .github/ISSUE_TEMPLATE.md modified: .gitignore renamed: contrib/debian/examples/zcash.conf -> contrib/debian/examples/zclassic.conf modified: contrib/debian/zcash.examples modified: doc/amqp.md modified: doc/files.md modified: doc/man/zcash-cli.1 modified: doc/man/zcashd.1 modified: doc/release-notes/release-notes-0.11.2.z3.md modified: doc/release-notes/release-notes-1.0.0-rc3.md modified: doc/release-notes/release-notes-1.0.5.md modified: doc/release-process.md modified: doc/wallet-backup.md modified: doc/zmq.md modified: qa/pull-tester/run-bitcoind-for-test.sh.in modified: qa/rpc-tests/test_framework/util.py modified: qa/zcash/performance-measurements.sh modified: src/bitcoin-cli.cpp modified: src/bitcoind.cpp modified: src/init.cpp modified: src/metrics.cpp modified: src/rpcmining.cpp modified: src/util.cpp modified: src/util.h
z-classic · Sep 5, 2018 · bf42ee4 · bf42ee4
1 parent bf11e78
commit bf42ee4
Show file tree

Hide file tree

Showing 24 changed files with 40 additions and 43 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,7 @@
 <!--- Remove text and sections that do not apply -->
 
+Zclassic Wallet Daemon and CLI Issue Template
+
 This issue tracker is only for technical issues related to zcashd.
 
 General Zcash questions and/or support requests and are best directed to the [Zcash Forums](https://forum.z.cash) or [Community Rocket.Chat](https://chat.zcashcommunity.com).
@@ -21,7 +23,7 @@ Tell us what should happen
 ### Actual behaviour + errors
 Tell us what happens instead including any noticable error output (any messages displayed on-screen when e.g. a crash occurred)
 
-### The version of Zcash you were using:
+### The version of Zclassic / Zcash you were using:
 Run `zcashd --version` to find out
 
 ### Machine specs:
@@ -34,9 +36,9 @@ Run `zcashd --version` to find out
 - Compiler version (gcc -version):
 
 ### Any extra information that might be useful in the debugging process.
-This includes the relevant contents of `~/.zcash/debug.log`. You can paste raw text, attach the file directly in the issue or link to the text via a pastebin type site.
+This includes the relevant contents of `~/.zclassic/debug.log`. You can paste raw text, attach the file directly in the issue or link to the text via a pastebin type site.
 Please also include any non-standard things you did during compilation (extra flags, dependency version changes etc.) if applicable.
 
-### Do you have a back up of `~/.zcash` directory and/or take a VM snapshot?
-- Backing up / making a copy of the `~/.zcash` directory might help make the problem reproducible. Please redact appropriately.
+### Do you have a back up of `~/.zclassic` directory and/or take a VM snapshot?
+- Backing up / making a copy of the `~/.zclassic` directory might help make the problem reproducible. Please redact appropriately.
 - Taking a VM snapshot is really helpful for interactively testing fixes
diff --git a/.gitignore b/.gitignore
@@ -56,7 +56,7 @@ src/univalue/gen
 *.pyc
 *.o
 *.o-*
-.zcash
+.zclassic
 *.a
 *.pb.cc
 *.pb.h

diff --git a/contrib/debian/examples/zcash.conf → contrib/debian/examples/zclassic.conf b/contrib/debian/examples/zcash.conf → contrib/debian/examples/zclassic.conf
@@ -1,10 +1,10 @@
 ##
-## zcash.conf configuration file. Lines beginning with # are comments.
+## zclassic.conf configuration file. Lines beginning with # are comments.
 ##
 
 # Network-related settings:
 
-# Run on the test network instead of the real zcash network.
+# Run on the test network instead of the real zclassic network.
 #testnet=0
 
 # Run a regression test network
@@ -72,15 +72,15 @@
 #rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
 
 # How many seconds zcash will wait for a complete RPC HTTP request.
-# after the HTTP connection is established. 
+# after the HTTP connection is established.
 #rpcclienttimeout=30
 
 # By default, only RPC connections from localhost are allowed.
 # Specify as many rpcallowip= settings as you like to allow connections from other hosts,
 # either as a single IPv4/IPv6 or with a subnet specification.
 
 # NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED,
-# because the rpcpassword is transmitted over the network unencrypted and also because anyone 
+# because the rpcpassword is transmitted over the network unencrypted and also because anyone
 # that can authenticate on the RPC port can steal your keys + take over the account running zcashd
 # For more information see https://github.com/zcash/zcash/issues/1497
 
@@ -122,8 +122,6 @@
 
 # Pay an optional transaction fee every time you send zcash.  Transactions with fees
 # are more likely than free transactions to be included in generated blocks, so may
-# be validated sooner. This setting does not affect private transactions created with 
+# be validated sooner. This setting does not affect private transactions created with
 # 'z_sendmany'.
 #paytxfee=0.00
-
-
diff --git a/contrib/debian/zcash.examples b/contrib/debian/zcash.examples
@@ -1 +1 @@
-DEBIAN/examples/zcash.conf
+DEBIAN/examples/zclassic.conf
diff --git a/doc/amqp.md b/doc/amqp.md
@@ -89,7 +89,7 @@ the topic is `hashtx` (no null terminator) and the body is the hexadecimal
 transaction hash (32 bytes).  This transaction hash and the block hash
 found in `hashblock` are in RPC byte order.
 
-These options can also be provided in zcash.conf.
+These options can also be provided in zclassic.conf.
 
 Please see `contrib/amqp/amqp_sub.py` for a working example of an
 AMQP server listening for messages.

diff --git a/doc/files.md b/doc/files.md
@@ -1,4 +1,4 @@
-* zcash.conf: contains configuration settings for zcashd
+* zclassic.conf: contains configuration settings for zcashd
 * zcashd.pid: stores the process id of zcashd while running
 * blocks/blk000??.dat: block data (custom, 128 MiB per file)
 * blocks/rev000??.dat; block undo data (custom)

diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1
@@ -25,7 +25,7 @@ This help message
 .HP
 \fB\-conf=\fR<file>
 .IP
-Specify configuration file (default: zcash.conf)
+Specify configuration file (default: zclassic.conf)
 .HP
 \fB\-datadir=\fR<dir>
 .IP

diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1
@@ -41,7 +41,7 @@ How thorough the block verification of \fB\-checkblocks\fR is (0\-4, default: 3)
 .HP
 \fB\-conf=\fR<file>
 .IP
-Specify configuration file (default: zcash.conf)
+Specify configuration file (default: zclassic.conf)
 .HP
 \fB\-daemon\fR
 .IP

diff --git a/doc/release-notes/release-notes-0.11.2.z3.md b/doc/release-notes/release-notes-0.11.2.z3.md
@@ -66,4 +66,3 @@ Taylor Hornby (7):
       Rename bitcoin.conf and bitcoind.pid to zcash.conf and zcashd.pid in qa/ and src/
       Trivial change: Capitalize the Z in Zerocash
       Remove the Merkle tree hash function's fixed point.
-
diff --git a/doc/release-notes/release-notes-1.0.0-rc3.md b/doc/release-notes/release-notes-1.0.0-rc3.md
@@ -48,4 +48,3 @@ Simon (4):
 
 bitcartel (1):
       Update payment-api.md
-
diff --git a/doc/release-notes/release-notes-1.0.5.md b/doc/release-notes/release-notes-1.0.5.md
@@ -55,4 +55,3 @@ Simon Liu (13):
 
 Wladimir J. van der Laan (1):
       rpc: Implement random-cookie based authentication
-
diff --git a/doc/release-process.md b/doc/release-process.md
@@ -136,7 +136,7 @@ Notify the Zcash DevOps engineer/sysadmin that the release has been tagged. They
 * often the same server can be re-used, and the role idempotently handles upgrades, but if not then they also need to update DNS records
 * possible manual steps: blowing away the `testnet3` dir, deleting old parameters, restarting DNS seeder
 
-Then, verify that nodes can connect to the testnet server, and update the guide on the wiki to ensure the correct hostname is listed in the recommended zcash.conf.
+Then, verify that nodes can connect to the testnet server, and update the guide on the wiki to ensure the correct hostname is listed in the recommended zclassic.conf.
 
 ### Update the 1.0 User Guide
 

diff --git a/doc/wallet-backup.md b/doc/wallet-backup.md
@@ -16,7 +16,7 @@ These instructions are specific for the officially supported Zcash Linux client.
 
 There are multiple ways to make sure you have at least one other copy of the private keys needed to spend your ZEC and view your shielded ZEC.
 
-For all methods, you will need to include an export directory setting in your config file (`zcash.conf` located in the data directory which is `~/.zcash/` unless it's been overridden with `datadir=` setting):
+For all methods, you will need to include an export directory setting in your config file (`zclassic.conf` located in the data directory which is `~/.zclassic/` unless it's been overridden with `datadir=` setting):
 
 `exportdir=/path/to/chosen/export/directory`
 
@@ -88,4 +88,4 @@ See the command's help documentation for instructions on fine-tuning the wallet
 
 ### Using `dumpwallet`
 
-This command inherited from Bitcoin is deprecated. It will export private keys in a similar fashion as `z_exportwallet` but only for transparent addresses.
+This command inherited from Bitcoin is deprecated. It will export private keys in a similar fashion as `z_exportwallet` but only for transparent addresses.
diff --git a/doc/zmq.md b/doc/zmq.md
@@ -76,7 +76,7 @@ notification `-zmqpubhashtx` the topic is `hashtx` (no null
 terminator) and the body is the hexadecimal transaction hash (32
 bytes).
 
-These options can also be provided in zcash.conf.
+These options can also be provided in zclassic.conf.
 
 ZeroMQ endpoint specifiers for TCP (and others) are documented in the
 [ZeroMQ API](http://api.zeromq.org/4-0:_start).

diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in
@@ -4,10 +4,10 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 ZCASH_LOAD_TIMEOUT=500
-DATADIR="@abs_top_builddir@/.zcash"
+DATADIR="@abs_top_builddir@/.zclassic"
 rm -rf "$DATADIR"
 mkdir -p "$DATADIR"/regtest
-touch "$DATADIR/zcash.conf"
+touch "$DATADIR/zclassic.conf"
 touch "$DATADIR/regtest/debug.log"
 tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" &
 WAITER=$!

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
@@ -75,7 +75,7 @@ def initialize_datadir(dirname, n):
     datadir = os.path.join(dirname, "node"+str(n))
     if not os.path.isdir(datadir):
         os.makedirs(datadir)
-    with open(os.path.join(datadir, "zcash.conf"), 'w') as f:
+    with open(os.path.join(datadir, "zclassic.conf"), 'w') as f:
         f.write("regtest=1\n");
         f.write("showmetrics=0\n");
         f.write("rpcuser=rt\n");
@@ -144,7 +144,7 @@ def initialize_chain(test_dir):
         from_dir = os.path.join("cache", "node"+str(i))
         to_dir = os.path.join(test_dir,  "node"+str(i))
         shutil.copytree(from_dir, to_dir)
-        initialize_datadir(test_dir, i) # Overwrite port/rpcport in zcash.conf
+        initialize_datadir(test_dir, i) # Overwrite port/rpcport in zclassic.conf
 
 def initialize_chain_clean(test_dir, num_nodes):
     """

diff --git 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/zclassic.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/zclassic.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/zclassic.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/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=<file>", strprintf(_("Specify configuration file (default: %s)"), "zcash.conf"));
+    strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "zclassic.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 "

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
@@ -116,8 +116,8 @@ bool AppInit(int argc, char* argv[])
                  _("- 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/zclassic.conf",
+                "/usr/share/doc/zcash/examples/zclassic.conf");
             return false;
         } catch (const std::exception& e) {
             fprintf(stderr,"Error reading configuration file: %s\n", e.what());

diff --git a/src/init.cpp b/src/init.cpp
@@ -338,7 +338,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)"), "zclassic.conf"));
     if (mode == HMM_BITCOIND)
     {
 #if !defined(WIN32)

diff --git 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 zclassic.conf and restart.") << std::endl;
         lines += 2;
     }
     std::cout << std::endl;

diff --git 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 zclassic.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/util.cpp b/src/util.cpp
@@ -444,10 +444,10 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread)
 boost::filesystem::path GetDefaultDataDir()
 {
     namespace fs = boost::filesystem;
-    // Windows < Vista: C:\Documents and Settings\Username\Application Data\Zcash
-    // Windows >= Vista: C:\Users\Username\AppData\Roaming\Zcash
-    // Mac: ~/Library/Application Support/Zcash
-    // Unix: ~/.zcash
+    // Windows < Vista: C:\Documents and Settings\Username\Application Data\Zclassic
+    // Windows >= Vista: C:\Users\Username\AppData\Roaming\Zclassic
+    // Mac: ~/Library/Application Support/Zclassic
+    // Unix: ~/.zclassic
 #ifdef WIN32
     // Windows
     return GetSpecialFolderPath(CSIDL_APPDATA) / "Zclassic";
@@ -601,7 +601,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
 
     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 zclassic.conf
         string strKey = string("-") + it->string_key;
         if (mapSettingsRet.count(strKey) == 0)
         {

diff --git 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 zclassic.conf") { }
 };
 void ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet);
 #ifdef WIN32