mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 20:12:57 +01:00
Merged: Typo in log output (crowning)
This commit is contained in:
parent
eb87b05ddf
commit
2a33377fc8
@ -267,7 +267,7 @@ bool CActiveMasternode::RegisterAsMasterNodeRemoteOnly(std::string strMasterNode
|
||||
return true;
|
||||
}
|
||||
|
||||
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - No sutable vin found\n");
|
||||
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - No suitable vin found\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
@ -87,13 +87,13 @@ bool AppInit(int argc, char* argv[])
|
||||
if (mapArgs.count("-?") || mapArgs.count("--help"))
|
||||
{
|
||||
// First part of help message is specific to bitcoind / RPC client
|
||||
std::string strUsage = _("Bitcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n\n" +
|
||||
std::string strUsage = _("Darkcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n\n" +
|
||||
_("Usage:") + "\n" +
|
||||
" bitcoind [options] " + _("Start Bitcoin Core Daemon") + "\n" +
|
||||
" darkcoind [options] " + _("Start Darkcoin Core Daemon") + "\n" +
|
||||
_("Usage (deprecated, use bitcoin-cli):") + "\n" +
|
||||
" bitcoind [options] <command> [params] " + _("Send command to Bitcoin Core") + "\n" +
|
||||
" bitcoind [options] help " + _("List commands") + "\n" +
|
||||
" bitcoind [options] help <command> " + _("Get help for a command") + "\n";
|
||||
" darkcoind [options] <command> [params] " + _("Send command to Darkcoin Core") + "\n" +
|
||||
" darkcoind [options] help " + _("List commands") + "\n" +
|
||||
" darkcoind [options] help <command> " + _("Get help for a command") + "\n";
|
||||
|
||||
strUsage += "\n" + HelpMessage(HMM_BITCOIND);
|
||||
strUsage += "\n" + HelpMessageCli(false);
|
||||
@ -117,7 +117,7 @@ bool AppInit(int argc, char* argv[])
|
||||
fDaemon = GetBoolArg("-daemon", false);
|
||||
if (fDaemon)
|
||||
{
|
||||
fprintf(stdout, "Bitcoin server starting\n");
|
||||
fprintf(stdout, "Darkcoin server starting\n");
|
||||
|
||||
// Daemonize
|
||||
pid_t pid = fork();
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2011-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
@ -208,10 +208,10 @@ Value stop(const Array& params, bool fHelp)
|
||||
if (fHelp || params.size() > 1)
|
||||
throw runtime_error(
|
||||
"stop\n"
|
||||
"\nStop Bitcoin server.");
|
||||
"\nStop Darkcoin server.");
|
||||
// Shutdown will take long enough that the response should get back
|
||||
StartShutdown();
|
||||
return "Bitcoin server stopping";
|
||||
return "Darkcoin server stopping";
|
||||
}
|
||||
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2014 The Bitcoin Core developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2012-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
// Copyright (c) 2012-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
#ifndef BITCOIN_VERSION_H
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Copyright (c) 2014 vertoe & the Darkcoin developers
|
||||
// Copyright (c) 2014 The Darkcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
#ifndef BITCOIN_WALLET_H
|
||||
@ -781,7 +781,7 @@ public:
|
||||
int Priority() const
|
||||
{
|
||||
if(tx->vout[i].nValue == DARKSEND_FEE) return -20000;
|
||||
BOOST_FOREACH(int64_t d, darkSendDenominations)
|
||||
BOOST_FOREACH(int64_t d, darkSendDenominations)
|
||||
if(tx->vout[i].nValue == d) return 10000;
|
||||
if(tx->vout[i].nValue < 1*COIN) return 20000;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user