From 3e0eee4c84f40b3cf277e8d03e004249d03c081d Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Fri, 29 Jul 2016 09:30:19 +0400 Subject: [PATCH] Merge #921: Fix project name Dash -> Dash Core ef1612a Fix project name Dash -> Dash Core --- INSTALL | 2 +- contrib/init/dashd.conf | 2 +- contrib/init/dashd.openrc | 2 +- doc/Doxyfile | 2 +- doc/README.md | 4 ++-- doc/build-osx.md | 6 +++--- doc/gitian-building.md | 8 ++++---- doc/reduce-traffic.md | 2 +- doc/release-process.md | 2 +- doc/tor.md | 14 +++++++------- doc/translation_process.md | 2 +- qa/README.md | 2 +- qa/pull-tester/rpc-tests.py | 2 +- qa/rpc-tests/listtransactions.py | 2 +- qa/rpc-tests/merkle_blocks.py | 2 +- src/dashd.cpp | 2 +- src/init.cpp | 8 ++++---- src/main.cpp | 2 +- src/net.cpp | 2 +- src/qt/bitcoingui.cpp | 6 +++--- src/qt/dash.cpp | 2 +- src/qt/forms/optionsdialog.ui | 2 +- src/rpcmining.cpp | 4 ++-- src/rpcprotocol.h | 4 ++-- src/rpcserver.cpp | 4 ++-- src/wallet/rpcdump.cpp | 2 +- 26 files changed, 46 insertions(+), 46 deletions(-) diff --git a/INSTALL b/INSTALL index dd9b8408a..b82a97f23 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -Building Dash +Building Dash Core Use the autogen script to prepare the build environment. diff --git a/contrib/init/dashd.conf b/contrib/init/dashd.conf index 40b9b9a4f..d95f57c3d 100644 --- a/contrib/init/dashd.conf +++ b/contrib/init/dashd.conf @@ -38,7 +38,7 @@ pre-start script echo "It is also recommended that you also set alertnotify so you are " echo "notified of problems:" echo - echo "ie: alertnotify=echo %%s | mail -s \"Dash Alert\"" \ + echo "ie: alertnotify=echo %%s | mail -s \"Dash Core Alert\"" \ "admin@foo.com" echo exit 1 diff --git a/contrib/init/dashd.openrc b/contrib/init/dashd.openrc index abeb4419c..f76028441 100644 --- a/contrib/init/dashd.openrc +++ b/contrib/init/dashd.openrc @@ -84,7 +84,7 @@ checkconfig() eerror "It is also recommended that you also set alertnotify so you are " eerror "notified of problems:" eerror "" - eerror "ie: alertnotify=echo %%s | mail -s \"Dash Alert\"" \ + eerror "ie: alertnotify=echo %%s | mail -s \"Dash Core Alert\"" \ "admin@foo.com" eerror "" return 1 diff --git a/doc/Doxyfile b/doc/Doxyfile index 8df93f9bb..26b1ec7e7 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -28,7 +28,7 @@ DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = Dash +PROJECT_NAME = "Dash Core" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/doc/README.md b/doc/README.md index 2fd35e3ed..e0945693b 100644 --- a/doc/README.md +++ b/doc/README.md @@ -37,7 +37,7 @@ for help and more information. Building --------------------- -The following are developer notes on how to build Dash on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc. +The following are developer notes on how to build Dash Core on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc. - [OS X Build Notes](build-osx.md) - [Unix Build Notes](build-unix.md) @@ -47,7 +47,7 @@ The following are developer notes on how to build Dash on your native platform. Development --------------------- -The Dash repo's [root README](/README.md) contains relevant information on the development process and automated testing. +The Dash Core repo's [root README](/README.md) contains relevant information on the development process and automated testing. - [Developer Notes](developer-notes.md) - [Multiwallet Qt Development](multiwallet-qt.md) diff --git a/doc/build-osx.md b/doc/build-osx.md index 49e31d81f..2cf8588f0 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -36,14 +36,14 @@ Instructions: Homebrew NOTE: Building with Qt4 is still supported, however, could result in a broken UI. As such, building with Qt5 is recommended. -### Building `dash` +### Building `Dash Core` 1. Clone the GitHub tree to get the source code and go into the directory. git clone https://github.com/dashpay/dash.git cd dash -2. Build dash-core: +2. Build Dash Core: This will configure and build the headless dash binaries as well as the gui (if Qt is found). You can disable the gui build by passing `--without-gui` to configure. @@ -81,7 +81,7 @@ You can ignore this section if you are building `dashd` for your own use. dashd/dash-cli binaries are not included in the Dash-Qt.app bundle. -If you are building `dashd` or `Dsah Core` for others, your build machine should be set up +If you are building `dashd` or `Dash Core` for others, your build machine should be set up as follows for maximum compatibility: All dependencies should be compiled with these flags: diff --git a/doc/gitian-building.md b/doc/gitian-building.md index 386da6cfe..4b98b235b 100644 --- a/doc/gitian-building.md +++ b/doc/gitian-building.md @@ -1,7 +1,7 @@ Gitian building ================ -*Setup instructions for a Gitian build of Dash using a Debian VM or physical system.* +*Setup instructions for a Gitian build of Dash Core using a Debian VM or physical system.* Gitian is the deterministic build process that is used to build the Dash Core executables. It provides a way to be reasonably sure that the @@ -26,7 +26,7 @@ Table of Contents - [Installing Gitian](#installing-gitian) - [Setting up the Gitian image](#setting-up-the-gitian-image) - [Getting and building the inputs](#getting-and-building-the-inputs) -- [Building Dash](#building-dash) +- [Building Dash Core](#building-dash-core) - [Building an alternative repository](#building-an-alternative-repository) - [Signing externally](#signing-externally) - [Uploading signatures](#uploading-signatures) @@ -344,10 +344,10 @@ manual intervention. Also optionally follow the next step: 'Seed the Gitian sour and offline git repositories' which will fetch the remaining files required for building offline. -Building Dash +Building Dash Core ---------------- -To build Dash (for Linux, OS X and Windows) just follow the steps under 'perform +To build Dash Core (for Linux, OS X and Windows) just follow the steps under 'perform Gitian builds' in [doc/release-process.md](release-process.md#perform-gitian-builds) in the dash repository. This may take some time as it will build all the dependencies needed for each descriptor. diff --git a/doc/reduce-traffic.md b/doc/reduce-traffic.md index 93d3fe062..a5b232541 100644 --- a/doc/reduce-traffic.md +++ b/doc/reduce-traffic.md @@ -3,7 +3,7 @@ Reduce Traffic Some node operators need to deal with bandwidth caps imposed by their ISPs. -By default, dash-core allows up to 125 connections to different peers, 8 of +By default, Dash Core allows up to 125 connections to different peers, 8 of which are outbound. You can therefore, have at most 117 inbound connections. The default settings can result in relatively significant traffic consumption. diff --git a/doc/release-process.md b/doc/release-process.md index 4ffff18a5..95d3ff24b 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -15,7 +15,7 @@ Check out the source code in the following directory hierarchy. git clone https://github.com/devrandom/gitian-builder.git git clone https://github.com/dashpay/dash.git -###Dash maintainers/release engineers, update (commit) version in sources +###Dash Core maintainers/release engineers, update (commit) version in sources pushd ./dash contrib/verifysfbinaries/verify.sh diff --git a/doc/tor.md b/doc/tor.md index c82970e37..8e6d9a220 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -1,7 +1,7 @@ -TOR SUPPORT IN DASH +TOR SUPPORT IN DASH CORE ======================= -It is possible to run Dash as a Tor hidden service, and connect to such services. +It is possible to run Dash Core as a Tor hidden service, and connect to such services. The following directions assume you have a Tor proxy running on port 9050. Many distributions default to having a SOCKS proxy listening on port 9050, but others @@ -10,10 +10,10 @@ port. See [Tor Project FAQ:TBBSocksPort](https://www.torproject.org/docs/faq.htm for how to properly configure Tor. -1. Run dash behind a Tor proxy +1. Run Dash Core behind a Tor proxy ---------------------------------- -The first step is running Dash behind a Tor proxy. This will already make all +The first step is running Dash Core behind a Tor proxy. This will already make all outgoing connections be anonymized, but more is possible. -proxy=ip:port Set the proxy server. If SOCKS5 is selected (default), this proxy @@ -44,7 +44,7 @@ In a typical situation, this suffices to run behind a Tor proxy: ./dashd -proxy=127.0.0.1:9050 -2. Run a dash hidden server +2. Run a Dash Core hidden server ------------------------------- If you configure your Tor system accordingly, it is possible to make your node also @@ -58,7 +58,7 @@ config file): The directory can be different of course, but (both) port numbers should be equal to your dashd's P2P listen port (9999 by default). - -externalip=X You can tell dash about its publicly reachable address using + -externalip=X You can tell Dash Core about its publicly reachable address using this option, and this can be a .onion address. Given the above configuration, you can find your onion address in /var/lib/tor/dash-service/hostname. Onion addresses are given @@ -99,7 +99,7 @@ for normal IPv4/IPv6 communication, use: ./dashd -onion=127.0.0.1:9050 -externalip=ssapp53tmftyjmjb.onion -discover -3. List of known dash Tor relays +3. List of known Dash Core Tor relays ------------------------------------ * [darkcoinie7ghp67.onion](http://darkcoinie7ghp67.onion/) diff --git a/doc/translation_process.md b/doc/translation_process.md index 004eb546d..4c2cc9104 100644 --- a/doc/translation_process.md +++ b/doc/translation_process.md @@ -1,7 +1,7 @@ Translations ============ -The Dash-Core project has been designed to support multiple localisations. This makes adding new phrases, and completely new languages easily achievable. For managing all application translations, Dash Core makes use of the Transifex online translation management tool. +The Dash Core project has been designed to support multiple localisations. This makes adding new phrases, and completely new languages easily achievable. For managing all application translations, Dash Core makes use of the Transifex online translation management tool. ### Helping to translate (using Transifex) Transifex is setup to monitor the Github repo for updates, and when code containing new translations is found, Transifex will process any changes. It may take several hours after a pull-request has been merged, to appear in the Transifex web interface. diff --git a/qa/README.md b/qa/README.md index d0bdf7bb6..efa3ef578 100644 --- a/qa/README.md +++ b/qa/README.md @@ -1,7 +1,7 @@ The [pull-tester](/qa/pull-tester/) folder contains a script to call multiple tests from the [rpc-tests](/qa/rpc-tests/) folder. -Every pull request to the dash repository is built and run through +Every pull request to the Dash Core repository is built and run through the regression test suite. You can also run all or only individual tests locally. diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py index 2af9be8b4..8d045b742 100755 --- a/qa/pull-tester/rpc-tests.py +++ b/qa/pull-tester/rpc-tests.py @@ -129,7 +129,7 @@ testScriptsExt = [ 'p2p-acceptblock.py', # TODO: works, needs dash_hash 'mempool_packages.py', 'maxuploadtarget.py', - # 'replace-by-fee.py', # RBF is disabled in Dash + # 'replace-by-fee.py', # RBF is disabled in Dash Core ] #Enable ZMQ tests diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py index 5cbbaaa38..a110d9c0f 100755 --- a/qa/rpc-tests/listtransactions.py +++ b/qa/rpc-tests/listtransactions.py @@ -111,7 +111,7 @@ class ListTransactionsTest(BitcoinTestFramework): {"category":"receive","amount":Decimal("0.1")}, {"txid":txid, "account" : "watchonly"} ) - # rbf is disabled in Dash + # rbf is disabled in Dash Core # self.run_rbf_opt_in_test() # Check that the opt-in-rbf flag works properly, for sent and received diff --git a/qa/rpc-tests/merkle_blocks.py b/qa/rpc-tests/merkle_blocks.py index 99d5a825c..a52e50675 100755 --- a/qa/rpc-tests/merkle_blocks.py +++ b/qa/rpc-tests/merkle_blocks.py @@ -71,7 +71,7 @@ class MerkleBlockTest(BitcoinTestFramework): txid_unspent = txid1 if txin_spent["txid"] != txid1 else txid2 # We cant find the block from a fully-spent tx - # Doesn't apply to Dash - we have txindex always on + # Doesn't apply to Dash Core - we have txindex always on # assert_raises(JSONRPCException, self.nodes[2].gettxoutproof, [txid_spent]) # ...but we can if we specify the block assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid_spent], blockhash)), [txid_spent]) diff --git a/src/dashd.cpp b/src/dashd.cpp index f8664bd4c..437682662 100644 --- a/src/dashd.cpp +++ b/src/dashd.cpp @@ -138,7 +138,7 @@ bool AppInit(int argc, char* argv[]) fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { - fprintf(stdout, "Dash server starting\n"); + fprintf(stdout, "Dash Core server starting\n"); // Daemonize pid_t pid = fork(); diff --git a/src/init.cpp b/src/init.cpp index 718503479..08b188b43 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -744,7 +744,7 @@ void ThreadImport(std::vector vImportFiles) } /** Sanity checks - * Ensure that Dash is running in a usable environment with all + * Ensure that Dash Core is running in a usable environment with all * necessary library support. */ bool InitSanityCheck(void) @@ -883,7 +883,7 @@ void InitLogging() fLogIPs = GetBoolArg("-logips", DEFAULT_LOGIPS); LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - LogPrintf("Dash version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); + LogPrintf("Dash Core version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); } /** Initialize dash. @@ -1159,7 +1159,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) if (strWalletFile != boost::filesystem::basename(strWalletFile) + boost::filesystem::extension(strWalletFile)) return InitError(strprintf(_("Wallet %s resides outside data directory %s"), strWalletFile, strDataDir)); #endif - // Make sure only a single Dash process is using the data directory. + // Make sure only a single Dash Core process is using the data directory. boost::filesystem::path pathLockFile = GetDataDir() / ".lock"; FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist. if (file) fclose(file); @@ -1170,7 +1170,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) if (!lock.timed_lock(boost::get_system_time() + boost::posix_time::seconds(10))) return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Dash Core is probably already running."), strDataDir)); } catch(const boost::interprocess::interprocess_exception& e) { - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.") + " %s.", strDataDir, e.what())); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Dash Core is probably already running.") + " %s.", strDataDir, e.what())); } #ifndef WIN32 diff --git a/src/main.cpp b/src/main.cpp index 922adf8a3..7993a1351 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,7 +56,7 @@ using namespace std; #if defined(NDEBUG) -# error "Dash cannot be compiled without assertions." +# error "Dash Core cannot be compiled without assertions." #endif /** diff --git a/src/net.cpp b/src/net.cpp index 1f212b4c5..e85c64f43 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1357,7 +1357,7 @@ void ThreadMapPort() } } - string strDesc = "Dash " + FormatFullVersion(); + string strDesc = "Dash Core " + FormatFullVersion(); try { while (true) { diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 4a877cc93..10256a4df 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -367,7 +367,7 @@ void BitcoinGUI::createActions() aboutQtAction->setStatusTip(tr("Show information about Qt")); aboutQtAction->setMenuRole(QAction::AboutQtRole); optionsAction = new QAction(QIcon(":/icons/" + theme + "/options"), tr("&Options..."), this); - optionsAction->setStatusTip(tr("Modify configuration options for Dash")); + optionsAction->setStatusTip(tr("Modify configuration options for Dash Core")); optionsAction->setMenuRole(QAction::PreferencesRole); toggleHideAction = new QAction(QIcon(":/icons/" + theme + "/about"), tr("&Show / Hide"), this); toggleHideAction->setStatusTip(tr("Show or hide the main Window")); @@ -414,7 +414,7 @@ void BitcoinGUI::createActions() showHelpMessageAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Command-line options"), this); showHelpMessageAction->setMenuRole(QAction::NoRole); - showHelpMessageAction->setStatusTip(tr("Show the Dash Core help message to get a list with possible Dash command-line options")); + showHelpMessageAction->setStatusTip(tr("Show the Dash Core help message to get a list with possible Dash Core command-line options")); connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked())); @@ -1037,7 +1037,7 @@ void BitcoinGUI::message(const QString &title, const QString &message, unsigned break; } } - // Append title to "Dash - " + // Append title to "Dash Core - " if (!msgType.isEmpty()) strTitle += " - " + msgType; diff --git a/src/qt/dash.cpp b/src/qt/dash.cpp index 6098bc822..4dea1bcf9 100644 --- a/src/qt/dash.cpp +++ b/src/qt/dash.cpp @@ -536,7 +536,7 @@ void BitcoinApplication::shutdownResult(int retval) void BitcoinApplication::handleRunawayException(const QString &message) { - QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Dash can no longer continue safely and will quit.") + QString("\n\n") + message); + QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Dash Core can no longer continue safely and will quit.") + QString("\n\n") + message); ::exit(1); } diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 567a082fe..09a42a567 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -288,7 +288,7 @@ - Automatically open the Dash client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled. Map port using &UPnP diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index e7f3941ab..a88cb8723 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -445,10 +445,10 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode"); if (vNodes.empty()) - throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Dash is not connected!"); + throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Dash Core is not connected!"); if (IsInitialBlockDownload()) - throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dash is downloading blocks..."); + throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dash Core is downloading blocks..."); static unsigned int nTransactionsUpdatedLast; diff --git a/src/rpcprotocol.h b/src/rpcprotocol.h index f798888c3..45ca79a56 100644 --- a/src/rpcprotocol.h +++ b/src/rpcprotocol.h @@ -27,7 +27,7 @@ enum HTTPStatusCode HTTP_SERVICE_UNAVAILABLE = 503, }; -//! Dash RPC error codes +//! Dash Core RPC error codes enum RPCErrorCode { //! Standard JSON-RPC 2.0 errors @@ -57,7 +57,7 @@ enum RPCErrorCode RPC_TRANSACTION_ALREADY_IN_CHAIN= RPC_VERIFY_ALREADY_IN_CHAIN, //! P2P client errors - RPC_CLIENT_NOT_CONNECTED = -9, //! Dash is not connected + RPC_CLIENT_NOT_CONNECTED = -9, //! Dash Core is not connected RPC_CLIENT_IN_INITIAL_DOWNLOAD = -10, //! Still downloading initial blocks RPC_CLIENT_NODE_ALREADY_ADDED = -23, //! Node is already added RPC_CLIENT_NODE_NOT_ADDED = -24, //! Node has not been added before diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 98154a6a4..358d08724 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -243,11 +243,11 @@ UniValue stop(const UniValue& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "stop\n" - "\nStop Dash server."); + "\nStop Dash Core server."); // Event loop will exit after current HTTP requests have been handled, so // this reply will get back to the client. StartShutdown(); - return "Dash server stopping"; + return "Dash Core server stopping"; } /** diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 36f65659a..84fd49712 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -486,7 +486,7 @@ UniValue dumpwallet(const UniValue& params, bool fHelp) std::sort(vKeyBirth.begin(), vKeyBirth.end()); // produce output - file << strprintf("# Wallet dump created by Dash %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); + file << strprintf("# Wallet dump created by Dash Core %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()));