twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #2700 from theuni/gui-split 

autotools: Gui split
miguelfreitas
Jeff Garzik 12 years ago
parent
fc1f360fce 6887bb9ad7
commit
c94bd68547
11 changed files with 240 additions and 228 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bitcoin-qt.pro
  2. 137
      src/bitcoind.cpp
  3. 286
      src/init.cpp
  4. 1
      src/main.cpp
  5. 1
      src/main.h
  6. 3
      src/makefile.linux-mingw
  7. 3
      src/makefile.mingw
  8. 3
      src/makefile.osx
  9. 3
      src/makefile.unix
  10. 2
      src/qt/bitcoin.cpp
  11. 27
      src/wallet.cpp

2
bitcoin-qt.pro
Unescape View File

@ -5,7 +5,7 @@ VERSION = 0.8.2
INCLUDEPATH += src src/json src/qt INCLUDEPATH += src src/json src/qt
QT += core gui network QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE DEFINES += BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd CONFIG += no_include_pwd
CONFIG += thread CONFIG += thread

137
src/bitcoind.cpp
Unescape View File

@ -0,0 +1,137 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2012 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "init.h"
#include "bitcoinrpc.h"
#include <boost/algorithm/string/predicate.hpp>
void DetectShutdownThread(boost::thread_group* threadGroup)
{
bool shutdown = ShutdownRequested();
// Tell the main threads to shutdown.
while (!shutdown)
{
MilliSleep(200);
shutdown = ShutdownRequested();
}
if (threadGroup)
threadGroup->interrupt_all();
}
//////////////////////////////////////////////////////////////////////////////
//
// Start
//
bool AppInit(int argc, char* argv[])
{
boost::thread_group threadGroup;
boost::thread* detectShutdownThread = NULL;
bool fRet = false;
try
{
//
// Parameters
//
// If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main()
ParseParameters(argc, argv);
if (!boost::filesystem::is_directory(GetDataDir(false)))
{
fprintf(stderr, "Error: Specified directory does not exist\n");
Shutdown();
}
ReadConfigFile(mapArgs, mapMultiArgs);
if (mapArgs.count("-?") || mapArgs.count("--help"))
{
// First part of help message is specific to bitcoind / RPC client
std::string strUsage = _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
_("Usage:") + "\n" +
" bitcoind [options] " + "\n" +
" bitcoind [options] <command> [params] " + _("Send command to -server or bitcoind") + "\n" +
" bitcoind [options] help " + _("List commands") + "\n" +
" bitcoind [options] help <command> " + _("Get help for a command") + "\n";
strUsage += "\n" + HelpMessage();
fprintf(stdout, "%s", strUsage.c_str());
return false;
}
// Command-line RPC
for (int i = 1; i < argc; i++)
if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "bitcoin:"))
fCommandLine = true;
if (fCommandLine)
{
int ret = CommandLineRPC(argc, argv);
exit(ret);
}
#if !defined(WIN32)
fDaemon = GetBoolArg("-daemon", false);
if (fDaemon)
{
// Daemonize
pid_t pid = fork();
if (pid < 0)
{
fprintf(stderr, "Error: fork() returned %d errno %d\n", pid, errno);
return false;
}
if (pid > 0) // Parent process, pid is child process id
{
CreatePidFile(GetPidFile(), pid);
return true;
}
// Child process falls through to rest of initialization
pid_t sid = setsid();
if (sid < 0)
fprintf(stderr, "Error: setsid() returned %d errno %d\n", sid, errno);
}
#endif
detectShutdownThread = new boost::thread(boost::bind(&DetectShutdownThread, &threadGroup));
fRet = AppInit2(threadGroup);
}
catch (std::exception& e) {
PrintExceptionContinue(&e, "AppInit()");
} catch (...) {
PrintExceptionContinue(NULL, "AppInit()");
}
if (!fRet) {
if (detectShutdownThread)
detectShutdownThread->interrupt();
threadGroup.interrupt_all();
}
if (detectShutdownThread)
{
detectShutdownThread->join();
delete detectShutdownThread;
detectShutdownThread = NULL;
}
Shutdown();
return fRet;
}
extern void noui_connect();
int main(int argc, char* argv[])
{
bool fRet = false;
fHaveGUI = false;
// Connect bitcoind signal handlers
noui_connect();
fRet = AppInit(argc, argv);
if (fRet && fDaemon)
return 0;
return (fRet ? 0 : 1);
}

286
src/init.cpp
Unescape View File

@ -121,17 +121,6 @@ void Shutdown()
// //
// Signal handlers are very limited in what they are allowed to do, so: // Signal handlers are very limited in what they are allowed to do, so:
// //
void DetectShutdownThread(boost::thread_group* threadGroup)
{
// Tell the main threads to shutdown.
while (!fRequestShutdown)
{
MilliSleep(200);
if (fRequestShutdown)
threadGroup->interrupt_all();
}
}
void HandleSIGTERM(int) void HandleSIGTERM(int)
{ {
fRequestShutdown = true; fRequestShutdown = true;
@ -142,127 +131,6 @@ void HandleSIGHUP(int)
fReopenDebugLog = true; fReopenDebugLog = true;
} }
//////////////////////////////////////////////////////////////////////////////
//
// Start
//
#if !defined(QT_GUI)
bool AppInit(int argc, char* argv[])
{
boost::thread_group threadGroup;
boost::thread* detectShutdownThread = NULL;
bool fRet = false;
try
{
//
// Parameters
//
// If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main()
ParseParameters(argc, argv);
if (!boost::filesystem::is_directory(GetDataDir(false)))
{
fprintf(stderr, "Error: Specified directory does not exist\n");
Shutdown();
}
ReadConfigFile(mapArgs, mapMultiArgs);
if (mapArgs.count("-?") || mapArgs.count("--help"))
{
// First part of help message is specific to bitcoind / RPC client
std::string strUsage = _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
_("Usage:") + "\n" +
" bitcoind [options] " + "\n" +
" bitcoind [options] <command> [params] " + _("Send command to -server or bitcoind") + "\n" +
" bitcoind [options] help " + _("List commands") + "\n" +
" bitcoind [options] help <command> " + _("Get help for a command") + "\n";
strUsage += "\n" + HelpMessage();
fprintf(stdout, "%s", strUsage.c_str());
return false;
}
// Command-line RPC
for (int i = 1; i < argc; i++)
if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "bitcoin:"))
fCommandLine = true;
if (fCommandLine)
{
int ret = CommandLineRPC(argc, argv);
exit(ret);
}
#if !defined(WIN32)
fDaemon = GetBoolArg("-daemon", false);
if (fDaemon)
{
// Daemonize
pid_t pid = fork();
if (pid < 0)
{
fprintf(stderr, "Error: fork() returned %d errno %d\n", pid, errno);
return false;
}
if (pid > 0) // Parent process, pid is child process id
{
CreatePidFile(GetPidFile(), pid);
return true;
}
// Child process falls through to rest of initialization
pid_t sid = setsid();
if (sid < 0)
fprintf(stderr, "Error: setsid() returned %d errno %d\n", sid, errno);
}
#endif
detectShutdownThread = new boost::thread(boost::bind(&DetectShutdownThread, &threadGroup));
fRet = AppInit2(threadGroup);
}
catch (std::exception& e) {
PrintExceptionContinue(&e, "AppInit()");
} catch (...) {
PrintExceptionContinue(NULL, "AppInit()");
}
if (!fRet) {
if (detectShutdownThread)
detectShutdownThread->interrupt();
threadGroup.interrupt_all();
}
if (detectShutdownThread)
{
detectShutdownThread->join();
delete detectShutdownThread;
detectShutdownThread = NULL;
}
Shutdown();
return fRet;
}
extern void noui_connect();
int main(int argc, char* argv[])
{
bool fRet = false;
// Connect bitcoind signal handlers
noui_connect();
fRet = AppInit(argc, argv);
if (fRet && fDaemon)
return 0;
return (fRet ? 0 : 1);
}
#endif
bool static InitError(const std::string &str) bool static InitError(const std::string &str)
{ {
uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR); uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR);
@ -290,89 +158,88 @@ bool static Bind(const CService &addr, unsigned int flags) {
// Core-specific options shared between UI and daemon // Core-specific options shared between UI and daemon
std::string HelpMessage() std::string HelpMessage()
{ {
string strUsage = _("Options:") + "\n" + string strUsage = _("Options:") + "\n";
" -? " + _("This help message") + "\n" + strUsage += " -? " + _("This help message") + "\n";
" -conf=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n" + strUsage += " -conf=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n";
" -pid=<file> " + _("Specify pid file (default: bitcoind.pid)") + "\n" + strUsage += " -pid=<file> " + _("Specify pid file (default: bitcoind.pid)") + "\n";
" -gen " + _("Generate coins (default: 0)") + "\n" + strUsage += " -gen " + _("Generate coins (default: 0)") + "\n";
" -datadir=<dir> " + _("Specify data directory") + "\n" + strUsage += " -datadir=<dir> " + _("Specify data directory") + "\n";
" -dbcache=<n> " + _("Set database cache size in megabytes (default: 25)") + "\n" + strUsage += " -dbcache=<n> " + _("Set database cache size in megabytes (default: 25)") + "\n";
" -timeout=<n> " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n" + strUsage += " -timeout=<n> " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n";
" -proxy=<ip:port> " + _("Connect through socks proxy") + "\n" + strUsage += " -proxy=<ip:port> " + _("Connect through socks proxy") + "\n";
" -socks=<n> " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n" + strUsage += " -socks=<n> " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n";
" -tor=<ip:port> " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n" strUsage += " -tor=<ip:port> " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n";
" -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n" + strUsage += " -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n";
" -port=<port> " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n" + strUsage += " -port=<port> " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n";
" -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";
" -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";
" -connect=<ip> " + _("Connect only to the specified node(s)") + "\n" + strUsage += " -connect=<ip> " + _("Connect only to the specified node(s)") + "\n";
" -seednode=<ip> " + _("Connect to a node to retrieve peer addresses, and disconnect") + "\n" + strUsage += " -seednode=<ip> " + _("Connect to a node to retrieve peer addresses, and disconnect") + "\n";
" -externalip=<ip> " + _("Specify your own public address") + "\n" + strUsage += " -externalip=<ip> " + _("Specify your own public address") + "\n";
" -onlynet=<net> " + _("Only connect to nodes in network <net> (IPv4, IPv6 or Tor)") + "\n" + strUsage += " -onlynet=<net> " + _("Only connect to nodes in network <net> (IPv4, IPv6 or Tor)") + "\n";
" -discover " + _("Discover own IP address (default: 1 when listening and no -externalip)") + "\n" + strUsage += " -discover " + _("Discover own IP address (default: 1 when listening and no -externalip)") + "\n";
" -checkpoints " + _("Only accept block chain matching built-in checkpoints (default: 1)") + "\n" + strUsage += " -checkpoints " + _("Only accept block chain matching built-in checkpoints (default: 1)") + "\n";
" -listen " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n" + strUsage += " -listen " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n";
" -bind=<addr> " + _("Bind to given address and always listen on it. Use [host]:port notation for IPv6") + "\n" + strUsage += " -bind=<addr> " + _("Bind to given address and always listen on it. Use [host]:port notation for IPv6") + "\n";
" -dnsseed " + _("Find peers using DNS lookup (default: 1 unless -connect)") + "\n" + strUsage += " -dnsseed " + _("Find peers using DNS lookup (default: 1 unless -connect)") + "\n";
" -banscore=<n> " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" + strUsage += " -banscore=<n> " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n";
" -bantime=<n> " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" + strUsage += " -bantime=<n> " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n";
" -maxreceivebuffer=<n> " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n" + strUsage += " -maxreceivebuffer=<n> " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n";
" -maxsendbuffer=<n> " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)") + "\n" + strUsage += " -maxsendbuffer=<n> " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)") + "\n";
#ifdef USE_UPNP #ifdef USE_UPNP
#if USE_UPNP #if USE_UPNP
" -upnp " + _("Use UPnP to map the listening port (default: 1 when listening)") + "\n" + strUsage += " -upnp " + _("Use UPnP to map the listening port (default: 1 when listening)") + "\n";
#else #else
" -upnp " + _("Use UPnP to map the listening port (default: 0)") + "\n" + strUsage += " -upnp " + _("Use UPnP to map the listening port (default: 0)") + "\n";
#endif #endif
#endif #endif
" -paytxfee=<amt> " + _("Fee per KB to add to transactions you send") + "\n" + strUsage += " -paytxfee=<amt> " + _("Fee per KB to add to transactions you send") + "\n";
#ifdef QT_GUI if (fHaveGUI)
" -server " + _("Accept command line and JSON-RPC commands") + "\n" + strUsage += " -server " + _("Accept command line and JSON-RPC commands") + "\n";
#endif #if !defined(WIN32)
#if !defined(WIN32) && !defined(QT_GUI) if (fHaveGUI)
" -daemon " + _("Run in the background as a daemon and accept commands") + "\n" + strUsage += " -daemon " + _("Run in the background as a daemon and accept commands") + "\n";
#endif #endif
" -testnet " + _("Use the test network") + "\n" + strUsage += " -testnet " + _("Use the test network") + "\n";
" -debug " + _("Output extra debugging information. Implies all other -debug* options") + "\n" + strUsage += " -debug " + _("Output extra debugging information. Implies all other -debug* options") + "\n";
" -debugnet " + _("Output extra network debugging information") + "\n" + strUsage += " -debugnet " + _("Output extra network debugging information") + "\n";
" -logtimestamps " + _("Prepend debug output with timestamp") + "\n" + strUsage += " -logtimestamps " + _("Prepend debug output with timestamp") + "\n";
" -shrinkdebugfile " + _("Shrink debug.log file on client startup (default: 1 when no -debug)") + "\n" + strUsage += " -shrinkdebugfile " + _("Shrink debug.log file on client startup (default: 1 when no -debug)") + "\n";
" -printtoconsole " + _("Send trace/debug info to console instead of debug.log file") + "\n" + strUsage += " -printtoconsole " + _("Send trace/debug info to console instead of debug.log file") + "\n";
#ifdef WIN32 #ifdef WIN32
" -printtodebugger " + _("Send trace/debug info to debugger") + "\n" + strUsage += " -printtodebugger " + _("Send trace/debug info to debugger") + "\n";
#endif #endif
" -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n" + strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n";
" -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n" + strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n";
" -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: 8332 or testnet: 18332)") + "\n";
" -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address") + "\n" + strUsage += " -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address") + "\n";
#ifndef QT_GUI if (!fHaveGUI)
" -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";
#endif strUsage += " -rpcthreads=<n> " + _("Set the number of threads to service RPC calls (default: 4)") + "\n";
" -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";
" -blocknotify=<cmd> " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n" + strUsage += " -walletnotify=<cmd> " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n";
" -walletnotify=<cmd> " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n" + strUsage += " -alertnotify=<cmd> " + _("Execute command when a relevant alert is received (%s in cmd is replaced by message)") + "\n";
" -alertnotify=<cmd> " + _("Execute command when a relevant alert is received (%s in cmd is replaced by message)") + "\n" + strUsage += " -upgradewallet " + _("Upgrade wallet to latest format") + "\n";
" -upgradewallet " + _("Upgrade wallet to latest format") + "\n" + strUsage += " -keypool=<n> " + _("Set key pool size to <n> (default: 100)") + "\n";
" -keypool=<n> " + _("Set key pool size to <n> (default: 100)") + "\n" + strUsage += " -rescan " + _("Rescan the block chain for missing wallet transactions") + "\n";
" -rescan " + _("Rescan the block chain for missing wallet transactions") + "\n" + strUsage += " -salvagewallet " + _("Attempt to recover private keys from a corrupt wallet.dat") + "\n";
" -salvagewallet " + _("Attempt to recover private keys from a corrupt wallet.dat") + "\n" + strUsage += " -checkblocks=<n> " + _("How many blocks to check at startup (default: 288, 0 = all)") + "\n";
" -checkblocks=<n> " + _("How many blocks to check at startup (default: 288, 0 = all)") + "\n" + strUsage += " -checklevel=<n> " + _("How thorough the block verification is (0-4, default: 3)") + "\n";
" -checklevel=<n> " + _("How thorough the block verification is (0-4, default: 3)") + "\n" + strUsage += " -txindex " + _("Maintain a full transaction index (default: 0)") + "\n";
" -txindex " + _("Maintain a full transaction index (default: 0)") + "\n" + strUsage += " -loadblock=<file> " + _("Imports blocks from external blk000??.dat file") + "\n";
" -loadblock=<file> " + _("Imports blocks from external blk000??.dat file") + "\n" + strUsage += " -reindex " + _("Rebuild block chain index from current blk000??.dat files") + "\n";
" -reindex " + _("Rebuild block chain index from current blk000??.dat files") + "\n" + strUsage += " -par=<n> " + _("Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)") + "\n";
" -par=<n> " + _("Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)") + "\n" +
strUsage += "\n"; _("Block creation options:") + "\n";
"\n" + _("Block creation options:") + "\n" + strUsage += " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n";
" -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n" + strUsage += " -blockmaxsize=<n> " + _("Set maximum block size in bytes (default: 250000)") + "\n";
" -blockmaxsize=<n> " + _("Set maximum block size in bytes (default: 250000)") + "\n" + strUsage += " -blockprioritysize=<n> " + _("Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)") + "\n";
" -blockprioritysize=<n> " + _("Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)") + "\n" +
strUsage += "\n"; _("SSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n";
"\n" + _("SSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n" + strUsage += " -rpcssl " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n";
" -rpcssl " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n" + strUsage += " -rpcsslcertificatechainfile=<file.cert> " + _("Server certificate file (default: server.cert)") + "\n";
" -rpcsslcertificatechainfile=<file.cert> " + _("Server certificate file (default: server.cert)") + "\n" + strUsage += " -rpcsslprivatekeyfile=<file.pem> " + _("Server private key (default: server.pem)") + "\n";
" -rpcsslprivatekeyfile=<file.pem> " + _("Server private key (default: server.pem)") + "\n" + strUsage += " -rpcsslciphers=<ciphers> " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)") + "\n";
" -rpcsslciphers=<ciphers> " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)") + "\n";
return strUsage; return strUsage;
} }
@ -567,9 +434,8 @@ bool AppInit2(boost::thread_group& threadGroup)
fServer = GetBoolArg("-server", false); fServer = GetBoolArg("-server", false);
/* force fServer when running without GUI */ /* force fServer when running without GUI */
#if !defined(QT_GUI) if (!fHaveGUI)
fServer = true; fServer = true;
#endif
fPrintToConsole = GetBoolArg("-printtoconsole", false); fPrintToConsole = GetBoolArg("-printtoconsole", false);
fPrintToDebugger = GetBoolArg("-printtodebugger", false); fPrintToDebugger = GetBoolArg("-printtodebugger", false);
fLogTimestamps = GetBoolArg("-logtimestamps", false); fLogTimestamps = GetBoolArg("-logtimestamps", false);

1
src/main.cpp
Unescape View File

@ -48,6 +48,7 @@ bool fReindex = false;
bool fBenchmark = false; bool fBenchmark = false;
bool fTxIndex = false; bool fTxIndex = false;
unsigned int nCoinCacheSize = 5000; unsigned int nCoinCacheSize = 5000;
bool fHaveGUI = false;
/** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */ /** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */
int64 CTransaction::nMinTxFee = 10000; // Override with -mintxfee int64 CTransaction::nMinTxFee = 10000; // Override with -mintxfee

1
src/main.h
Unescape View File

@ -94,6 +94,7 @@ extern bool fBenchmark;
extern int nScriptCheckThreads; extern int nScriptCheckThreads;
extern bool fTxIndex; extern bool fTxIndex;
extern unsigned int nCoinCacheSize; extern unsigned int nCoinCacheSize;
extern bool fHaveGUI;
// Settings // Settings
extern int64 nTransactionFee; extern int64 nTransactionFee;

3
src/makefile.linux-mingw
Unescape View File

@ -71,6 +71,7 @@ OBJS= \
obj/key.o \ obj/key.o \
obj/db.o \ obj/db.o \
obj/init.o \ obj/init.o \
obj/bitcoind.o \
obj/keystore.o \ obj/keystore.o \
obj/main.o \ obj/main.o \
obj/net.o \ obj/net.o \
@ -116,7 +117,7 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp $(HEADERS) obj-test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -o $@ $< $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -o $@ $<
test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o obj/bitcoind.o,$(OBJS:obj/%=obj/%))
$(CXX) $(xCXXFLAGS) $(xLDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework-mt-s $(LIBS) $(CXX) $(xCXXFLAGS) $(xLDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework-mt-s $(LIBS)

3
src/makefile.mingw
Unescape View File

@ -79,6 +79,7 @@ OBJS= \
obj/key.o \ obj/key.o \
obj/db.o \ obj/db.o \
obj/init.o \ obj/init.o \
obj/bitcoind.o \
obj/keystore.o \ obj/keystore.o \
obj/main.o \ obj/main.o \
obj/net.o \ obj/net.o \
@ -127,7 +128,7 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp $(HEADERS) obj-test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(TESTDEFS) $(CFLAGS) -o $@ $< $(CXX) -c $(TESTDEFS) $(CFLAGS) -o $@ $<
test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o obj/bitcoind.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework$(BOOST_SUFFIX) $(LIBS) $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework$(BOOST_SUFFIX) $(LIBS)
clean: clean:

3
src/makefile.osx vendored
Unescape View File

@ -82,6 +82,7 @@ OBJS= \
obj/key.o \ obj/key.o \
obj/db.o \ obj/db.o \
obj/init.o \ obj/init.o \
obj/bitcoind.o \
obj/keystore.o \ obj/keystore.o \
obj/main.o \ obj/main.o \
obj/net.o \ obj/net.o \
@ -162,7 +163,7 @@ obj-test/%.o: test/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d) rm -f $(@:%.o=%.d)
test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o obj/bitcoind.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS) $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS)
clean: clean:

3
src/makefile.unix
Unescape View File

@ -121,6 +121,7 @@ OBJS= \
obj/key.o \ obj/key.o \
obj/db.o \ obj/db.o \
obj/init.o \ obj/init.o \
obj/bitcoind.o \
obj/keystore.o \ obj/keystore.o \
obj/main.o \ obj/main.o \
obj/net.o \ obj/net.o \
@ -187,7 +188,7 @@ obj-test/%.o: test/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d) rm -f $(@:%.o=%.d)
test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o obj/bitcoind.o,$(OBJS:obj/%=obj/%))
$(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS) $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS)
clean: clean:

2
src/qt/bitcoin.cpp
Unescape View File

@ -113,6 +113,8 @@ static void handleRunawayException(std::exception *e)
#ifndef BITCOIN_QT_TEST #ifndef BITCOIN_QT_TEST
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
fHaveGUI = true;
// Command-line options take precedence: // Command-line options take precedence:
ParseParameters(argc, argv); ParseParameters(argc, argv);

27
src/wallet.cpp
Unescape View File

@ -459,25 +459,26 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn)
if (fInsertedNew || fUpdated) if (fInsertedNew || fUpdated)
if (!wtx.WriteToDisk()) if (!wtx.WriteToDisk())
return false; return false;
#ifndef QT_GUI
// If default receiving address gets used, replace it with a new one if (!fHaveGUI) {
if (vchDefaultKey.IsValid()) { // If default receiving address gets used, replace it with a new one
CScript scriptDefaultKey; if (vchDefaultKey.IsValid()) {
scriptDefaultKey.SetDestination(vchDefaultKey.GetID()); CScript scriptDefaultKey;
BOOST_FOREACH(const CTxOut& txout, wtx.vout) scriptDefaultKey.SetDestination(vchDefaultKey.GetID());
{ BOOST_FOREACH(const CTxOut& txout, wtx.vout)
if (txout.scriptPubKey == scriptDefaultKey)
{ {
CPubKey newDefaultKey; if (txout.scriptPubKey == scriptDefaultKey)
if (GetKeyFromPool(newDefaultKey, false))
{ {
SetDefaultKey(newDefaultKey); CPubKey newDefaultKey;
SetAddressBookName(vchDefaultKey.GetID(), ""); if (GetKeyFromPool(newDefaultKey, false))
{
SetDefaultKey(newDefaultKey);
SetAddressBookName(vchDefaultKey.GetID(), "");
}
} }
} }
} }
} }
#endif
// since AddToWallet is called directly for self-originating transactions, check for consumption of own coins // since AddToWallet is called directly for self-originating transactions, check for consumption of own coins
WalletUpdateSpent(wtx); WalletUpdateSpent(wtx);

Write Preview
Loading…
Cancel
Save