diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index a4f948bb0..4cb66aedb 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -69,7 +69,7 @@ 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 = _("Zcash RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (!mapArgs.count("-version")) { strUsage += "\n" + _("Usage:") + "\n" + " zcash-cli [options] [params] " + _("Send command to Zcash") + "\n" + diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index bfd47b93b..6feee7e90 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"; + std::string strUsage = _("Zcash Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (mapArgs.count("-version")) { diff --git a/src/metrics.cpp b/src/metrics.cpp index fe2c57081..fd8000548 100644 --- a/src/metrics.cpp +++ b/src/metrics.cpp @@ -393,6 +393,9 @@ void ThreadShowMetricsScreen() // Thank you text std::cout << _("Thank you for running a Zcash node!") << std::endl; std::cout << _("You're helping to strengthen the network and contributing to a social good :)") << std::endl; + + // Privacy notice text + std::cout << PrivacyInfo(); std::cout << std::endl; } diff --git a/src/util.cpp b/src/util.cpp index adfa6440e..420ce043c 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -888,9 +888,17 @@ void SetThreadPriority(int nPriority) #endif // WIN32 } +std::string PrivacyInfo() +{ + return "\n" + + FormatParagraph(strprintf(_("In order to ensure you are adequately protecting your privacy when using Zcash, please see <%s>."), + "https://z.cash/support/security/index.html")) + "\n"; +} + std::string LicenseInfo() { - return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + + return "\n" + + 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" + "\n" + FormatParagraph(_("This is experimental software.")) + "\n" + diff --git a/src/util.h b/src/util.h index a0c16638c..00c48582c 100644 --- a/src/util.h +++ b/src/util.h @@ -142,6 +142,9 @@ void ShrinkDebugFile(); void runCommand(const std::string& strCommand); const boost::filesystem::path GetExportDir(); +/** Returns privacy notice (for -version, -help and metrics screen) */ +std::string PrivacyInfo(); + /** Returns licensing information (for -version) */ std::string LicenseInfo();