maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #373 from rnicoll/1.7-dev-ui

Browse source 
Branding overhaul for 1.7
This commit is contained in:
langerhans 2014-03-29 10:24:57 +01:00
parent 33f583328e 878bc953ce
commit 6b90b6011a
59 changed files with 287 additions and 282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -1,10 +1,10 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60]) AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 9) define(_CLIENT_VERSION_MINOR, 7)
define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true) define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2014) define(_COPYRIGHT_YEAR, 2014)
AC_INIT([Dogecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin]) AC_INIT([Dogecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin])
AC_CONFIG_AUX_DIR([src/build-aux]) AC_CONFIG_AUX_DIR([src/build-aux])

2
src/clientversion.h
View file

@ -8,7 +8,7 @@
// client versioning and copyright year // client versioning and copyright year
// //
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it // These need to be macros, as version.cpp's and dogecoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 9 #define CLIENT_VERSION_MINOR 9
#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_REVISION 0

2
src/coins.h
View file

@ -334,7 +334,7 @@ public:
// Calculate the size of the cache (in number of transactions) // Calculate the size of the cache (in number of transactions)
unsigned int GetCacheSize(); unsigned int GetCacheSize();
/** Amount of bitcoins coming in to a transaction /** Amount of dogecoins coming in to a transaction
Note that lightweight clients may not know anything besides the hash of previous transactions, Note that lightweight clients may not know anything besides the hash of previous transactions,
so may not be able to calculate this. so may not be able to calculate this.

8
src/dogecoin-cli.cpp
View file

@ -37,11 +37,11 @@ static bool AppInitRPC(int argc, char* argv[])
if (argc<2 || mapArgs.count("-?") || mapArgs.count("--help")) if (argc<2 || mapArgs.count("-?") || mapArgs.count("--help"))
{ {
// First part of help message is specific to RPC client // First part of help message is specific to RPC client
std::string strUsage = _("Bitcoin RPC client version") + " " + FormatFullVersion() + "\n\n" + std::string strUsage = _("Dogecoin RPC client version") + " " + FormatFullVersion() + "\n\n" +
_("Usage:") + "\n" + _("Usage:") + "\n" +
" bitcoin-cli [options] <command> [params] " + _("Send command to Bitcoin server") + "\n" + " dogecoin-cli [options] <command> [params] " + _("Send command to Dogecoin server") + "\n" +
" bitcoin-cli [options] help " + _("List commands") + "\n" + " dogecoin-cli [options] help " + _("List commands") + "\n" +
" bitcoin-cli [options] help <command> " + _("Get help for a command") + "\n"; " dogecoin-cli [options] help <command> " + _("Get help for a command") + "\n";
strUsage += "\n" + HelpMessageCli(true); strUsage += "\n" + HelpMessageCli(true);

26
src/dogecoind.cpp
View file

@ -20,8 +20,8 @@
* *
* \section intro_sec Introduction * \section intro_sec Introduction
* *
* This is the developer documentation of the reference client for an experimental new digital currency called Bitcoin (http://www.bitcoin.org/), * This is the developer documentation of the reference client for an experimental new digital currency called Dogecoin (http://www.dogecoin.com/),
* which enables instant payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate * which enables instant payments to anyone, anywhere in the world. Dogecoin uses peer-to-peer technology to operate
* with no central authority: managing transactions and issuing money are carried out collectively by the network. * with no central authority: managing transactions and issuing money are carried out collectively by the network.
* *
* The software is a community-driven open source project, released under the MIT license. * The software is a community-driven open source project, released under the MIT license.
@ -63,7 +63,7 @@ bool AppInit(int argc, char* argv[])
// //
// Parameters // Parameters
// //
// If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main() // If Qt is used, parameters/dogecoin.conf are parsed in qt/dogecoin.cpp's main()
ParseParameters(argc, argv); ParseParameters(argc, argv);
if (!boost::filesystem::is_directory(GetDataDir(false))) if (!boost::filesystem::is_directory(GetDataDir(false)))
{ {
@ -79,14 +79,14 @@ bool AppInit(int argc, char* argv[])
if (mapArgs.count("-?") || mapArgs.count("--help")) if (mapArgs.count("-?") || mapArgs.count("--help"))
{ {
// First part of help message is specific to bitcoind / RPC client // First part of help message is specific to dogecoind / RPC client
std::string strUsage = _("Bitcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n\n" + std::string strUsage = _("Dogecoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n\n" +
_("Usage:") + "\n" + _("Usage:") + "\n" +
" bitcoind [options] " + _("Start Bitcoin server") + "\n" + " dogecoind [options] " + _("Start Dogecoin server") + "\n" +
_("Usage (deprecated, use bitcoin-cli):") + "\n" + _("Usage (deprecated, use dogecoin-cli):") + "\n" +
" bitcoind [options] <command> [params] " + _("Send command to Bitcoin server") + "\n" + " dogecoind [options] <command> [params] " + _("Send command to Dogecoin server") + "\n" +
" bitcoind [options] help " + _("List commands") + "\n" + " dogecoind [options] help " + _("List commands") + "\n" +
" bitcoind [options] help <command> " + _("Get help for a command") + "\n"; " dogecoind [options] help <command> " + _("Get help for a command") + "\n";
strUsage += "\n" + HelpMessage(HMM_BITCOIND); strUsage += "\n" + HelpMessage(HMM_BITCOIND);
strUsage += "\n" + HelpMessageCli(false); strUsage += "\n" + HelpMessageCli(false);
@ -98,7 +98,7 @@ bool AppInit(int argc, char* argv[])
// Command-line RPC // Command-line RPC
bool fCommandLine = false; bool fCommandLine = false;
for (int i = 1; i < argc; i++) for (int i = 1; i < argc; i++)
if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "bitcoin:")) if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "dogecoin:"))
fCommandLine = true; fCommandLine = true;
if (fCommandLine) if (fCommandLine)
@ -110,7 +110,7 @@ bool AppInit(int argc, char* argv[])
fDaemon = GetBoolArg("-daemon", false); fDaemon = GetBoolArg("-daemon", false);
if (fDaemon) if (fDaemon)
{ {
fprintf(stdout, "Bitcoin server starting\n"); fprintf(stdout, "Dogecoin server starting\n");
// Daemonize // Daemonize
pid_t pid = fork(); pid_t pid = fork();
@ -168,7 +168,7 @@ int main(int argc, char* argv[])
{ {
bool fRet = false; bool fRet = false;
// Connect bitcoind signal handlers // Connect dogecoind signal handlers
noui_connect(); noui_connect();
fRet = AppInit(argc, argv); fRet = AppInit(argc, argv);

24
src/init.cpp
View file

@ -112,7 +112,7 @@ void Shutdown()
TRY_LOCK(cs_Shutdown, lockShutdown); TRY_LOCK(cs_Shutdown, lockShutdown);
if (!lockShutdown) return; if (!lockShutdown) return;
RenameThread("bitcoin-shutoff"); RenameThread("dogecoin-shutoff");
mempool.AddTransactionsUpdated(1); mempool.AddTransactionsUpdated(1);
StopRPCThreads(); StopRPCThreads();
ShutdownRPCMining(); ShutdownRPCMining();
@ -192,10 +192,10 @@ std::string HelpMessage(HelpMessageMode hmm)
{ {
string strUsage = _("Options:") + "\n"; string strUsage = _("Options:") + "\n";
strUsage += " -? " + _("This help message") + "\n"; strUsage += " -? " + _("This help message") + "\n";
strUsage += " -conf=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n"; strUsage += " -conf=<file> " + _("Specify configuration file (default: dogecoin.conf)") + "\n";
strUsage += " -datadir=<dir> " + _("Specify data directory") + "\n"; strUsage += " -datadir=<dir> " + _("Specify data directory") + "\n";
strUsage += " -testnet " + _("Use the test network") + "\n"; strUsage += " -testnet " + _("Use the test network") + "\n";
strUsage += " -pid=<file> " + _("Specify pid file (default: bitcoind.pid)") + "\n"; strUsage += " -pid=<file> " + _("Specify pid file (default: dogecoind.pid)") + "\n";
strUsage += " -gen " + _("Generate coins (default: 0)") + "\n"; strUsage += " -gen " + _("Generate coins (default: 0)") + "\n";
strUsage += " -dbcache=<n> " + strprintf(_("Set database cache size in megabytes (%d to %d, default: %d)"), nMinDbCache, nMaxDbCache, nDefaultDbCache) + "\n"; strUsage += " -dbcache=<n> " + strprintf(_("Set database cache size in megabytes (%d to %d, default: %d)"), nMinDbCache, nMaxDbCache, nDefaultDbCache) + "\n";
strUsage += " -timeout=<n> " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n"; strUsage += " -timeout=<n> " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n";
@ -203,7 +203,7 @@ std::string HelpMessage(HelpMessageMode hmm)
strUsage += " -socks=<n> " + _("Select SOCKS version for -proxy (4 or 5, default: 5)") + "\n"; strUsage += " -socks=<n> " + _("Select SOCKS version for -proxy (4 or 5, default: 5)") + "\n";
strUsage += " -onion=<ip:port> " + _("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)") + "\n"; strUsage += " -onion=<ip:port> " + _("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)") + "\n";
strUsage += " -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n"; strUsage += " -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n";
strUsage += " -port=<port> " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n"; strUsage += " -port=<port> " + _("Listen for connections on <port> (default: 22556 or testnet: 44556)") + "\n";
strUsage += " -maxconnections=<n> " + _("Maintain at most <n> connections to peers (default: 125)") + "\n"; strUsage += " -maxconnections=<n> " + _("Maintain at most <n> connections to peers (default: 125)") + "\n";
strUsage += " -addnode=<ip> " + _("Add a node to connect to and attempt to keep the connection open") + "\n"; strUsage += " -addnode=<ip> " + _("Add a node to connect to and attempt to keep the connection open") + "\n";
strUsage += " -connect=<ip> " + _("Connect only to the specified node(s)") + "\n"; strUsage += " -connect=<ip> " + _("Connect only to the specified node(s)") + "\n";
@ -255,7 +255,7 @@ std::string HelpMessage(HelpMessageMode hmm)
strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n"; strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n";
strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n"; strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n";
strUsage += " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)") + "\n"; strUsage += " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 22555 or testnet: 44555)") + "\n";
strUsage += " -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address") + "\n"; strUsage += " -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address") + "\n";
strUsage += " -rpcthreads=<n> " + _("Set the number of threads to service RPC calls (default: 4)") + "\n"; strUsage += " -rpcthreads=<n> " + _("Set the number of threads to service RPC calls (default: 4)") + "\n";
strUsage += " -blocknotify=<cmd> " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n"; strUsage += " -blocknotify=<cmd> " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n";
@ -308,7 +308,7 @@ struct CImportingNow
void ThreadImport(std::vector<boost::filesystem::path> vImportFiles) void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
{ {
RenameThread("bitcoin-loadblk"); RenameThread("dogecoin-loadblk");
// -reindex // -reindex
if (fReindex) { if (fReindex) {
@ -358,7 +358,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
} }
} }
/** Initialize bitcoin. /** Initialize dogecoin.
* @pre Parameters should be parsed and config file should be read. * @pre Parameters should be parsed and config file should be read.
*/ */
bool AppInit2(boost::thread_group& threadGroup) bool AppInit2(boost::thread_group& threadGroup)
@ -570,18 +570,18 @@ bool AppInit2(boost::thread_group& threadGroup)
if (strWalletFile != boost::filesystem::basename(strWalletFile) + boost::filesystem::extension(strWalletFile)) if (strWalletFile != boost::filesystem::basename(strWalletFile) + boost::filesystem::extension(strWalletFile))
return InitError(strprintf(_("Wallet %s resides outside data directory %s"), strWalletFile, strDataDir)); return InitError(strprintf(_("Wallet %s resides outside data directory %s"), strWalletFile, strDataDir));
#endif #endif
// Make sure only a single Bitcoin process is using the data directory. // Make sure only a single Dogecoin process is using the data directory.
boost::filesystem::path pathLockFile = GetDataDir() / ".lock"; boost::filesystem::path pathLockFile = GetDataDir() / ".lock";
FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist. FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist.
if (file) fclose(file); if (file) fclose(file);
static boost::interprocess::file_lock lock(pathLockFile.string().c_str()); static boost::interprocess::file_lock lock(pathLockFile.string().c_str());
if (!lock.try_lock()) if (!lock.try_lock())
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), strDataDir)); return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Dogecoin is probably already running."), strDataDir));
if (GetBoolArg("-shrinkdebugfile", !fDebug)) if (GetBoolArg("-shrinkdebugfile", !fDebug))
ShrinkDebugFile(); ShrinkDebugFile();
LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
LogPrintf("Bitcoin version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); LogPrintf("Dogecoin version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION)); LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
if (!fLogTimestamps) if (!fLogTimestamps)
LogPrintf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime())); LogPrintf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime()));
@ -955,10 +955,10 @@ bool AppInit2(boost::thread_group& threadGroup)
InitWarning(msg); InitWarning(msg);
} }
else if (nLoadWalletRet == DB_TOO_NEW) else if (nLoadWalletRet == DB_TOO_NEW)
strErrors << _("Error loading wallet.dat: Wallet requires newer version of Bitcoin") << "\n"; strErrors << _("Error loading wallet.dat: Wallet requires newer version of Dogecoin") << "\n";
else if (nLoadWalletRet == DB_NEED_REWRITE) else if (nLoadWalletRet == DB_NEED_REWRITE)
{ {
strErrors << _("Wallet needed to be rewritten: restart Bitcoin to complete") << "\n"; strErrors << _("Wallet needed to be rewritten: restart Dogecoin Core to complete") << "\n";
LogPrintf("%s", strErrors.str()); LogPrintf("%s", strErrors.str());
return InitError(strErrors.str()); return InitError(strErrors.str());
} }

4
src/main.cpp
View file

@ -32,7 +32,7 @@ using namespace std;
using namespace boost; using namespace boost;
#if defined(NDEBUG) #if defined(NDEBUG)
# error "Bitcoin cannot be compiled without assertions." # error "Dogecoin cannot be compiled without assertions."
#endif #endif
// //
@ -1738,7 +1738,7 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne
static CCheckQueue<CScriptCheck> scriptcheckqueue(128); static CCheckQueue<CScriptCheck> scriptcheckqueue(128);
void ThreadScriptCheck() { void ThreadScriptCheck() {
RenameThread("bitcoin-scriptch"); RenameThread("dogecoin-scriptch");
scriptcheckqueue.Thread(); scriptcheckqueue.Thread();
} }

4
src/net.cpp
View file

@ -1122,7 +1122,7 @@ void ThreadMapPort()
} }
} }
string strDesc = "Bitcoin " + FormatFullVersion(); string strDesc = "Dogecoin " + FormatFullVersion();
try { try {
while (true) { while (true) {
@ -1653,7 +1653,7 @@ bool BindListenPort(const CService &addrBind, string& strError)
{ {
int nErr = WSAGetLastError(); int nErr = WSAGetLastError();
if (nErr == WSAEADDRINUSE) if (nErr == WSAEADDRINUSE)
strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core Daemon is probably already running."), addrBind.ToString()); strError = strprintf(_("Unable to bind to %s on this computer. Dogecoin Core Daemon is probably already running."), addrBind.ToString());
else else
strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString(), nErr, strerror(nErr)); strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString(), nErr, strerror(nErr));
LogPrintf("%s\n", strError); LogPrintf("%s\n", strError);

4
src/qt/addressbookpage.cpp
View file

@ -61,11 +61,11 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
switch(tab) switch(tab)
{ {
case SendingTab: case SendingTab:
ui->labelExplanation->setText(tr("These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.")); ui->labelExplanation->setText(tr("These are your Dogecoin addresses for sending payments. Always check the amount and the receiving address before sending coins."));
ui->deleteAddress->setVisible(true); ui->deleteAddress->setVisible(true);
break; break;
case ReceivingTab: case ReceivingTab:
ui->labelExplanation->setText(tr("These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.")); ui->labelExplanation->setText(tr("These are your Dogecoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction."));
ui->deleteAddress->setVisible(false); ui->deleteAddress->setVisible(false);
break; break;
} }

2
src/qt/addresstablemodel.cpp
View file

@ -336,7 +336,7 @@ QModelIndex AddressTableModel::index(int row, int column, const QModelIndex &par
void AddressTableModel::updateEntry(const QString &address, void AddressTableModel::updateEntry(const QString &address,
const QString &label, bool isMine, const QString &purpose, int status) const QString &label, bool isMine, const QString &purpose, int status)
{ {
// Update address book model from Bitcoin core // Update address book model from Dogecoin core
priv->updateEntry(address, label, isMine, purpose, status); priv->updateEntry(address, label, isMine, purpose, status);
} }

2
src/qt/askpassphrasedialog.cpp
View file

@ -116,7 +116,7 @@ void AskPassphraseDialog::accept()
{ {
QMessageBox::warning(this, tr("Wallet encrypted"), QMessageBox::warning(this, tr("Wallet encrypted"),
"<qt>" + "<qt>" +
tr("Bitcoin will close now to finish the encryption process. " tr("Dogecoin Core will close now to finish the encryption process. "
"Remember that encrypting your wallet cannot fully protect " "Remember that encrypting your wallet cannot fully protect "
"your bitcoins from being stolen by malware infecting your computer.") + "your bitcoins from being stolen by malware infecting your computer.") +
"<br><br><b>" + "<br><br><b>" +

10
src/qt/bitcoin.cpp
View file

@ -135,7 +135,7 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons
} }
#endif #endif
/** Class encapsulating Bitcoin Core startup and shutdown. /** Class encapsulating Dogecoin Core startup and shutdown.
* Allows running startup and shutdown in a different thread from the UI thread. * Allows running startup and shutdown in a different thread from the UI thread.
*/ */
class BitcoinCore: public QObject class BitcoinCore: public QObject
@ -160,7 +160,7 @@ private:
void handleRunawayException(std::exception *e); void handleRunawayException(std::exception *e);
}; };
/** Main Bitcoin application object */ /** Main Dogecoin application object */
class BitcoinApplication: public QApplication class BitcoinApplication: public QApplication
{ {
Q_OBJECT Q_OBJECT
@ -438,7 +438,7 @@ void BitcoinApplication::shutdownResult(int retval)
void BitcoinApplication::handleRunawayException(const QString &message) void BitcoinApplication::handleRunawayException(const QString &message)
{ {
QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Bitcoin can no longer continue safely and will quit.") + QString("\n\n") + message); QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Dogecoin Core can no longer continue safely and will quit.") + QString("\n\n") + message);
::exit(1); ::exit(1);
} }
@ -501,7 +501,7 @@ int main(int argc, char *argv[])
/// - Do not call GetDataDir(true) before this step finishes /// - Do not call GetDataDir(true) before this step finishes
if (!boost::filesystem::is_directory(GetDataDir(false))) if (!boost::filesystem::is_directory(GetDataDir(false)))
{ {
QMessageBox::critical(0, QObject::tr("Bitcoin"), QMessageBox::critical(0, QObject::tr("Dogecoin Core"),
QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"]))); QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"])));
return 1; return 1;
} }
@ -515,7 +515,7 @@ int main(int argc, char *argv[])
// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause) // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
if (!SelectParamsFromCommandLine()) { if (!SelectParamsFromCommandLine()) {
QMessageBox::critical(0, QObject::tr("Bitcoin"), QObject::tr("Error: Invalid combination of -regtest and -testnet.")); QMessageBox::critical(0, QObject::tr("Dogecoin Core"), QObject::tr("Error: Invalid combination of -regtest and -testnet."));
return 1; return 1;
} }
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET

2
src/qt/bitcoinaddressvalidator.cpp
View file

@ -88,7 +88,7 @@ BitcoinAddressCheckValidator::BitcoinAddressCheckValidator(QObject *parent) :
QValidator::State BitcoinAddressCheckValidator::validate(QString &input, int &pos) const QValidator::State BitcoinAddressCheckValidator::validate(QString &input, int &pos) const
{ {
Q_UNUSED(pos); Q_UNUSED(pos);
// Validate the passed Bitcoin address // Validate the passed Dogecoin address
CBitcoinAddress addr(input.toStdString()); CBitcoinAddress addr(input.toStdString());
if (addr.IsValid()) if (addr.IsValid())
return QValidator::Acceptable; return QValidator::Acceptable;

28
src/qt/bitcoingui.cpp
View file

@ -72,7 +72,7 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
{ {
GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this); GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this);
QString windowTitle = tr("Bitcoin Core") + " - "; QString windowTitle = tr("Dogecoin Core") + " - ";
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
/* if compiled with wallet support, -disablewallet can still disable the wallet */ /* if compiled with wallet support, -disablewallet can still disable the wallet */
bool enableWallet = !GetBoolArg("-disablewallet", false); bool enableWallet = !GetBoolArg("-disablewallet", false);
@ -227,7 +227,7 @@ void BitcoinGUI::createActions(bool fIsTestnet)
tabGroup->addAction(overviewAction); tabGroup->addAction(overviewAction);
sendCoinsAction = new QAction(QIcon(":/icons/send"), tr("&Send"), this); sendCoinsAction = new QAction(QIcon(":/icons/send"), tr("&Send"), this);
sendCoinsAction->setStatusTip(tr("Send coins to a Bitcoin address")); sendCoinsAction->setStatusTip(tr("Send coins to a Dogecoin address"));
sendCoinsAction->setToolTip(sendCoinsAction->statusTip()); sendCoinsAction->setToolTip(sendCoinsAction->statusTip());
sendCoinsAction->setCheckable(true); sendCoinsAction->setCheckable(true);
sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2)); sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));
@ -263,10 +263,10 @@ void BitcoinGUI::createActions(bool fIsTestnet)
quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
quitAction->setMenuRole(QAction::QuitRole); quitAction->setMenuRole(QAction::QuitRole);
if (!fIsTestnet) if (!fIsTestnet)
aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Bitcoin Core"), this); aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Dogecoin Core"), this);
else else
aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin Core"), this); aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Dogecoin Core"), this);
aboutAction->setStatusTip(tr("Show information about Bitcoin")); aboutAction->setStatusTip(tr("Show information about Dogecoin"));
aboutAction->setMenuRole(QAction::AboutRole); aboutAction->setMenuRole(QAction::AboutRole);
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this); aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
@ -276,7 +276,7 @@ void BitcoinGUI::createActions(bool fIsTestnet)
aboutQtAction->setStatusTip(tr("Show information about Qt")); aboutQtAction->setStatusTip(tr("Show information about Qt"));
aboutQtAction->setMenuRole(QAction::AboutQtRole); aboutQtAction->setMenuRole(QAction::AboutQtRole);
optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
optionsAction->setStatusTip(tr("Modify configuration options for Bitcoin")); optionsAction->setStatusTip(tr("Modify configuration options for Dogecoin"));
optionsAction->setMenuRole(QAction::PreferencesRole); optionsAction->setMenuRole(QAction::PreferencesRole);
if (!fIsTestnet) if (!fIsTestnet)
toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Show / Hide"), this); toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Show / Hide"), this);
@ -292,9 +292,9 @@ void BitcoinGUI::createActions(bool fIsTestnet)
changePassphraseAction = new QAction(QIcon(":/icons/key"), tr("&Change Passphrase..."), this); changePassphraseAction = new QAction(QIcon(":/icons/key"), tr("&Change Passphrase..."), this);
changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption")); changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption"));
signMessageAction = new QAction(QIcon(":/icons/edit"), tr("Sign &message..."), this); signMessageAction = new QAction(QIcon(":/icons/edit"), tr("Sign &message..."), this);
signMessageAction->setStatusTip(tr("Sign messages with your Bitcoin addresses to prove you own them")); signMessageAction->setStatusTip(tr("Sign messages with your Dogecoin addresses to prove you own them"));
verifyMessageAction = new QAction(QIcon(":/icons/transaction_0"), tr("&Verify message..."), this); verifyMessageAction = new QAction(QIcon(":/icons/transaction_0"), tr("&Verify message..."), this);
verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Bitcoin addresses")); verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Dogecoin addresses"));
openRPCConsoleAction = new QAction(QIcon(":/icons/debugwindow"), tr("&Debug window"), this); openRPCConsoleAction = new QAction(QIcon(":/icons/debugwindow"), tr("&Debug window"), this);
openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console")); openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console"));
@ -308,7 +308,7 @@ void BitcoinGUI::createActions(bool fIsTestnet)
openAction->setStatusTip(tr("Open a bitcoin: URI or payment request")); openAction->setStatusTip(tr("Open a bitcoin: URI or payment request"));
showHelpMessageAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Command-line options"), this); showHelpMessageAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Command-line options"), this);
showHelpMessageAction->setStatusTip(tr("Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options")); showHelpMessageAction->setStatusTip(tr("Show the Dogecoin Core help message to get a list with possible Dogecoin command-line options"));
connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));
@ -467,12 +467,12 @@ void BitcoinGUI::createTrayIcon(bool fIsTestnet)
if (!fIsTestnet) if (!fIsTestnet)
{ {
trayIcon->setToolTip(tr("Bitcoin client")); trayIcon->setToolTip(tr("Dogecoin client"));
trayIcon->setIcon(QIcon(":/icons/toolbar")); trayIcon->setIcon(QIcon(":/icons/toolbar"));
} }
else else
{ {
trayIcon->setToolTip(tr("Bitcoin client") + " " + tr("[testnet]")); trayIcon->setToolTip(tr("Dogecoin client") + " " + tr("[testnet]"));
trayIcon->setIcon(QIcon(":/icons/toolbar_testnet")); trayIcon->setIcon(QIcon(":/icons/toolbar_testnet"));
} }
@ -614,7 +614,7 @@ void BitcoinGUI::setNumConnections(int count)
default: icon = ":/icons/connect_4"; break; default: icon = ":/icons/connect_4"; break;
} }
labelConnectionsIcon->setPixmap(QIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE)); labelConnectionsIcon->setPixmap(QIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Bitcoin network", "", count)); labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Dogecoin network", "", count));
} }
void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks) void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
@ -723,7 +723,7 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
void BitcoinGUI::message(const QString &title, const QString &message, unsigned int style, bool *ret) void BitcoinGUI::message(const QString &title, const QString &message, unsigned int style, bool *ret)
{ {
QString strTitle = tr("Bitcoin"); // default title QString strTitle = tr("Dogecoin"); // default title
// Default to information icon // Default to information icon
int nMBoxIcon = QMessageBox::Information; int nMBoxIcon = QMessageBox::Information;
int nNotifyIcon = Notificator::Information; int nNotifyIcon = Notificator::Information;
@ -749,7 +749,7 @@ void BitcoinGUI::message(const QString &title, const QString &message, unsigned
break; break;
} }
} }
// Append title to "Bitcoin - " // Append title to "Dogecoin - "
if (!msgType.isEmpty()) if (!msgType.isEmpty())
strTitle += " - " + msgType; strTitle += " - " + msgType;

47
src/qt/bitcoinstrings.cpp
View file

@ -13,14 +13,15 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"%s, you must set a rpcpassword in the configuration file:\n" "%s, you must set a rpcpassword in the configuration file:\n"
"%s\n" "%s\n"
"It is recommended you use the following random password:\n" "It is recommended you use the following random password:\n"
"rpcuser=bitcoinrpc\n" "rpcuser=dogecoinrpc\n"
"rpcpassword=%s\n" "rpcpassword=%s\n"
"(you do not need to remember this password)\n" "(you do not need to remember this password)\n"
"The username and password MUST NOT be the same.\n" "The username and password MUST NOT be the same.\n"
"If the file does not exist, create it with owner-readable-only file " "If the file does not exist, create it with owner-readable-only file "
"permissions.\n" "permissions.\n"
"It is also recommended to set alertnotify so you are notified of problems;\n" "It is also recommended to set alertnotify so you are notified of problems;\n"
"for example: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com\n"), "for example: alertnotify=echo %%s | mail -s \"Dogecoin Alert\" admin@foo."
"com\n"),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!" "Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!"
"3DES:@STRENGTH)"), "3DES:@STRENGTH)"),
@ -33,7 +34,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Bind to given address and always listen on it. Use [host]:port notation for " "Bind to given address and always listen on it. Use [host]:port notation for "
"IPv6"), "IPv6"),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Cannot obtain a lock on data directory %s. Bitcoin is probably already " "Cannot obtain a lock on data directory %s. Dogecoin is probably already "
"running."), "running."),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Enter regression test mode, which uses a special chain in which blocks can " "Enter regression test mode, which uses a special chain in which blocks can "
@ -43,6 +44,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Enter regression test mode, which uses a special chain in which blocks can " "Enter regression test mode, which uses a special chain in which blocks can "
"be solved instantly."), "be solved instantly."),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Error: Listening for incoming connections failed (listen returned error %d)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Error: The transaction was rejected! This might happen if some of the coins " "Error: The transaction was rejected! This might happen if some of the coins "
"in your wallet were already spent, such as if you used a copy of wallet.dat " "in your wallet were already spent, such as if you used a copy of wallet.dat "
"and coins were spent in the copy but not marked as spent here."), "and coins were spent in the copy but not marked as spent here."),
@ -59,7 +62,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Execute command when the best block changes (%s in cmd is replaced by block " "Execute command when the best block changes (%s in cmd is replaced by block "
"hash)"), "hash)"),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)"), "Listen for JSON-RPC connections on <port> (default: 22555 or testnet: 44555)"),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Number of seconds to keep misbehaving peers from reconnecting (default: " "Number of seconds to keep misbehaving peers from reconnecting (default: "
"86400)"), "86400)"),
@ -74,7 +77,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"This is a pre-release test build - use at your own risk - do not use for " "This is a pre-release test build - use at your own risk - do not use for "
"mining or merchant applications"), "mining or merchant applications"),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Unable to bind to %s on this computer. Bitcoin is probably already running."), "Unable to bind to %s on this computer. Dogecoin Core Daemon is probably "
"already running."),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -" "Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -"
"proxy)"), "proxy)"),
@ -82,15 +86,15 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: -paytxfee is set very high! This is the transaction fee you will " "Warning: -paytxfee is set very high! This is the transaction fee you will "
"pay if you send a transaction."), "pay if you send a transaction."),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: Displayed transactions may not be correct! You may need to upgrade, "
"or other nodes may need to upgrade."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: Please check that your computer's date and time are correct! If " "Warning: Please check that your computer's date and time are correct! If "
"your clock is wrong Bitcoin will not work properly."), "your clock is wrong Dogecoin will not work properly."),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: The network does not appear to fully agree! Some miners appear to " "Warning: The network does not appear to fully agree! Some miners appear to "
"be experiencing issues."), "be experiencing issues."),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: We do not appear to fully agree with our peers! You may need to "
"upgrade, or other nodes may need to upgrade."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: error reading wallet.dat! All keys read correctly, but transaction " "Warning: error reading wallet.dat! All keys read correctly, but transaction "
"data or address book entries might be missing or incorrect."), "data or address book entries might be missing or incorrect."),
QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", ""
@ -108,9 +112,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 i
QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"), QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"),
QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"), QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"),
QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"), QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"),
QT_TRANSLATE_NOOP("bitcoin-core", "Allow peers to set bloom filters (default: 1)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"),
QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core Daemon"),
QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin RPC client version"),
QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"),
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"),
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"),
@ -119,19 +122,21 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"),
QT_TRANSLATE_NOOP("bitcoin-core", "Clear list of wallet transactions (diagnostic tool; implies -rescan)"), QT_TRANSLATE_NOOP("bitcoin-core", "Clear list of wallet transactions (diagnostic tool; implies -rescan)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS proxy"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS proxy"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect to JSON-RPC on <port> (default: 22555 or testnet: 44555)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"), QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"),
QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"), QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Do not load the wallet and disable wallet RPC calls"), QT_TRANSLATE_NOOP("bitcoin-core", "Do not load the wallet and disable wallet RPC calls"),
QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"), QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"),
QT_TRANSLATE_NOOP("bitcoin-core", "Dogecoin Core Daemon"),
QT_TRANSLATE_NOOP("bitcoin-core", "Dogecoin RPC client version"),
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Dogecoin"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error"), QT_TRANSLATE_NOOP("bitcoin-core", "Error"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"),
@ -166,7 +171,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -mintxfee=<amount>: '%s'")
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"),
QT_TRANSLATE_NOOP("bitcoin-core", "List commands"), QT_TRANSLATE_NOOP("bitcoin-core", "List commands"),
QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 8333 or testnet: 18333)"), QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 22556 or testnet: 44556)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."),
@ -187,26 +192,26 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"),
QT_TRANSLATE_NOOP("bitcoin-core", "SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), QT_TRANSLATE_NOOP("bitcoin-core", "SSL options: (see the Bitcoin Wiki for SSL setup instructions)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Select SOCKS version for -proxy (4 or 5, default: 5)"), QT_TRANSLATE_NOOP("bitcoin-core", "Select SOCKS version for -proxy (4 or 5, default: 5)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Send command to Bitcoin server"), QT_TRANSLATE_NOOP("bitcoin-core", "Send command to Dogecoin server"),
QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"), QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"),
QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)"), QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"), QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (default: 25)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: 100)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: 100)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: %d)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: 4)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: 4)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"), QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: dogecoin.conf)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (default: 5000)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: dogecoind.pid)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"),
QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: 1)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Start Bitcoin server"), QT_TRANSLATE_NOOP("bitcoin-core", "Start Dogecoin server"),
QT_TRANSLATE_NOOP("bitcoin-core", "System error: "), QT_TRANSLATE_NOOP("bitcoin-core", "System error: "),
QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), QT_TRANSLATE_NOOP("bitcoin-core", "This help message"),
QT_TRANSLATE_NOOP("bitcoin-core", "This is intended for regression testing tools and app development."), QT_TRANSLATE_NOOP("bitcoin-core", "This is intended for regression testing tools and app development."),
@ -219,7 +224,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind r
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown -socks proxy version requested: %i"), QT_TRANSLATE_NOOP("bitcoin-core", "Unknown -socks proxy version requested: %i"),
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format"), QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format"),
QT_TRANSLATE_NOOP("bitcoin-core", "Usage (deprecated, use bitcoin-cli):"), QT_TRANSLATE_NOOP("bitcoin-core", "Usage (deprecated, use dogecoin-cli):"),
QT_TRANSLATE_NOOP("bitcoin-core", "Usage:"), QT_TRANSLATE_NOOP("bitcoin-core", "Usage:"),
QT_TRANSLATE_NOOP("bitcoin-core", "Use OpenSSL (https) for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Use OpenSSL (https) for JSON-RPC connections"),
QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: 0)"),
@ -230,7 +235,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Wait for RPC server to start"), QT_TRANSLATE_NOOP("bitcoin-core", "Wait for RPC server to start"),
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Dogecoin Core to complete"),
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet options:"),
QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"),
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Deprecated argument -debugnet ignored, use -debug=net"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Deprecated argument -debugnet ignored, use -debug=net"),

2
src/qt/editaddressdialog.cpp
View file

@ -107,7 +107,7 @@ void EditAddressDialog::accept()
break; break;
case AddressTableModel::INVALID_ADDRESS: case AddressTableModel::INVALID_ADDRESS:
QMessageBox::warning(this, windowTitle(), QMessageBox::warning(this, windowTitle(),
tr("The entered address \"%1\" is not a valid Bitcoin address.").arg(ui->addressEdit->text()), tr("The entered address \"%1\" is not a valid Dogecoin address.").arg(ui->addressEdit->text()),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
break; break;
case AddressTableModel::DUPLICATE_ADDRESS: case AddressTableModel::DUPLICATE_ADDRESS:

4
src/qt/guiutil.cpp
View file

@ -79,7 +79,7 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent)
widget->setFont(bitcoinAddressFont()); widget->setFont(bitcoinAddressFont());
#if QT_VERSION >= 0x040700 #if QT_VERSION >= 0x040700
widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)")); widget->setPlaceholderText(QObject::tr("Enter a Dogecoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
#endif #endif
widget->setValidator(new BitcoinAddressEntryValidator(parent)); widget->setValidator(new BitcoinAddressEntryValidator(parent));
widget->setCheckValidator(new BitcoinAddressCheckValidator(parent)); widget->setCheckValidator(new BitcoinAddressCheckValidator(parent));
@ -505,7 +505,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
// Write a bitcoin.desktop file to the autostart directory: // Write a bitcoin.desktop file to the autostart directory:
optionFile << "[Desktop Entry]\n"; optionFile << "[Desktop Entry]\n";
optionFile << "Type=Application\n"; optionFile << "Type=Application\n";
optionFile << "Name=Bitcoin\n"; optionFile << "Name=Dogecoin\n";
optionFile << "Exec=" << pszExePath << " -min\n"; optionFile << "Exec=" << pszExePath << " -min\n";
optionFile << "Terminal=false\n"; optionFile << "Terminal=false\n";
optionFile << "Hidden=false\n"; optionFile << "Hidden=false\n";

2
src/qt/intro.cpp
View file

@ -178,7 +178,7 @@ void Intro::pickDataDirectory()
fs::create_directory(dataDir.toStdString()); fs::create_directory(dataDir.toStdString());
break; break;
} catch(fs::filesystem_error &e) { } catch(fs::filesystem_error &e) {
QMessageBox::critical(0, tr("Bitcoin"), QMessageBox::critical(0, tr("Dogecoin"),
tr("Error: Specified data directory \"%1\" can not be created.").arg(dataDir)); tr("Error: Specified data directory \"%1\" can not be created.").arg(dataDir));
/* fall through, back to choosing screen */ /* fall through, back to choosing screen */
} }

10
src/qt/locale/bitcoin_de_AT.ts
View file

@ -3220,13 +3220,13 @@ Wohin: %4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Gib de Konfigurationsdatei aun (sunsta: bitcoin.conf)</translation> <translation>Gib de Konfigurationsdatei aun (sunsta: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Datei, wo de Prozessnumma gspeichat wiad (sunsta: bitcoin.pid)</translation> <translation>Datei, wo de Prozessnumma gspeichat wiad (sunsta: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>
@ -4023,4 +4023,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
setzn. Waunns de Datei no ned gibt, daunn eazeigs so, dass&apos; ka aundara lesn kau.</translation> setzn. Waunns de Datei no ned gibt, daunn eazeigs so, dass&apos; ka aundara lesn kau.</translation>
</message> </message>
</context> </context>
</TS> </TS>

8
src/qt/locale/bitcoin_en.ts
View file

@ -3293,13 +3293,13 @@ Address: %4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: inutoshi.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Specify configuration file (default: inutoshi.conf)</translation> <translation>Specify configuration file (default: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: inutoshi.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Specify pid file (default: inutoshi.pid)</translation> <translation>Specify pid file (default: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>

10
src/qt/locale/bitcoin_es.ts
View file

@ -3274,14 +3274,14 @@ Dirección: %4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Especificar archivo de configuración (predeterminado: bitcoin.conf) <translation>Especificar archivo de configuración (predeterminado: dogecoin.conf)
</translation> </translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Especificar archivo pid (predeterminado: bitcoin.pid) <translation>Especificar archivo pid (predeterminado: dogecoin.pid)
</translation> </translation>
</message> </message>
<message> <message>
@ -4116,4 +4116,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
Si el archivo no existe, créelo con permiso de lectura solamente del propietario.</translation> Si el archivo no existe, créelo con permiso de lectura solamente del propietario.</translation>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_es_CL.ts
View file

@ -3243,14 +3243,14 @@ Dirección: %4</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Especifica archivo de configuración (predeterminado: bitcoin.conf) <translation>Especifica archivo de configuración (predeterminado: dogecoin.conf)
</translation> </translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Especifica archivo pid (predeterminado: bitcoin.pid) <translation>Especifica archivo pid (predeterminado: dogecoin.pid)
</translation> </translation>
</message> </message>
<message> <message>
@ -4062,4 +4062,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_es_DO.ts
View file

@ -3243,14 +3243,14 @@ Dirección: %4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Especificar archivo de configuración (predeterminado: bitcoin.conf) <translation>Especificar archivo de configuración (predeterminado: dogecoin.conf)
</translation> </translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Especificar archivo pid (predeterminado: bitcoin.pid) <translation>Especificar archivo pid (predeterminado: dogecoin.pid)
</translation> </translation>
</message> </message>
<message> <message>
@ -4070,4 +4070,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
Si el archivo no existe, créelo con permiso de lectura solamente del propietario.</translation> Si el archivo no existe, créelo con permiso de lectura solamente del propietario.</translation>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_et.ts
View file

@ -3224,13 +3224,13 @@ Aadress: %4⏎</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Täpsusta sätete fail (vaikimisi: bitcoin.conf)</translation> <translation>Täpsusta sätete fail (vaikimisi: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Täpsusta PID fail (vaikimisi: bitcoin.pid)</translation> <translation>Täpsusta PID fail (vaikimisi: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>
@ -4037,4 +4037,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
Kui seda faili ei ole, loo see ainult-omanikule-lugemiseks faili õigustes.</translation> Kui seda faili ei ole, loo see ainult-omanikule-lugemiseks faili õigustes.</translation>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_fa.ts
View file

@ -3220,13 +3220,13 @@ Address: %4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>مشخص کردن فایل پیکربندی (پیش‌فرض: bitcoin.conf)</translation> <translation>مشخص کردن فایل پیکربندی (پیش‌فرض: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>مشخص کردن فایل شناسهٔ پردازش - pid - (پیش‌فرض: bitcoin.pid)</translation> <translation>مشخص کردن فایل شناسهٔ پردازش - pid - (پیش‌فرض: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>
@ -4022,4 +4022,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation> </translation>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_fi.ts
View file

@ -3225,13 +3225,13 @@ Osoite: %4</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Määritä asetustiedosto (oletus: bitcoin.conf)</translation> <translation>Määritä asetustiedosto (oletus: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Määritä pid-tiedosto (oletus: bitcoin.pid)</translation> <translation>Määritä pid-tiedosto (oletus: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>
@ -4028,4 +4028,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</translation> Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</translation>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_hi_IN.ts
View file

@ -3221,13 +3221,13 @@ Address: %4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>configuraion की फाइल का विवरण दें (default: bitcoin.conf)</translation> <translation>configuraion की फाइल का विवरण दें (default: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>pid फाइल का विवरण दें (default: bitcoin.pid)</translation> <translation>pid फाइल का विवरण दें (default: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>
@ -4022,4 +4022,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_hr.ts
View file

@ -3220,13 +3220,13 @@ Adresa:%4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Odredi konfiguracijsku datoteku (ugrađeni izbor: bitcoin.conf)</translation> <translation>Odredi konfiguracijsku datoteku (ugrađeni izbor: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Odredi proces ID datoteku (ugrađeni izbor: bitcoin.pid)</translation> <translation>Odredi proces ID datoteku (ugrađeni izbor: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>
@ -4021,4 +4021,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_la.ts
View file

@ -3224,13 +3224,13 @@ Inscriptio: %4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Specifica configurationis plicam (praedefinitum: bitcoin.conf)</translation> <translation>Specifica configurationis plicam (praedefinitum: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Specifica pid plicam (praedefinitum: bitcoin.pid)</translation> <translation>Specifica pid plicam (praedefinitum: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>
@ -4037,4 +4037,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
Si plica non existat, crea eam cum permissionibus ut solus eius dominus eam legere sinatur.</translation> Si plica non existat, crea eam cum permissionibus ut solus eius dominus eam legere sinatur.</translation>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_pl.ts
View file

@ -3267,13 +3267,13 @@ Adres: %4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Wskaż plik konfiguracyjny (domyślnie: bitcoin.conf)</translation> <translation>Wskaż plik konfiguracyjny (domyślnie: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Wskaż plik pid (domyślnie: bitcoin.pid)</translation> <translation>Wskaż plik pid (domyślnie: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>
@ -4094,4 +4094,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
Jeżeli plik nie istnieje, utwórz go z uprawnieniami właściciela-tylko-do-odczytu.</translation> Jeżeli plik nie istnieje, utwórz go z uprawnieniami właściciela-tylko-do-odczytu.</translation>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_ru.ts
View file

@ -3226,13 +3226,13 @@ Address: %4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Указать конфигурационный файл (по умолчанию: bitcoin.conf)</translation> <translation>Указать конфигурационный файл (по умолчанию: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Задать pid-файл (по умолчанию: bitcoin.pid)</translation> <translation>Задать pid-файл (по умолчанию: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>
@ -4040,4 +4040,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
Если файл не существует, создайте его и установите права доступа только для владельца.</translation> Если файл не существует, создайте его и установите права доступа только для владельца.</translation>
</message> </message>
</context> </context>
</TS> </TS>

10
src/qt/locale/bitcoin_sl_SI.ts
View file

@ -3220,13 +3220,13 @@ Naslov: %4
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: dogecoin.conf)</source>
<translation>Določi datoteko z nastavitvami (privzeta: bitcoin.conf)</translation> <translation>Določi datoteko z nastavitvami (privzeta: dogecoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: dogecoin.pid)</source>
<translation>Določi pid datoteko (privzeta: bitcoin.pid)</translation> <translation>Določi pid datoteko (privzeta: dogecoin.pid)</translation>
</message> </message>
<message> <message>
<location line="-1"/> <location line="-1"/>
@ -4021,4 +4021,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
src/qt/paymentserver.cpp
View file

@ -69,7 +69,7 @@ void PaymentServer::freeCertStore()
// //
static QString ipcServerName() static QString ipcServerName()
{ {
QString name("BitcoinQt"); QString name("DogecoinQt");
// Append a simple hash of the datadir // Append a simple hash of the datadir
// Note that GetDataDir(true) returns a different path // Note that GetDataDir(true) returns a different path
@ -414,7 +414,7 @@ void PaymentServer::handleURIOrFile(const QString& s)
emit receivedPaymentRequest(recipient); emit receivedPaymentRequest(recipient);
else else
emit message(tr("URI handling"), emit message(tr("URI handling"),
tr("URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters."), tr("URI can not be parsed! This can be caused by an invalid Dogecoin address or malformed URI parameters."),
CClientUIInterface::ICON_WARNING); CClientUIInterface::ICON_WARNING);
return; return;

BIN
src/qt/res/images/about.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
src/qt/res/images/splash.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 70 KiB

BIN
src/qt/res/images/splash_testnet.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 70 KiB

2
src/qt/rpcconsole.cpp
View file

@ -326,7 +326,7 @@ void RPCConsole::clear()
"b { color: #006060; } " "b { color: #006060; } "
); );
message(CMD_REPLY, (tr("Welcome to the Bitcoin RPC console.") + "<br>" + message(CMD_REPLY, (tr("Welcome to the Dogecoin RPC console.") + "<br>" +
tr("Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.") + "<br>" + tr("Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.") + "<br>" +
tr("Type <b>help</b> for an overview of available commands.")), true); tr("Type <b>help</b> for an overview of available commands.")), true);
} }

2
src/qt/sendcoinsdialog.cpp
View file

@ -561,7 +561,7 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text)
} }
else if (!addr.IsValid()) // Invalid address else if (!addr.IsValid()) // Invalid address
{ {
ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid Bitcoin address")); ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid Dogecoin address"));
} }
else // Valid address else // Valid address
{ {

2
src/qt/signverifymessagedialog.cpp
View file

@ -27,7 +27,7 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(QWidget *parent) :
#if QT_VERSION >= 0x040700 #if QT_VERSION >= 0x040700
ui->signatureOut_SM->setPlaceholderText(tr("Click \"Sign Message\" to generate signature")); ui->signatureOut_SM->setPlaceholderText(tr("Click \"Sign Message\" to generate signature"));
ui->addressIn_VM->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)")); ui->addressIn_VM->setPlaceholderText(tr("Enter a Dogecoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
#endif #endif
GUIUtil::setupAddressWidget(ui->addressIn_SM, this); GUIUtil::setupAddressWidget(ui->addressIn_SM, this);

2
src/qt/splashscreen.cpp
View file

@ -25,7 +25,7 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f, bool isTest
float fontFactor = 1.0; float fontFactor = 1.0;
// define text to place // define text to place
QString titleText = tr("Bitcoin Core"); QString titleText = tr("Dogecoin Core");
QString versionText = QString("Version %1").arg(QString::fromStdString(FormatFullVersion())); QString versionText = QString("Version %1").arg(QString::fromStdString(FormatFullVersion()));
QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers")); QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers"));
QString testnetAddText = QString(tr("[testnet]")); // define text to place as single text object QString testnetAddText = QString(tr("[testnet]")); // define text to place as single text object

4
src/qt/transactionrecord.cpp
View file

@ -52,7 +52,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
sub.credit = txout.nValue; sub.credit = txout.nValue;
if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address)) if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address))
{ {
// Received by Bitcoin Address // Received by Dogecoin Address
sub.type = TransactionRecord::RecvWithAddress; sub.type = TransactionRecord::RecvWithAddress;
sub.address = CBitcoinAddress(address).ToString(); sub.address = CBitcoinAddress(address).ToString();
} }
@ -113,7 +113,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
CTxDestination address; CTxDestination address;
if (ExtractDestination(txout.scriptPubKey, address)) if (ExtractDestination(txout.scriptPubKey, address))
{ {
// Sent to Bitcoin Address // Sent to Dogecoin Address
sub.type = TransactionRecord::SendToAddress; sub.type = TransactionRecord::SendToAddress;
sub.address = CBitcoinAddress(address).ToString(); sub.address = CBitcoinAddress(address).ToString();
} }

4
src/qt/utilitydialog.cpp
View file

@ -64,7 +64,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
GUIUtil::restoreWindowGeometry("nHelpMessageDialogWindow", this->size(), this); GUIUtil::restoreWindowGeometry("nHelpMessageDialogWindow", this->size(), this);
header = tr("Bitcoin Core") + " " + tr("version") + " " + header = tr("Dogecoin Core") + " " + tr("version") + " " +
QString::fromStdString(FormatFullVersion()) + "\n\n" + QString::fromStdString(FormatFullVersion()) + "\n\n" +
tr("Usage:") + "\n" + tr("Usage:") + "\n" +
" bitcoin-qt [" + tr("command-line options") + "] " + "\n"; " bitcoin-qt [" + tr("command-line options") + "] " + "\n";
@ -123,7 +123,7 @@ void ShutdownWindow::showShutdownWindow(BitcoinGUI *window)
QWidget *shutdownWindow = new QWidget(); QWidget *shutdownWindow = new QWidget();
QVBoxLayout *layout = new QVBoxLayout(); QVBoxLayout *layout = new QVBoxLayout();
layout->addWidget(new QLabel( layout->addWidget(new QLabel(
tr("Bitcoin Core is shutting down...") + "<br /><br />" + tr("Dogecoin Core is shutting down...") + "<br /><br />" +
tr("Do not shut down the computer until this window disappears."))); tr("Do not shut down the computer until this window disappears.")));
shutdownWindow->setLayout(layout); shutdownWindow->setLayout(layout);

4
src/rpcblockchain.cpp
View file

@ -144,7 +144,7 @@ Value getrawmempool(const Array& params, bool fHelp)
"{ (json object)\n" "{ (json object)\n"
" \"transactionid\" : { (json object)\n" " \"transactionid\" : { (json object)\n"
" \"size\" : n, (numeric) transaction size in bytes\n" " \"size\" : n, (numeric) transaction size in bytes\n"
" \"fee\" : n, (numeric) transaction fee in bitcoins\n" " \"fee\" : n, (numeric) transaction fee in Dogecoins\n"
" \"time\" : n, (numeric) local time transaction entered pool in seconds since 1 Jan 1970 GMT\n" " \"time\" : n, (numeric) local time transaction entered pool in seconds since 1 Jan 1970 GMT\n"
" \"height\" : n, (numeric) block height when transaction entered pool\n" " \"height\" : n, (numeric) block height when transaction entered pool\n"
" \"startingpriority\" : n, (numeric) priority when transaction entered pool\n" " \"startingpriority\" : n, (numeric) priority when transaction entered pool\n"
@ -345,7 +345,7 @@ Value gettxout(const Array& params, bool fHelp)
" \"hex\" : \"hex\", (string) \n" " \"hex\" : \"hex\", (string) \n"
" \"reqSigs\" : n, (numeric) Number of required signatures\n" " \"reqSigs\" : n, (numeric) Number of required signatures\n"
" \"type\" : \"pubkeyhash\", (string) The type, eg pubkeyhash\n" " \"type\" : \"pubkeyhash\", (string) The type, eg pubkeyhash\n"
" \"addresses\" : [ (array of string) array of bitcoin addresses\n" " \"addresses\" : [ (array of string) array of dogecoin addresses\n"
" \"bitcoinaddress\" (string) bitcoin address\n" " \"bitcoinaddress\" (string) bitcoin address\n"
" ,...\n" " ,...\n"
" ]\n" " ]\n"

4
src/rpcclient.cpp
View file

@ -254,7 +254,7 @@ std::string HelpMessageCli(bool mainProgram)
{ {
strUsage += _("Options:") + "\n"; strUsage += _("Options:") + "\n";
strUsage += " -? " + _("This help message") + "\n"; strUsage += " -? " + _("This help message") + "\n";
strUsage += " -conf=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n"; strUsage += " -conf=<file> " + _("Specify configuration file (default: dogecoin.conf)") + "\n";
strUsage += " -datadir=<dir> " + _("Specify data directory") + "\n"; strUsage += " -datadir=<dir> " + _("Specify data directory") + "\n";
strUsage += " -testnet " + _("Use the test network") + "\n"; strUsage += " -testnet " + _("Use the test network") + "\n";
strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be " strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be "
@ -264,7 +264,7 @@ std::string HelpMessageCli(bool mainProgram)
} }
strUsage += " -rpcconnect=<ip> " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n"; strUsage += " -rpcconnect=<ip> " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n";
strUsage += " -rpcport=<port> " + _("Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)") + "\n"; strUsage += " -rpcport=<port> " + _("Connect to JSON-RPC on <port> (default: 22555 or testnet: 44555)") + "\n";
strUsage += " -rpcwait " + _("Wait for RPC server to start") + "\n"; strUsage += " -rpcwait " + _("Wait for RPC server to start") + "\n";
strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n"; strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n";
strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n"; strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n";

4
src/rpcclient.h
View file

@ -14,11 +14,11 @@ int CommandLineRPC(int argc, char *argv[]);
json_spirit::Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams); json_spirit::Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams);
/** Show help message for bitcoin-cli. /** Show help message for dogecoin-cli.
* The mainProgram argument is used to determine whether to show this message as main program * The mainProgram argument is used to determine whether to show this message as main program
* (and include some common options) or as sub-header of another help message. * (and include some common options) or as sub-header of another help message.
* *
* @note the argument can be removed once bitcoin-cli functionality is removed from bitcoind * @note the argument can be removed once dogecoin-cli functionality is removed from bitcoind
*/ */
std::string HelpMessageCli(bool mainProgram); std::string HelpMessageCli(bool mainProgram);

14
src/rpcdump.cpp
View file

@ -69,10 +69,10 @@ Value importprivkey(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() < 1 || params.size() > 3) if (fHelp || params.size() < 1 || params.size() > 3)
throw runtime_error( throw runtime_error(
"importprivkey \"bitcoinprivkey\" ( \"label\" rescan )\n" "importprivkey \"dogecoinprivkey\" ( \"label\" rescan )\n"
"\nAdds a private key (as returned by dumpprivkey) to your wallet.\n" "\nAdds a private key (as returned by dumpprivkey) to your wallet.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"bitcoinprivkey\" (string, required) The private key (see dumpprivkey)\n" "1. \"dogecoinprivkey\" (string, required) The private key (see dumpprivkey)\n"
"2. \"label\" (string, optional) an optional label\n" "2. \"label\" (string, optional) an optional label\n"
"3. rescan (boolean, optional, default=true) Rescan the wallet for transactions\n" "3. rescan (boolean, optional, default=true) Rescan the wallet for transactions\n"
"\nExamples:\n" "\nExamples:\n"
@ -227,11 +227,11 @@ Value dumpprivkey(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() != 1) if (fHelp || params.size() != 1)
throw runtime_error( throw runtime_error(
"dumpprivkey \"bitcoinaddress\"\n" "dumpprivkey \"dogecoinaddress\"\n"
"\nReveals the private key corresponding to 'bitcoinaddress'.\n" "\nReveals the private key corresponding to 'dogecoinaddress'.\n"
"Then the importprivkey can be used with this output\n" "Then the importprivkey can be used with this output\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"bitcoinaddress\" (string, required) The bitcoin address for the private key\n" "1. \"dogecoinaddress\" (string, required) The Dogecoin address for the private key\n"
"\nResult:\n" "\nResult:\n"
"\"key\" (string) The private key\n" "\"key\" (string) The private key\n"
"\nExamples:\n" "\nExamples:\n"
@ -245,7 +245,7 @@ Value dumpprivkey(const Array& params, bool fHelp)
string strAddress = params[0].get_str(); string strAddress = params[0].get_str();
CBitcoinAddress address; CBitcoinAddress address;
if (!address.SetString(strAddress)) if (!address.SetString(strAddress))
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dogecoin address");
CKeyID keyID; CKeyID keyID;
if (!address.GetKeyID(keyID)) if (!address.GetKeyID(keyID))
throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key"); throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key");
@ -290,7 +290,7 @@ Value dumpwallet(const Array& params, bool fHelp)
std::sort(vKeyBirth.begin(), vKeyBirth.end()); std::sort(vKeyBirth.begin(), vKeyBirth.end());
// produce output // produce output
file << strprintf("# Wallet dump created by Bitcoin %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); file << strprintf("# Wallet dump created by Dogecoin %s (%s)\n", CLIENT_BUILD, CLIENT_DATE);
file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime())); 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("# * 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()->nTime)); file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->nTime));

10
src/rpcmining.cpp
View file

@ -119,7 +119,7 @@ Value getgenerate(const Array& params, bool fHelp)
throw runtime_error( throw runtime_error(
"getgenerate\n" "getgenerate\n"
"\nReturn if the server is set to generate coins or not. The default is false.\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 bitcoin.conf setting gen)\n" "It is set with the command line argument -gen (or dogecoin.conf setting gen)\n"
"It can also be set with the setgenerate call.\n" "It can also be set with the setgenerate call.\n"
"\nResult\n" "\nResult\n"
"true|false (boolean) If the server is set to generate coins or not\n" "true|false (boolean) If the server is set to generate coins or not\n"
@ -298,10 +298,10 @@ Value getwork(const Array& params, bool fHelp)
); );
if (vNodes.empty()) if (vNodes.empty())
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Bitcoin is not connected!"); throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Dogecoin is not connected!");
if (IsInitialBlockDownload()) if (IsInitialBlockDownload())
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcoin is downloading blocks..."); throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dogecoin is downloading blocks...");
typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t; typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t;
static mapNewBlock_t mapNewBlock; // FIXME: thread safety static mapNewBlock_t mapNewBlock; // FIXME: thread safety
@ -480,10 +480,10 @@ Value getblocktemplate(const Array& params, bool fHelp)
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode");
if (vNodes.empty()) if (vNodes.empty())
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Bitcoin is not connected!"); throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Dogecoin is not connected!");
if (IsInitialBlockDownload()) if (IsInitialBlockDownload())
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcoin is downloading blocks..."); throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dogecoin is downloading blocks...");
// Update block // Update block
static unsigned int nTransactionsUpdatedLast; static unsigned int nTransactionsUpdatedLast;

20
src/rpcmisc.cpp
View file

@ -37,7 +37,7 @@ Value getinfo(const Array& params, bool fHelp)
" \"version\": xxxxx, (numeric) the server version\n" " \"version\": xxxxx, (numeric) the server version\n"
" \"protocolversion\": xxxxx, (numeric) the protocol version\n" " \"protocolversion\": xxxxx, (numeric) the protocol version\n"
" \"walletversion\": xxxxx, (numeric) the wallet version\n" " \"walletversion\": xxxxx, (numeric) the wallet version\n"
" \"balance\": xxxxxxx, (numeric) the total bitcoin balance of the wallet\n" " \"balance\": xxxxxxx, (numeric) the total Dogecoin balance of the wallet\n"
" \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n" " \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n"
" \"timeoffset\": xxxxx, (numeric) the time offset\n" " \"timeoffset\": xxxxx, (numeric) the time offset\n"
" \"connections\": xxxxx, (numeric) the number of connections\n" " \"connections\": xxxxx, (numeric) the number of connections\n"
@ -128,14 +128,14 @@ Value validateaddress(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() != 1) if (fHelp || params.size() != 1)
throw runtime_error( throw runtime_error(
"validateaddress \"bitcoinaddress\"\n" "validateaddress \"dogecoinaddress\"\n"
"\nReturn information about the given bitcoin address.\n" "\nReturn information about the given dogecoin address.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"bitcoinaddress\" (string, required) The bitcoin address to validate\n" "1. \"dogecoinaddress\" (string, required) The dogecoin address to validate\n"
"\nResult:\n" "\nResult:\n"
"{\n" "{\n"
" \"isvalid\" : true|false, (boolean) If the address is valid or not. If not, this is the only property returned.\n" " \"isvalid\" : true|false, (boolean) If the address is valid or not. If not, this is the only property returned.\n"
" \"address\" : \"bitcoinaddress\", (string) The bitcoin address validated\n" " \"address\" : \"dogecoinaddress\", (string) The dogecoin address validated\n"
" \"ismine\" : true|false, (boolean) If the address is yours or not\n" " \"ismine\" : true|false, (boolean) If the address is yours or not\n"
" \"isscript\" : true|false, (boolean) If the key is a script\n" " \"isscript\" : true|false, (boolean) If the key is a script\n"
" \"pubkey\" : \"publickeyhex\", (string) The hex value of the raw public key\n" " \"pubkey\" : \"publickeyhex\", (string) The hex value of the raw public key\n"
@ -192,7 +192,7 @@ CScript _createmultisig(const Array& params)
{ {
const std::string& ks = keys[i].get_str(); const std::string& ks = keys[i].get_str();
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
// Case 1: Bitcoin address and we have full public key: // Case 1: Dogecoin address and we have full public key:
CBitcoinAddress address(ks); CBitcoinAddress address(ks);
if (pwalletMain && address.IsValid()) if (pwalletMain && address.IsValid())
{ {
@ -239,9 +239,9 @@ Value createmultisig(const Array& params, bool fHelp)
"\nArguments:\n" "\nArguments:\n"
"1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n"
"2. \"keys\" (string, required) A json array of keys which are bitcoin addresses or hex-encoded public keys\n" "2. \"keys\" (string, required) A json array of keys which are dogecoin addresses or hex-encoded public keys\n"
" [\n" " [\n"
" \"key\" (string) bitcoin address or hex-encoded public key\n" " \"key\" (string) dogecoin address or hex-encoded public key\n"
" ,...\n" " ,...\n"
" ]\n" " ]\n"
@ -276,10 +276,10 @@ Value verifymessage(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() != 3) if (fHelp || params.size() != 3)
throw runtime_error( throw runtime_error(
"verifymessage \"bitcoinaddress\" \"signature\" \"message\"\n" "verifymessage \"dogecoinaddress\" \"signature\" \"message\"\n"
"\nVerify a signed message\n" "\nVerify a signed message\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"bitcoinaddress\" (string, required) The bitcoin address to use for the signature.\n" "1. \"dogecoinaddress\" (string, required) The dogecoin address to use for the signature.\n"
"2. \"signature\" (string, required) The signature provided by the signer in base 64 encoding (see signmessage).\n" "2. \"signature\" (string, required) The signature provided by the signer in base 64 encoding (see signmessage).\n"
"3. \"message\" (string, required) The message that was signed.\n" "3. \"message\" (string, required) The message that was signed.\n"
"\nResult:\n" "\nResult:\n"

6
src/rpcnet.cpp
View file

@ -162,8 +162,8 @@ Value addnode(const Array& params, bool fHelp)
"1. \"node\" (string, required) The node (see getpeerinfo for nodes)\n" "1. \"node\" (string, required) The node (see getpeerinfo for nodes)\n"
"2. \"command\" (string, required) 'add' to add a node to the list, 'remove' to remove a node from the list, 'onetry' to try a connection to the node once\n" "2. \"command\" (string, required) 'add' to add a node to the list, 'remove' to remove a node from the list, 'onetry' to try a connection to the node once\n"
"\nExamples:\n" "\nExamples:\n"
+ HelpExampleCli("addnode", "\"192.168.0.6:8333\" \"onetry\"") + HelpExampleCli("addnode", "\"192.168.0.6:22556\" \"onetry\"")
+ HelpExampleRpc("addnode", "\"192.168.0.6:8333\", \"onetry\"") + HelpExampleRpc("addnode", "\"192.168.0.6:22556\", \"onetry\"")
); );
string strNode = params[0].get_str(); string strNode = params[0].get_str();
@ -216,7 +216,7 @@ Value getaddednodeinfo(const Array& params, bool fHelp)
" \"connected\" : true|false, (boolean) If connected\n" " \"connected\" : true|false, (boolean) If connected\n"
" \"addresses\" : [\n" " \"addresses\" : [\n"
" {\n" " {\n"
" \"address\" : \"192.168.0.201:8333\", (string) The bitcoin server host and port\n" " \"address\" : \"192.168.0.201:22556\", (string) The Dogecoin server host and port\n"
" \"connected\" : \"outbound\" (string) connection, inbound or outbound\n" " \"connected\" : \"outbound\" (string) connection, inbound or outbound\n"
" }\n" " }\n"
" ,...\n" " ,...\n"

8
src/rpcprotocol.cpp
View file

@ -37,7 +37,7 @@ string HTTPPost(const string& strMsg, const map<string,string>& mapRequestHeader
{ {
ostringstream s; ostringstream s;
s << "POST / HTTP/1.1\r\n" s << "POST / HTTP/1.1\r\n"
<< "User-Agent: bitcoin-json-rpc/" << FormatFullVersion() << "\r\n" << "User-Agent: dogecoin-json-rpc/" << FormatFullVersion() << "\r\n"
<< "Host: 127.0.0.1\r\n" << "Host: 127.0.0.1\r\n"
<< "Content-Type: application/json\r\n" << "Content-Type: application/json\r\n"
<< "Content-Length: " << strMsg.size() << "\r\n" << "Content-Length: " << strMsg.size() << "\r\n"
@ -68,7 +68,7 @@ string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
if (nStatus == HTTP_UNAUTHORIZED) if (nStatus == HTTP_UNAUTHORIZED)
return strprintf("HTTP/1.0 401 Authorization Required\r\n" return strprintf("HTTP/1.0 401 Authorization Required\r\n"
"Date: %s\r\n" "Date: %s\r\n"
"Server: bitcoin-json-rpc/%s\r\n" "Server: dogecoin-json-rpc/%s\r\n"
"WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n" "WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n"
"Content-Type: text/html\r\n" "Content-Type: text/html\r\n"
"Content-Length: 296\r\n" "Content-Length: 296\r\n"
@ -95,7 +95,7 @@ string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
"Connection: %s\r\n" "Connection: %s\r\n"
"Content-Length: %"PRIszu"\r\n" "Content-Length: %"PRIszu"\r\n"
"Content-Type: application/json\r\n" "Content-Type: application/json\r\n"
"Server: bitcoin-json-rpc/%s\r\n" "Server: dogecoin-json-rpc/%s\r\n"
"\r\n" "\r\n"
"%s", "%s",
nStatus, nStatus,
@ -217,7 +217,7 @@ int ReadHTTPMessage(std::basic_istream<char>& stream, map<string,
} }
// //
// JSON-RPC protocol. Bitcoin speaks version 1.0 for maximum compatibility, // JSON-RPC protocol. Dogecoin speaks version 1.0 for maximum compatibility,
// but uses JSON-RPC 1.1/2.0 standards for parts of the 1.0 standard that were // but uses JSON-RPC 1.1/2.0 standards for parts of the 1.0 standard that were
// unspecified (HTTP errors and contents of 'error'). // unspecified (HTTP errors and contents of 'error').
// //

24
src/rpcrawtransaction.cpp
View file

@ -152,7 +152,7 @@ Value getrawtransaction(const Array& params, bool fHelp)
" \"reqSigs\" : n, (numeric) The required sigs\n" " \"reqSigs\" : n, (numeric) The required sigs\n"
" \"type\" : \"pubkeyhash\", (string) The type, eg 'pubkeyhash'\n" " \"type\" : \"pubkeyhash\", (string) The type, eg 'pubkeyhash'\n"
" \"addresses\" : [ (json array of string)\n" " \"addresses\" : [ (json array of string)\n"
" \"bitcoinaddress\" (string) bitcoin address\n" " \"dogecoinaddress\" (string) Dogecoin address\n"
" ,...\n" " ,...\n"
" ]\n" " ]\n"
" }\n" " }\n"
@ -209,9 +209,9 @@ Value listunspent(const Array& params, bool fHelp)
"\nArguments:\n" "\nArguments:\n"
"1. minconf (numeric, optional, default=1) The minimum confirmationsi to filter\n" "1. minconf (numeric, optional, default=1) The minimum confirmationsi to filter\n"
"2. maxconf (numeric, optional, default=9999999) The maximum confirmations to filter\n" "2. maxconf (numeric, optional, default=9999999) The maximum confirmations to filter\n"
"3. \"addresses\" (string) A json array of bitcoin addresses to filter\n" "3. \"addresses\" (string) A json array of Dogecoin addresses to filter\n"
" [\n" " [\n"
" \"address\" (string) bitcoin address\n" " \"address\" (string) Dogecoin address\n"
" ,...\n" " ,...\n"
" ]\n" " ]\n"
"\nResult\n" "\nResult\n"
@ -219,7 +219,7 @@ Value listunspent(const Array& params, bool fHelp)
" {\n" " {\n"
" \"txid\" : \"txid\", (string) the transaction id \n" " \"txid\" : \"txid\", (string) the transaction id \n"
" \"vout\" : n, (numeric) the vout value\n" " \"vout\" : n, (numeric) the vout value\n"
" \"address\" : \"address\", (string) the bitcoin address\n" " \"address\" : \"address\", (string) the Dogecoin address\n"
" \"account\" : \"account\", (string) The associated account, or \"\" for the default account\n" " \"account\" : \"account\", (string) The associated account, or \"\" for the default account\n"
" \"scriptPubKey\" : \"key\", (string) the script key\n" " \"scriptPubKey\" : \"key\", (string) the script key\n"
" \"amount\" : x.xxx, (numeric) the transaction amount in doge\n" " \"amount\" : x.xxx, (numeric) the transaction amount in doge\n"
@ -252,7 +252,7 @@ Value listunspent(const Array& params, bool fHelp)
{ {
CBitcoinAddress address(input.get_str()); CBitcoinAddress address(input.get_str());
if (!address.IsValid()) if (!address.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Bitcoin address: ")+input.get_str()); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Dogecoin address: ")+input.get_str());
if (setAddress.count(address)) if (setAddress.count(address))
throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+input.get_str()); throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+input.get_str());
setAddress.insert(address); setAddress.insert(address);
@ -332,7 +332,7 @@ Value createrawtransaction(const Array& params, bool fHelp)
" ]\n" " ]\n"
"2. \"addresses\" (string, required) a json object with addresses as keys and amounts as values\n" "2. \"addresses\" (string, required) a json object with addresses as keys and amounts as values\n"
" {\n" " {\n"
" \"address\": x.xxx (numeric, required) The key is the bitcoin address, the value is the doge amount\n" " \"address\": x.xxx (numeric, required) The key is the Dogecoin address, the value is the doge amount\n"
" ,...\n" " ,...\n"
" }\n" " }\n"
@ -373,7 +373,7 @@ Value createrawtransaction(const Array& params, bool fHelp)
{ {
CBitcoinAddress address(s.name_); CBitcoinAddress address(s.name_);
if (!address.IsValid()) if (!address.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Bitcoin address: ")+s.name_); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Dogecoin address: ")+s.name_);
if (setAddress.count(address)) if (setAddress.count(address))
throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+s.name_); throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+s.name_);
@ -405,12 +405,12 @@ Value decoderawtransaction(const Array& params, bool fHelp)
"\nResult:\n" "\nResult:\n"
"{\n" "{\n"
" \"hex\" : \"data\", (string) The serialized, hex-encoded data for 'txid'\n" " \"hex\" : \"data\", (string) The serialized, hex-encoded data for 'txid'\n"
" \"txid\" : \"id\", (string) The transaction id (same as provided)\n" " \"txid\" : \"id\", (string) The transaction ID (same as provided)\n"
" \"version\" : n, (numeric) The version\n" " \"version\" : n, (numeric) The version\n"
" \"locktime\" : ttt, (numeric) The lock time\n" " \"locktime\" : ttt, (numeric) The lock time\n"
" \"vin\" : [ (array of json objects)\n" " \"vin\" : [ (array of json objects)\n"
" {\n" " {\n"
" \"txid\": \"id\", (string) The transaction id\n" " \"txid\": \"id\", (string) The transaction ID\n"
" \"vout\": n, (numeric) The output number\n" " \"vout\": n, (numeric) The output number\n"
" \"scriptSig\": { (json object) The script\n" " \"scriptSig\": { (json object) The script\n"
" \"asm\": \"asm\", (string) asm\n" " \"asm\": \"asm\", (string) asm\n"
@ -430,7 +430,7 @@ Value decoderawtransaction(const Array& params, bool fHelp)
" \"reqSigs\" : n, (numeric) The required sigs\n" " \"reqSigs\" : n, (numeric) The required sigs\n"
" \"type\" : \"pubkeyhash\", (string) The type, eg 'pubkeyhash'\n" " \"type\" : \"pubkeyhash\", (string) The type, eg 'pubkeyhash'\n"
" \"addresses\" : [ (json array of string)\n" " \"addresses\" : [ (json array of string)\n"
" \"12tvKAXCxZjSmdNbao16dKXC8tRWfcF5oc\" (string) bitcoin address\n" " \"12tvKAXCxZjSmdNbao16dKXC8tRWfcF5oc\" (string) Dogecoin address\n"
" ,...\n" " ,...\n"
" ]\n" " ]\n"
" }\n" " }\n"
@ -475,11 +475,11 @@ Value decodescript(const Array& params, bool fHelp)
"\nResult:\n" "\nResult:\n"
"{\n" "{\n"
" \"asm\":\"asm\", (string) Script public key\n" " \"asm\":\"asm\", (string) Script public key\n"
" \"hex\":\"hex\", (string) hex encoded public key\n" " \"hex\":\"hex\", (string) Hex encoded public key\n"
" \"type\":\"type\", (string) The output type\n" " \"type\":\"type\", (string) The output type\n"
" \"reqSigs\": n, (numeric) The required signatures\n" " \"reqSigs\": n, (numeric) The required signatures\n"
" \"addresses\": [ (json array of string)\n" " \"addresses\": [ (json array of string)\n"
" \"address\" (string) bitcoin address\n" " \"address\" (string) Dogecoin address\n"
" ,...\n" " ,...\n"
" ],\n" " ],\n"
" \"p2sh\",\"address\" (string) script address\n" " \"p2sh\",\"address\" (string) script address\n"

14
src/rpcserver.cpp
View file

@ -208,10 +208,10 @@ Value stop(const Array& params, bool fHelp)
if (fHelp || params.size() > 1) if (fHelp || params.size() > 1)
throw runtime_error( throw runtime_error(
"stop\n" "stop\n"
"\nStop Bitcoin server."); "\nStop Dogecoin server.");
// Shutdown will take long enough that the response should get back // Shutdown will take long enough that the response should get back
StartShutdown(); StartShutdown();
return "Bitcoin server stopping"; return "Dogecoin server stopping";
} }
@ -498,7 +498,7 @@ void StartRPCThreads()
{ {
unsigned char rand_pwd[32]; unsigned char rand_pwd[32];
RAND_bytes(rand_pwd, 32); RAND_bytes(rand_pwd, 32);
string strWhatAmI = "To use bitcoind"; string strWhatAmI = "To use dogecoind";
if (mapArgs.count("-server")) if (mapArgs.count("-server"))
strWhatAmI = strprintf(_("To use the %s option"), "\"-server\""); strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
else if (mapArgs.count("-daemon")) else if (mapArgs.count("-daemon"))
@ -507,13 +507,13 @@ void StartRPCThreads()
_("%s, you must set a rpcpassword in the configuration file:\n" _("%s, you must set a rpcpassword in the configuration file:\n"
"%s\n" "%s\n"
"It is recommended you use the following random password:\n" "It is recommended you use the following random password:\n"
"rpcuser=bitcoinrpc\n" "rpcuser=dogecoinrpc\n"
"rpcpassword=%s\n" "rpcpassword=%s\n"
"(you do not need to remember this password)\n" "(you do not need to remember this password)\n"
"The username and password MUST NOT be the same.\n" "The username and password MUST NOT be the same.\n"
"If the file does not exist, create it with owner-readable-only file permissions.\n" "If the file does not exist, create it with owner-readable-only file permissions.\n"
"It is also recommended to set alertnotify so you are notified of problems;\n" "It is also recommended to set alertnotify so you are notified of problems;\n"
"for example: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com\n"), "for example: alertnotify=echo %%s | mail -s \"Dogecoin Alert\" admin@foo.com\n"),
strWhatAmI, strWhatAmI,
GetConfigFile().string(), GetConfigFile().string(),
EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32)), EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32)),
@ -860,12 +860,12 @@ json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_s
} }
std::string HelpExampleCli(string methodname, string args){ std::string HelpExampleCli(string methodname, string args){
return "> bitcoin-cli " + methodname + " " + args + "\n"; return "> dogecoin-cli " + methodname + " " + args + "\n";
} }
std::string HelpExampleRpc(string methodname, string args){ std::string HelpExampleRpc(string methodname, string args){
return "> curl --user myusername --data-binary '{\"jsonrpc\": \"1.0\", \"id\":\"curltest\", " return "> curl --user myusername --data-binary '{\"jsonrpc\": \"1.0\", \"id\":\"curltest\", "
"\"method\": \"" + methodname + "\", \"params\": [" + args + "] }' -H 'content-type: text/plain;' http://127.0.0.1:8332/\n"; "\"method\": \"" + methodname + "\", \"params\": [" + args + "] }' -H 'content-type: text/plain;' http://127.0.0.1:22555/\n";
} }
const CRPCTable tableRPC; const CRPCTable tableRPC;

82
src/rpcwallet.cpp
View file

@ -76,13 +76,13 @@ Value getnewaddress(const Array& params, bool fHelp)
if (fHelp || params.size() > 1) if (fHelp || params.size() > 1)
throw runtime_error( throw runtime_error(
"getnewaddress ( \"account\" )\n" "getnewaddress ( \"account\" )\n"
"\nReturns a new Bitcoin address for receiving payments.\n" "\nReturns a new Dogecoin address for receiving payments.\n"
"If 'account' is specified (recommended), it is added to the address book \n" "If 'account' is specified (recommended), it is added to the address book \n"
"so payments received with the address will be credited to 'account'.\n" "so payments received with the address will be credited to 'account'.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"account\" (string, optional) The account name for the address to be linked to. if not provided, the default account \"\" is used. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created if there is no account by the given name.\n" "1. \"account\" (string, optional) The account name for the address to be linked to. if not provided, the default account \"\" is used. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created if there is no account by the given name.\n"
"\nResult:\n" "\nResult:\n"
"\"bitcoinaddress\" (string) The new bitcoin address\n" "\"dogecoinaddress\" (string) The new Dogecoin address\n"
"\nExamples:\n" "\nExamples:\n"
+ HelpExampleCli("getnewaddress", "") + HelpExampleCli("getnewaddress", "")
+ HelpExampleCli("getnewaddress", "\"\"") + HelpExampleCli("getnewaddress", "\"\"")
@ -153,11 +153,11 @@ Value getaccountaddress(const Array& params, bool fHelp)
if (fHelp || params.size() != 1) if (fHelp || params.size() != 1)
throw runtime_error( throw runtime_error(
"getaccountaddress \"account\"\n" "getaccountaddress \"account\"\n"
"\nReturns the current Bitcoin address for receiving payments to this account.\n" "\nReturns the current Dogecoin address for receiving payments to this account.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"account\" (string, required) The account name for the address. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created and a new address created if there is no account by the given name.\n" "1. \"account\" (string, required) The account name for the address. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created and a new address created if there is no account by the given name.\n"
"\nResult:\n" "\nResult:\n"
"\"bitcoinaddress\" (string) The account bitcoin address\n" "\"dogecoinaddress\" (string) The account Dogecoin address\n"
"\nExamples:\n" "\nExamples:\n"
+ HelpExampleCli("getaccountaddress", "") + HelpExampleCli("getaccountaddress", "")
+ HelpExampleCli("getaccountaddress", "\"\"") + HelpExampleCli("getaccountaddress", "\"\"")
@ -181,7 +181,7 @@ Value getrawchangeaddress(const Array& params, bool fHelp)
if (fHelp || params.size() > 1) if (fHelp || params.size() > 1)
throw runtime_error( throw runtime_error(
"getrawchangeaddress\n" "getrawchangeaddress\n"
"\nReturns a new Bitcoin address, for receiving change.\n" "\nReturns a new Dogecoin address, for receiving change.\n"
"This is for use with raw transactions, NOT normal use.\n" "This is for use with raw transactions, NOT normal use.\n"
"\nResult:\n" "\nResult:\n"
"\"address\" (string) The address\n" "\"address\" (string) The address\n"
@ -210,10 +210,10 @@ Value setaccount(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() < 1 || params.size() > 2) if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error( throw runtime_error(
"setaccount \"bitcoinaddress\" \"account\"\n" "setaccount \"dogecoinaddress\" \"account\"\n"
"\nSets the account associated with the given address.\n" "\nSets the account associated with the given address.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"bitcoinaddress\" (string, required) The bitcoin address to be associated with an account.\n" "1. \"dogecoinaddress\" (string, required) The Dogecoin address to be associated with an account.\n"
"2. \"account\" (string, required) The account to assign the address to.\n" "2. \"account\" (string, required) The account to assign the address to.\n"
"\nExamples:\n" "\nExamples:\n"
+ HelpExampleCli("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"tabby\"") + HelpExampleCli("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"tabby\"")
@ -222,7 +222,7 @@ Value setaccount(const Array& params, bool fHelp)
CBitcoinAddress address(params[0].get_str()); CBitcoinAddress address(params[0].get_str());
if (!address.IsValid()) if (!address.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dogecoin address");
string strAccount; string strAccount;
@ -247,10 +247,10 @@ Value getaccount(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() != 1) if (fHelp || params.size() != 1)
throw runtime_error( throw runtime_error(
"getaccount \"bitcoinaddress\"\n" "getaccount \"dogecoinaddress\"\n"
"\nReturns the account associated with the given address.\n" "\nReturns the account associated with the given address.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"bitcoinaddress\" (string, required) The bitcoin address for account lookup.\n" "1. \"dogecoinaddress\" (string, required) The Dogecoin address for account lookup.\n"
"\nResult:\n" "\nResult:\n"
"\"accountname\" (string) the account address\n" "\"accountname\" (string) the account address\n"
"\nExamples:\n" "\nExamples:\n"
@ -260,7 +260,7 @@ Value getaccount(const Array& params, bool fHelp)
CBitcoinAddress address(params[0].get_str()); CBitcoinAddress address(params[0].get_str());
if (!address.IsValid()) if (!address.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dogecoin address");
string strAccount; string strAccount;
map<CTxDestination, CAddressBookData>::iterator mi = pwalletMain->mapAddressBook.find(address.Get()); map<CTxDestination, CAddressBookData>::iterator mi = pwalletMain->mapAddressBook.find(address.Get());
@ -280,7 +280,7 @@ Value getaddressesbyaccount(const Array& params, bool fHelp)
"1. \"account\" (string, required) The account name.\n" "1. \"account\" (string, required) The account name.\n"
"\nResult:\n" "\nResult:\n"
"[ (json array of string)\n" "[ (json array of string)\n"
" \"bitcoinaddress\" (string) a bitcoin address associated with the given account\n" " \"dogecoinaddress\" (string) a Dogecoin address associated with the given account\n"
" ,...\n" " ,...\n"
"]\n" "]\n"
"\nExamples:\n" "\nExamples:\n"
@ -306,11 +306,11 @@ Value sendtoaddress(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() < 2 || params.size() > 4) if (fHelp || params.size() < 2 || params.size() > 4)
throw runtime_error( throw runtime_error(
"sendtoaddress \"bitcoinaddress\" amount ( \"comment\" \"comment-to\" )\n" "sendtoaddress \"dogecoinaddress\" amount ( \"comment\" \"comment-to\" )\n"
"\nSent an amount to a given address. The amount is a real and is rounded to the nearest 0.00000001\n" "\nSent an amount to a given address. The amount is a real and is rounded to the nearest 0.00000001\n"
+ HelpRequiringPassphrase() + + HelpRequiringPassphrase() +
"\nArguments:\n" "\nArguments:\n"
"1. \"bitcoinaddress\" (string, required) The bitcoin address to send to.\n" "1. \"dogecoinaddress\" (string, required) The Dogecoin address to send to.\n"
"2. \"amount\" (numeric, required) The amount in doge to send. eg 100.01\n" "2. \"amount\" (numeric, required) The amount in doge to send. eg 100.01\n"
"3. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" "3. \"comment\" (string, optional) A comment used to store what the transaction is for. \n"
" This is not part of the transaction, just kept in your wallet.\n" " This is not part of the transaction, just kept in your wallet.\n"
@ -327,7 +327,7 @@ Value sendtoaddress(const Array& params, bool fHelp)
CBitcoinAddress address(params[0].get_str()); CBitcoinAddress address(params[0].get_str());
if (!address.IsValid()) if (!address.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dogecoin address");
// Amount // Amount
int64_t nAmount = AmountFromValue(params[1]); int64_t nAmount = AmountFromValue(params[1]);
@ -360,7 +360,7 @@ Value listaddressgroupings(const Array& params, bool fHelp)
"[\n" "[\n"
" [\n" " [\n"
" [\n" " [\n"
" \"bitcoinaddress\", (string) The bitcoin address\n" " \"dogecoinaddress\", (string) The Dogecoin address\n"
" amount, (numeric) The amount in doge\n" " amount, (numeric) The amount in doge\n"
" \"account\" (string, optional) The account\n" " \"account\" (string, optional) The account\n"
" ]\n" " ]\n"
@ -399,11 +399,11 @@ Value signmessage(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() != 2) if (fHelp || params.size() != 2)
throw runtime_error( throw runtime_error(
"signmessage \"bitcoinaddress\" \"message\"\n" "signmessage \"dogecoinaddress\" \"message\"\n"
"\nSign a message with the private key of an address" "\nSign a message with the private key of an address"
+ HelpRequiringPassphrase() + "\n" + HelpRequiringPassphrase() + "\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"bitcoinaddress\" (string, required) The bitcoin address to use for the private key.\n" "1. \"dogecoinaddress\" (string, required) The Dogecoin address to use for the private key.\n"
"2. \"message\" (string, required) The message to create a signature of.\n" "2. \"message\" (string, required) The message to create a signature of.\n"
"\nResult:\n" "\nResult:\n"
"\"signature\" (string) The signature of the message encoded in base 64\n" "\"signature\" (string) The signature of the message encoded in base 64\n"
@ -450,10 +450,10 @@ Value getreceivedbyaddress(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() < 1 || params.size() > 2) if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error( throw runtime_error(
"getreceivedbyaddress \"bitcoinaddress\" ( minconf )\n" "getreceivedbyaddress \"dogecoinaddress\" ( minconf )\n"
"\nReturns the total amount received by the given bitcoinaddress in transactions with at least minconf confirmations.\n" "\nReturns the total amount received by the given dogecoinaddress in transactions with at least minconf confirmations.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"bitcoinaddress\" (string, required) The bitcoin address for transactions.\n" "1. \"dogecoinaddress\" (string, required) The Dogecoin address for transactions.\n"
"2. minconf (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n" "2. minconf (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
"\nResult:\n" "\nResult:\n"
"amount (numeric) The total amount in doge received at this address.\n" "amount (numeric) The total amount in doge received at this address.\n"
@ -468,11 +468,11 @@ Value getreceivedbyaddress(const Array& params, bool fHelp)
+ HelpExampleRpc("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", 6") + HelpExampleRpc("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", 6")
); );
// Bitcoin address // Dogecoin address
CBitcoinAddress address = CBitcoinAddress(params[0].get_str()); CBitcoinAddress address = CBitcoinAddress(params[0].get_str());
CScript scriptPubKey; CScript scriptPubKey;
if (!address.IsValid()) if (!address.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dogecoin address");
scriptPubKey.SetDestination(address.Get()); scriptPubKey.SetDestination(address.Get());
if (!IsMine(*pwalletMain,scriptPubKey)) if (!IsMine(*pwalletMain,scriptPubKey))
return (double)0.0; return (double)0.0;
@ -732,13 +732,13 @@ Value sendfrom(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() < 3 || params.size() > 6) if (fHelp || params.size() < 3 || params.size() > 6)
throw runtime_error( throw runtime_error(
"sendfrom \"fromaccount\" \"tobitcoinaddress\" amount ( minconf \"comment\" \"comment-to\" )\n" "sendfrom \"fromaccount\" \"todogecoinaddress\" amount ( minconf \"comment\" \"comment-to\" )\n"
"\nSent an amount from an account to a bitcoin address.\n" "\nSent an amount from an account to a Dogecoin address.\n"
"The amount is a real and is rounded to the nearest 0.00000001." "The amount is a real and is rounded to the nearest 0.00000001."
+ HelpRequiringPassphrase() + "\n" + HelpRequiringPassphrase() + "\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"fromaccount\" (string, required) The name of the account to send funds from. May be the default account using \"\".\n" "1. \"fromaccount\" (string, required) The name of the account to send funds from. May be the default account using \"\".\n"
"2. \"tobitcoinaddress\" (string, required) The bitcoin address to send funds to.\n" "2. \"todogecoinaddress\" (string, required) The Dogecoin address to send funds to.\n"
"3. amount (numeric, required) The amount in doge. (transaction fee is added on top).\n" "3. amount (numeric, required) The amount in doge. (transaction fee is added on top).\n"
"4. minconf (numeric, optional, default=1) Only use funds with at least this many confirmations.\n" "4. minconf (numeric, optional, default=1) Only use funds with at least this many confirmations.\n"
"5. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" "5. \"comment\" (string, optional) A comment used to store what the transaction is for. \n"
@ -760,7 +760,7 @@ Value sendfrom(const Array& params, bool fHelp)
string strAccount = AccountFromValue(params[0]); string strAccount = AccountFromValue(params[0]);
CBitcoinAddress address(params[1].get_str()); CBitcoinAddress address(params[1].get_str());
if (!address.IsValid()) if (!address.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dogecoin address");
int64_t nAmount = AmountFromValue(params[2]); int64_t nAmount = AmountFromValue(params[2]);
int nMinDepth = 1; int nMinDepth = 1;
if (params.size() > 3) if (params.size() > 3)
@ -800,7 +800,7 @@ Value sendmany(const Array& params, bool fHelp)
"1. \"fromaccount\" (string, required) The account to send the funds from, can be \"\" for the default account\n" "1. \"fromaccount\" (string, required) The account to send the funds from, can be \"\" for the default account\n"
"2. \"amounts\" (string, required) A json object with addresses and amounts\n" "2. \"amounts\" (string, required) A json object with addresses and amounts\n"
" {\n" " {\n"
" \"address\":amount (numeric) The bitcoin address is the key, the numeric amount in doge is the value\n" " \"address\":amount (numeric) The Dogecoin address is the key, the numeric amount in doge is the value\n"
" ,...\n" " ,...\n"
" }\n" " }\n"
"3. minconf (numeric, optional, default=1) Only use the balance confirmed at least this many times.\n" "3. minconf (numeric, optional, default=1) Only use the balance confirmed at least this many times.\n"
@ -836,7 +836,7 @@ Value sendmany(const Array& params, bool fHelp)
{ {
CBitcoinAddress address(s.name_); CBitcoinAddress address(s.name_);
if (!address.IsValid()) if (!address.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Bitcoin address: ")+s.name_); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Dogecoin address: ")+s.name_);
if (setAddress.count(address)) if (setAddress.count(address))
throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+s.name_); throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+s.name_);
@ -879,20 +879,20 @@ Value addmultisigaddress(const Array& params, bool fHelp)
{ {
string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n" string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n"
"\nAdd a nrequired-to-sign multisignature address to the wallet.\n" "\nAdd a nrequired-to-sign multisignature address to the wallet.\n"
"Each key is a Bitcoin address or hex-encoded public key.\n" "Each key is a Dogecoin address or hex-encoded public key.\n"
"If 'account' is specified, assign address to that account.\n" "If 'account' is specified, assign address to that account.\n"
"\nArguments:\n" "\nArguments:\n"
"1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n"
"2. \"keysobject\" (string, required) A json array of bitcoin addresses or hex-encoded public keys\n" "2. \"keysobject\" (string, required) A JSON array of Dogecoin addresses or hex-encoded public keys\n"
" [\n" " [\n"
" \"address\" (string) bitcoin address or hex-encoded public key\n" " \"address\" (string) Dogecoin address or hex-encoded public key\n"
" ...,\n" " ...,\n"
" ]\n" " ]\n"
"3. \"account\" (string, optional) An account to assign the addresses to.\n" "3. \"account\" (string, optional) An account to assign the addresses to.\n"
"\nResult:\n" "\nResult:\n"
"\"bitcoinaddress\" (string) A bitcoin address associated with the keys.\n" "\"dogecoinaddress\" (string) A Dogecoin address associated with the keys.\n"
"\nExamples:\n" "\nExamples:\n"
"\nAdd a multisig address from 2 addresses\n" "\nAdd a multisig address from 2 addresses\n"
@ -1192,7 +1192,7 @@ Value listtransactions(const Array& params, bool fHelp)
" {\n" " {\n"
" \"account\":\"accountname\", (string) The account name associated with the transaction. \n" " \"account\":\"accountname\", (string) The account name associated with the transaction. \n"
" It will be \"\" for the default account.\n" " It will be \"\" for the default account.\n"
" \"address\":\"bitcoinaddress\", (string) The bitcoin address of the transaction. Not present for \n" " \"address\":\"dogecoinaddress\", (string) The Dogecoin address of the transaction. Not present for \n"
" move transactions (category = move).\n" " move transactions (category = move).\n"
" \"category\":\"send|receive|move\", (string) The transaction category. 'move' is a local (off blockchain)\n" " \"category\":\"send|receive|move\", (string) The transaction category. 'move' is a local (off blockchain)\n"
" transaction between accounts, and not associated with an address,\n" " transaction between accounts, and not associated with an address,\n"
@ -1366,7 +1366,7 @@ Value listsinceblock(const Array& params, bool fHelp)
"{\n" "{\n"
" \"transactions\": [\n" " \"transactions\": [\n"
" \"account\":\"accountname\", (string) The account name associated with the transaction. Will be \"\" for the default account.\n" " \"account\":\"accountname\", (string) The account name associated with the transaction. Will be \"\" for the default account.\n"
" \"address\":\"bitcoinaddress\", (string) The bitcoin address of the transaction. Not present for move transactions (category = move).\n" " \"address\":\"dogecoinaddress\", (string) The Dogecoin address of the transaction. Not present for move transactions (category = move).\n"
" \"category\":\"send|receive\", (string) The transaction category. 'send' has negative amounts, 'receive' has positive amounts.\n" " \"category\":\"send|receive\", (string) The transaction category. 'send' has negative amounts, 'receive' has positive amounts.\n"
" \"amount\": x.xxx, (numeric) The amount in doge. This is negative for the 'send' category, and for the 'move' category for moves \n" " \"amount\": x.xxx, (numeric) The amount in doge. This is negative for the 'send' category, and for the 'move' category for moves \n"
" outbound. It is positive for the 'receive' category, and for the 'move' category for inbound funds.\n" " outbound. It is positive for the 'receive' category, and for the 'move' category for inbound funds.\n"
@ -1453,7 +1453,7 @@ Value gettransaction(const Array& params, bool fHelp)
" \"details\" : [\n" " \"details\" : [\n"
" {\n" " {\n"
" \"account\" : \"accountname\", (string) The account name involved in the transaction, can be \"\" for the default account.\n" " \"account\" : \"accountname\", (string) The account name involved in the transaction, can be \"\" for the default account.\n"
" \"address\" : \"bitcoinaddress\", (string) The bitcoin address involved in the transaction\n" " \"address\" : \"dogecoinaddress\", (string) The Dogecoin address involved in the transaction\n"
" \"category\" : \"send|receive\", (string) The category, either 'send' or 'receive'\n" " \"category\" : \"send|receive\", (string) The category, either 'send' or 'receive'\n"
" \"amount\" : x.xxx (numeric) The amount in doge\n" " \"amount\" : x.xxx (numeric) The amount in doge\n"
" }\n" " }\n"
@ -1565,7 +1565,7 @@ Value walletpassphrase(const Array& params, bool fHelp)
throw runtime_error( throw runtime_error(
"walletpassphrase \"passphrase\" timeout\n" "walletpassphrase \"passphrase\" timeout\n"
"\nStores the wallet decryption key in memory for 'timeout' seconds.\n" "\nStores the wallet decryption key in memory for 'timeout' seconds.\n"
"This is needed prior to performing transactions related to private keys such as sending bitcoins\n" "This is needed prior to performing transactions related to private keys such as sending dogecoins\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"passphrase\" (string, required) The wallet passphrase\n" "1. \"passphrase\" (string, required) The wallet passphrase\n"
"2. timeout (numeric, required) The time to keep the decryption key in seconds.\n" "2. timeout (numeric, required) The time to keep the decryption key in seconds.\n"
@ -1705,10 +1705,10 @@ Value encryptwallet(const Array& params, bool fHelp)
"\nExamples:\n" "\nExamples:\n"
"\nEncrypt you wallet\n" "\nEncrypt you wallet\n"
+ HelpExampleCli("encryptwallet", "\"my pass phrase\"") + + HelpExampleCli("encryptwallet", "\"my pass phrase\"") +
"\nNow set the passphrase to use the wallet, such as for signing or sending bitcoin\n" "\nNow set the passphrase to use the wallet, such as for signing or sending dogecoins\n"
+ HelpExampleCli("walletpassphrase", "\"my pass phrase\"") + + HelpExampleCli("walletpassphrase", "\"my pass phrase\"") +
"\nNow we can so something like sign\n" "\nNow we can so something like sign\n"
+ HelpExampleCli("signmessage", "\"bitcoinaddress\" \"test message\"") + + HelpExampleCli("signmessage", "\"dogecoinaddress\" \"test message\"") +
"\nNow lock the wallet again by removing the passphrase\n" "\nNow lock the wallet again by removing the passphrase\n"
+ HelpExampleCli("walletlock", "") + + HelpExampleCli("walletlock", "") +
"\nAs a json rpc call\n" "\nAs a json rpc call\n"
@ -1738,7 +1738,7 @@ Value encryptwallet(const Array& params, bool fHelp)
// slack space in .dat files; that is bad if the old data is // slack space in .dat files; that is bad if the old data is
// unencrypted private keys. So: // unencrypted private keys. So:
StartShutdown(); StartShutdown();
return "wallet encrypted; Bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup."; return "wallet encrypted; Dogecoin server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup.";
} }
Value lockunspent(const Array& params, bool fHelp) Value lockunspent(const Array& params, bool fHelp)
@ -1748,7 +1748,7 @@ Value lockunspent(const Array& params, bool fHelp)
"lockunspent unlock [{\"txid\":\"txid\",\"vout\":n},...]\n" "lockunspent unlock [{\"txid\":\"txid\",\"vout\":n},...]\n"
"\nUpdates list of temporarily unspendable outputs.\n" "\nUpdates list of temporarily unspendable outputs.\n"
"Temporarily lock (lock=true) or unlock (lock=false) specified transaction outputs.\n" "Temporarily lock (lock=true) or unlock (lock=false) specified transaction outputs.\n"
"A locked transaction output will not be chosen by automatic coin selection, when spending bitcoins.\n" "A locked transaction output will not be chosen by automatic coin selection, when spending dogecoins.\n"
"Locks are stored in memory only. Nodes start with zero locked outputs, and the locked output list\n" "Locks are stored in memory only. Nodes start with zero locked outputs, and the locked output list\n"
"is always cleared (by virtue of process exit) when a node stops or fails.\n" "is always cleared (by virtue of process exit) when a node stops or fails.\n"
"Also see the listunspent call\n" "Also see the listunspent call\n"

2
src/script.cpp
View file

@ -1203,7 +1203,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
// Standard tx, sender provides pubkey, receiver adds signature // Standard tx, sender provides pubkey, receiver adds signature
mTemplates.insert(make_pair(TX_PUBKEY, CScript() << OP_PUBKEY << OP_CHECKSIG)); mTemplates.insert(make_pair(TX_PUBKEY, CScript() << OP_PUBKEY << OP_CHECKSIG));
// Bitcoin address tx, sender provides hash of pubkey, receiver provides signature and pubkey // Dogecoin address tx, sender provides hash of pubkey, receiver provides signature and pubkey
mTemplates.insert(make_pair(TX_PUBKEYHASH, CScript() << OP_DUP << OP_HASH160 << OP_PUBKEYHASH << OP_EQUALVERIFY << OP_CHECKSIG)); mTemplates.insert(make_pair(TX_PUBKEYHASH, CScript() << OP_DUP << OP_HASH160 << OP_PUBKEYHASH << OP_EQUALVERIFY << OP_CHECKSIG));
// Sender provides N pubkeys, receivers provides M signatures // Sender provides N pubkeys, receivers provides M signatures

26
src/util.cpp
View file

@ -935,7 +935,7 @@ static std::string FormatException(std::exception* pex, const char* pszThread)
char pszModule[MAX_PATH] = ""; char pszModule[MAX_PATH] = "";
GetModuleFileNameA(NULL, pszModule, sizeof(pszModule)); GetModuleFileNameA(NULL, pszModule, sizeof(pszModule));
#else #else
const char* pszModule = "bitcoin"; const char* pszModule = "dogecoin";
#endif #endif
if (pex) if (pex)
return strprintf( return strprintf(
@ -962,13 +962,13 @@ void PrintExceptionContinue(std::exception* pex, const char* pszThread)
boost::filesystem::path GetDefaultDataDir() boost::filesystem::path GetDefaultDataDir()
{ {
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
// Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin // Windows < Vista: C:\Documents and Settings\Username\Application Data\Dogecoin
// Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin // Windows >= Vista: C:\Users\Username\AppData\Roaming\Dogecoin
// Mac: ~/Library/Application Support/Bitcoin // Mac: ~/Library/Application Support/Dogecoin
// Unix: ~/.bitcoin // Unix: ~/.dogecoin
#ifdef WIN32 #ifdef WIN32
// Windows // Windows
return GetSpecialFolderPath(CSIDL_APPDATA) / "Inutoshi"; return GetSpecialFolderPath(CSIDL_APPDATA) / "Dogecoin";
#else #else
fs::path pathRet; fs::path pathRet;
char* pszHome = getenv("HOME"); char* pszHome = getenv("HOME");
@ -980,10 +980,10 @@ boost::filesystem::path GetDefaultDataDir()
// Mac // Mac
pathRet /= "Library/Application Support"; pathRet /= "Library/Application Support";
fs::create_directory(pathRet); fs::create_directory(pathRet);
return pathRet / "Inutoshi"; return pathRet / "Dogecoin";
#else #else
// Unix // Unix
return pathRet / ".inutoshi"; return pathRet / ".dogecoin";
#endif #endif
#endif #endif
} }
@ -1032,7 +1032,7 @@ void ClearDatadirCache()
boost::filesystem::path GetConfigFile() boost::filesystem::path GetConfigFile()
{ {
boost::filesystem::path pathConfigFile(GetArg("-conf", "inutoshi.conf")); boost::filesystem::path pathConfigFile(GetArg("-conf", "dogecoin.conf"));
if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile; if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile;
return pathConfigFile; return pathConfigFile;
} }
@ -1042,14 +1042,14 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
{ {
boost::filesystem::ifstream streamConfig(GetConfigFile()); boost::filesystem::ifstream streamConfig(GetConfigFile());
if (!streamConfig.good()) if (!streamConfig.good())
return; // No bitcoin.conf file is OK return; // No dogecoin.conf file is OK
set<string> setOptions; set<string> setOptions;
setOptions.insert("*"); setOptions.insert("*");
for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it) 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 bitcoin.conf // Don't overwrite existing settings so command line settings override dogecoin.conf
string strKey = string("-") + it->string_key; string strKey = string("-") + it->string_key;
if (mapSettingsRet.count(strKey) == 0) if (mapSettingsRet.count(strKey) == 0)
{ {
@ -1065,7 +1065,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
boost::filesystem::path GetPidFile() boost::filesystem::path GetPidFile()
{ {
boost::filesystem::path pathPidFile(GetArg("-pid", "inutoshi.pid")); boost::filesystem::path pathPidFile(GetArg("-pid", "dogecoin.pid"));
if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile; if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile;
return pathPidFile; return pathPidFile;
} }
@ -1298,7 +1298,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nTime)
if (!fMatch) if (!fMatch)
{ {
fDone = true; fDone = true;
string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly."); string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Dogecoin will not work properly.");
strMiscWarning = strMessage; strMiscWarning = strMessage;
LogPrintf("*** %s\n", strMessage); LogPrintf("*** %s\n", strMessage);
uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING); uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING);

4
src/util.h
View file

@ -544,7 +544,7 @@ inline uint32_t ByteReverse(uint32_t value)
// threadGroup.create_thread(boost::bind(&LoopForever<boost::function<void()> >, "nothing", f, milliseconds)); // threadGroup.create_thread(boost::bind(&LoopForever<boost::function<void()> >, "nothing", f, milliseconds));
template <typename Callable> void LoopForever(const char* name, Callable func, int64_t msecs) template <typename Callable> void LoopForever(const char* name, Callable func, int64_t msecs)
{ {
std::string s = strprintf("bitcoin-%s", name); std::string s = strprintf("dogecoin-%s", name);
RenameThread(s.c_str()); RenameThread(s.c_str());
LogPrintf("%s thread start\n", name); LogPrintf("%s thread start\n", name);
try try
@ -572,7 +572,7 @@ template <typename Callable> void LoopForever(const char* name, Callable func,
// .. and a wrapper that just calls func once // .. and a wrapper that just calls func once
template <typename Callable> void TraceThread(const char* name, Callable func) template <typename Callable> void TraceThread(const char* name, Callable func)
{ {
std::string s = strprintf("bitcoin-%s", name); std::string s = strprintf("dogecoin-%s", name);
RenameThread(s.c_str()); RenameThread(s.c_str());
try try
{ {

4
src/version.cpp
View file

@ -8,9 +8,9 @@
#include <string> #include <string>
// Name of client reported in the 'version' message. Report the same name // Name of client reported in the 'version' message. Report the same name
// for both bitcoind and bitcoin-qt, to make it harder for attackers to // for both dogecoind and dogecoin-qt, to make it harder for attackers to
// target servers or GUI users specifically. // target servers or GUI users specifically.
const std::string CLIENT_NAME("Inutoshi"); const std::string CLIENT_NAME("Shibetoshi");
// Client version number // Client version number
#define CLIENT_VERSION_SUFFIX "-beta" #define CLIENT_VERSION_SUFFIX "-beta"

4
src/wallet.cpp
View file

@ -1269,7 +1269,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64_t> >& vecSend,
// The following if statement should be removed once enough miners // The following if statement should be removed once enough miners
// have upgraded to the 0.9 GetMinFee() rules. Until then, this avoids // have upgraded to the 0.9 GetMinFee() rules. Until then, this avoids
// creating free transactions that have change outputs less than // creating free transactions that have change outputs less than
// CENT bitcoins. // CENT dogecoins.
if (nFeeRet < CTransaction::nMinTxFee && nChange > 0 && nChange < CENT) if (nFeeRet < CTransaction::nMinTxFee && nChange > 0 && nChange < CENT)
{ {
int64_t nMoveToFee = min(nChange, CTransaction::nMinTxFee - nFeeRet); int64_t nMoveToFee = min(nChange, CTransaction::nMinTxFee - nFeeRet);
@ -1281,7 +1281,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64_t> >& vecSend,
{ {
// Fill a vout to ourself // Fill a vout to ourself
// TODO: pass in scriptChange instead of reservekey so // TODO: pass in scriptChange instead of reservekey so
// change transaction isn't always pay-to-bitcoin-address // change transaction isn't always pay-to-dogecoin-address
CScript scriptChange; CScript scriptChange;
// coin control: send change to custom address // coin control: send change to custom address

2
src/walletdb.cpp
View file

@ -765,7 +765,7 @@ DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet)
void ThreadFlushWalletDB(const string& strFile) void ThreadFlushWalletDB(const string& strFile)
{ {
// Make this thread recognisable as the wallet flushing thread // Make this thread recognisable as the wallet flushing thread
RenameThread("bitcoin-wallet"); RenameThread("dogecoin-wallet");
static bool fOneThread; static bool fOneThread;
if (fOneThread) if (fOneThread)