From 8229ececb39192cbdb214df93cb1e5ce42d0b837 Mon Sep 17 00:00:00 2001 From: ulloa Date: Sun, 24 Dec 2017 12:26:15 -0800 Subject: [PATCH] Rebranded from Zclassic to Bitcoin Private Links, ticker, and genesis block building which used Zclassic remain unchanged. --- README.md | 22 +++++++++++----------- contrib/debian/control | 2 +- doc/man/zcash-cli.1 | 2 +- doc/man/zcashd.1 | 2 +- src/chainparams.cpp | 2 +- src/gtest/test_checkblock.cpp | 2 +- src/metrics.cpp | 2 +- src/util.cpp | 10 +++++----- zcutil/build-mac.sh | 14 +++++++------- zcutil/init-mac.sh | 10 +++++----- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index a0052ef8..34598ed9 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -Zclassic v1.0.10-1 +Bitcoin Private v1.0.10-1 NOTICE, the default ports have changed! The p2p port is now 8033 and rpcport is 8023 -What is Zclassic? +What is Bitcoin Private? ---------------- -Zclassic is financial freedom. +Bitcoin Private is financial freedom. Install ----------------- @@ -69,14 +69,14 @@ Install About -------------- -[Zclassic](http://zclassic.org/), like [Zcash](https://z.cash/), is an implementation of the "Zerocash" protocol. +[Bitcoin Private](http://zclassic.org/), like [Zcash](https://z.cash/), is an implementation of the "Zerocash" protocol. Based on Bitcoin's code, it intends to offer a far higher standard of privacy through a sophisticated zero-knowledge proving scheme that preserves confidentiality of transaction metadata. Technical details are available in the Zcash [Protocol Specification](https://github.com/zcash/zips/raw/master/protocol/protocol.pdf). -This software is the Zclassic client. It downloads and stores the entire history -of Zclassic transactions; depending on the speed of your computer and network +This software is the Bitcoin Private client. It downloads and stores the entire history +of Bitcoin Private transactions; depending on the speed of your computer and network connection, the synchronization process could take a day or more once the blockchain has reached a significant size. @@ -86,7 +86,7 @@ Security Warnings See important security warnings in [doc/security-warnings.md](doc/security-warnings.md). -**Zclassic and Zcash are unfinished and highly experimental.** Use at your own risk. +**Bitcoin Private and Zcash are unfinished and highly experimental.** Use at your own risk. Deprecation Policy ------------------ @@ -98,14 +98,14 @@ height and can be explicitly disabled. Where do I begin? ----------------- -We have a guide for joining the main Zclassic network: -https://github.com/z-classic/zclassic/wiki/1.0-User-Guide +We have a guide for joining the main Bitcoin Private network: +https://github.com/BTCPrivate/BitcoinPrivate/wiki/1.0-User-Guide ### Need Help? -* See the documentation at the [Zclassic Wiki](https://github.com/z-classic/zclassic/wiki) +* See the documentation at the [Bitcoin Private Wiki](https://github.com/BTCPrivate/BitcoinPrivate/wiki) for help and more information. -* Ask for help on the [Zclassic](http://zcltalk.tech/index.php) forum. +* Ask for help on the [Bitcoin Private](http://zcltalk.tech/index.php) forum. ### Want to participate in development? diff --git a/contrib/debian/control b/contrib/debian/control index aa608fcc..d5d11c79 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -10,7 +10,7 @@ Build-Depends: autoconf, automake, bsdmainutils, build-essential, Vcs-Git: https://github.com/zcash/zcash.git Vcs-Browser: https://github.com/zcash/zcash -Package: zclassic +Package: btcprivate Version: 1.0.6 Depends: ${shlibs:Depends} Description: HTTPS for money. diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 0df01d62..3ac8767b 100644 --- a/doc/man/zcash-cli.1 +++ b/doc/man/zcash-cli.1 @@ -5,7 +5,7 @@ zcash-cli \- manual page for zcash-cli v1.0.10-1 .SH DESCRIPTION Zcash RPC client version v1.0.10\-1 .PP -In order to ensure you are adequately protecting your privacy when using Zclassic, +In order to ensure you are adequately protecting your privacy when using Bitcoin Private, please see . .SS "Usage:" .TP diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index ba6caffb..a12a87d0 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/zcashd.1 @@ -5,7 +5,7 @@ zcashd \- manual page for zcashd v1.0.10-1 .SH DESCRIPTION Zcash Daemon version v1.0.10\-1 .PP -In order to ensure you are adequately protecting your privacy when using Zclassic, +In order to ensure you are adequately protecting your privacy when using Bitcoin Private, please see . .SS "Usage:" .TP diff --git a/src/chainparams.cpp b/src/chainparams.cpp index c5f6213e..3bea6c38 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -229,7 +229,7 @@ public: vFixedSeeds.clear(); vSeeds.clear(); - vSeeds.push_back(CDNSSeedData("rotorproject.org", "test-dnsseed.rotorproject.org")); // Zclassic + vSeeds.push_back(CDNSSeedData("rotorproject.org", "test-dnsseed.rotorproject.org")); // Bitcoin Private // guarantees the first 2 characters, when base58 encoded, are "tm" base58Prefixes[PUBKEY_ADDRESS] = {0x1D,0x25}; diff --git a/src/gtest/test_checkblock.cpp b/src/gtest/test_checkblock.cpp index b89e5add..7719731a 100644 --- a/src/gtest/test_checkblock.cpp +++ b/src/gtest/test_checkblock.cpp @@ -53,7 +53,7 @@ TEST(ContextualCheckBlock, BadCoinbaseHeight) { EXPECT_TRUE(ContextualCheckBlock(block, state, NULL)); // Treating block as non-genesis should fail - //mtx.vout.push_back(CTxOut(GetBlockSubsidy(1, Params().GetConsensus())/5, Params().GetFoundersRewardScriptAtHeight(1))); // disabled for Zclassic + //mtx.vout.push_back(CTxOut(GetBlockSubsidy(1, Params().GetConsensus())/5, Params().GetFoundersRewardScriptAtHeight(1))); // disabled for Bitcoin Private CTransaction tx2 {mtx}; block.vtx[0] = tx2; CBlock prev; diff --git a/src/metrics.cpp b/src/metrics.cpp index 192a7ead..eb05473d 100644 --- a/src/metrics.cpp +++ b/src/metrics.cpp @@ -397,7 +397,7 @@ void ThreadShowMetricsScreen() std::cout << std::endl; // Thank you text - std::cout << _("Thank you for running a Zclassic node!") << std::endl; + std::cout << _("Thank you for running a Bitcoin Private node!") << std::endl; std::cout << _("You're helping to strengthen the network and contributing to a social good :)") << std::endl; // Privacy notice text diff --git a/src/util.cpp b/src/util.cpp index b1333136..34f303f5 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -450,7 +450,7 @@ boost::filesystem::path GetDefaultDataDir() // Unix: ~/.zcash #ifdef WIN32 // Windows - return GetSpecialFolderPath(CSIDL_APPDATA) / "Zclassic"; + return GetSpecialFolderPath(CSIDL_APPDATA) / "BTCprivate"; #else fs::path pathRet; char* pszHome = getenv("HOME"); @@ -462,10 +462,10 @@ boost::filesystem::path GetDefaultDataDir() // Mac pathRet /= "Library/Application Support"; TryCreateDirectory(pathRet); - return pathRet / "Zclassic"; + return pathRet / "BTCprivate"; #else // Unix - return pathRet / ".zclassic"; + return pathRet / ".btcprivate"; #endif #endif } @@ -582,7 +582,7 @@ void ClearDatadirCache() boost::filesystem::path GetConfigFile() { - boost::filesystem::path pathConfigFile(GetArg("-conf", "zclassic.conf")); + boost::filesystem::path pathConfigFile(GetArg("-conf", "btcprivate.conf")); if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile; @@ -891,7 +891,7 @@ void SetThreadPriority(int nPriority) std::string PrivacyInfo() { return "\n" + - FormatParagraph(strprintf(_("In order to ensure you are adequately protecting your privacy when using Zclassic, please see <%s>."), + FormatParagraph(strprintf(_("In order to ensure you are adequately protecting your privacy when using Bitcoin Private, please see <%s>."), "https://z.cash/support/security/index.html")) + "\n"; } diff --git a/zcutil/build-mac.sh b/zcutil/build-mac.sh index 3ee768ea..aae6f05a 100755 --- a/zcutil/build-mac.sh +++ b/zcutil/build-mac.sh @@ -19,20 +19,20 @@ $0 --help Show this help message and exit. $0 [ --enable-lcov || --disable-tests ] [ --disable-mining ] [ --disable-rust ] [ --enable-proton ] [ MAKEARGS... ] - Build Zclassic and most of its transitive dependencies from - source. MAKEARGS are applied to both dependencies and Zclassic itself. + Build Bitcoin Private and most of its transitive dependencies from + source. MAKEARGS are applied to both dependencies and Bitcoin Private itself. - If --enable-lcov is passed, Zclassic is configured to add coverage + If --enable-lcov is passed, Bitcoin Private is configured to add coverage instrumentation, thus enabling "make cov" to work. - If --disable-tests is passed instead, the Zclassic tests are not built. + If --disable-tests is passed instead, the Bitcoin Private tests are not built. - If --disable-mining is passed, Zclassic is configured to not build any mining + If --disable-mining is passed, Bitcoin Private is configured to not build any mining code. It must be passed after the test arguments, if present. - If --disable-rust is passed, Zclassic is configured to not build any Rust language + If --disable-rust is passed, Bitcoin Private is configured to not build any Rust language assets. It must be passed after test/mining arguments, if present. - If --enable-proton is passed, Zclassic is configured to build the Apache Qpid Proton + If --enable-proton is passed, Bitcoin Private is configured to build the Apache Qpid Proton library required for AMQP support. This library is not built by default. It must be passed after the test/mining/Rust arguments, if present. diff --git a/zcutil/init-mac.sh b/zcutil/init-mac.sh index 33ae1646..dcb6d372 100755 --- a/zcutil/init-mac.sh +++ b/zcutil/init-mac.sh @@ -125,12 +125,12 @@ EOF main rm -f /tmp/fetch_params.lock -if [ ! -f "$HOME/Library/Application Support/Zclassic/zclassic.conf" ]; then - echo "Creating zclassic.conf" - mkdir -p "$HOME/Library/Application Support/Zclassic/" - echo "rpcuser=zcashrpc" > ~/Library/Application\ Support/Zclassic/zclassic.conf +if [ ! -f "$HOME/Library/Application Support/BTCprivate/btcprivate.conf" ]; then + echo "Creating btcprivate.conf" + mkdir -p "$HOME/Library/Application Support/BTCprivate/" + echo "rpcuser=zcashrpc" > ~/Library/Application\ Support/BTCprivate/btcprivate.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/Zclassic/zclassic.conf" + echo "rpcpassword=$PASSWORD" >> "$HOME/Library/Application Support/BTCprivate/btcprivate.conf" echo "Complete!" fi