sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix project name Dash -> Dash Core

Browse Source
This commit is contained in:
UdjinM6 2016-07-28 14:22:30 +03:00
parent 113e56dd8a
commit ef1612a63b
26 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -1,4 +1,4 @@
Building Dash
Building Dash Core
Use the autogen script to prepare the build environment.

2
contrib/init/dashd.conf
View File

@ -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

2
contrib/init/dashd.openrc
View File

@ -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

2
doc/Doxyfile
View File

@ -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

4
doc/README.md
View File

@ -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)

6
doc/build-osx.md
View File

@ -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:

8
doc/gitian-building.md
View File

@ -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.

2
doc/reduce-traffic.md
View File

@ -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.

2
doc/release-process.md
View File

@ -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

14
doc/tor.md
View File

@ -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/)

2
doc/translation_process.md
View File

@ -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.

2
qa/README.md
View File

@ -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.

2
qa/pull-tester/rpc-tests.py
View File

@ -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

2
qa/rpc-tests/listtransactions.py
View File

@ -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

2
qa/rpc-tests/merkle_blocks.py
View File

@ -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])

2
src/dashd.cpp
View File

@ -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();

8
src/init.cpp
View File

@ -744,7 +744,7 @@ void ThreadImport(std::vector<boost::filesystem::path> 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

2
src/main.cpp
View File

@ -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
/**

2
src/net.cpp
View File

@ -1357,7 +1357,7 @@ void ThreadMapPort()
}
}
string strDesc = "Dash " + FormatFullVersion();
string strDesc = "Dash Core " + FormatFullVersion();
try {
while (true) {

6
src/qt/bitcoingui.cpp
View File

@ -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;

2
src/qt/dash.cpp
View File

@ -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);
}

2
src/qt/forms/optionsdialog.ui
View File

@ -288,7 +288,7 @@
<item>
<widget class="QCheckBox" name="mapPortUpnp">
<property name="toolTip">
<string>Automatically open the Dash client port on the router. This only works when your router supports UPnP and it is enabled.</string>
<string>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</string>
</property>
<property name="text">
<string>Map port using &amp;UPnP</string>

4
src/rpcmining.cpp
View File

@ -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;

4
src/rpcprotocol.h
View File

@ -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

4
src/rpcserver.cpp
View File

@ -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";
}
/**

2
src/wallet/rpcdump.cpp
View File

@ -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()));