aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #2924 from sje397/TrafficGraphWladimir J. van der Laan2013-10-1513-9/+618
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [QT] Add network traffic graph to debug window
| * | | | | | | | | | | Add network traffic graphScott Ellis2013-10-1413-9/+618
| | | | | | | | | | | |
* | | | | | | | | | | | misc spelling / space / style fixesPhilip Kaufmann2013-10-152-2/+2
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Avoid core dump if rpc port is in use.Gavin Andresen2013-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleanup code needs to check for NULL rpcworkers thread group.
* | | | | | | | | | | Merge pull request #3077 from sipa/chainGavin Andresen2013-10-1419-213/+217
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor/encapsulate chain globals into a CChain class
| * | | | | | | | | | | Refactor/encapsulate chain globals into a CChain classPieter Wuille2013-10-1119-213/+217
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2933 from sipa/leveldb113Gavin Andresen2013-10-1413-67/+363
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Merge upstream LevelDB 1.13
| * | | | | | | | | | Merge src/leveldb changes for LevelDB 1.13Pieter Wuille2013-08-2413-67/+363
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #2937Pieter Wuille2013-10-136-4/+131
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | 971bb3e Added ping time measurement. New RPC "ping" command to request ping. Implemented "pong" message handler. New "pingtime" field in getpeerinfo, to provide results to user. New "pingwait" field, to show pings still in flight, to better see newly lagging peers. (Josh Lehan)
| * | | | | | | | | | Added ping time measurement.Josh Lehan2013-10-046-4/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New RPC "ping" command to request ping. Implemented "pong" message handler. New "pingtime" field in getpeerinfo, to provide results to user. New "pingwait" field, to show pings still in flight, to better see newly lagging peers.
* | | | | | | | | | | prevent compiler redefinition warningsPhilip Kaufmann2013-10-111-0/+6
| |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I observed a massive amount of redefinition warnings after #3071, which are silenced by this patch - uses the same style as we do in other places, where we define _WIN32_WINNT
* | | | | | | | | | Merge pull request #3071 from gavinandresen/windows_hWladimir J. van der Laan2013-10-113-54/+68
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | Remove include of windows.h from allocators.h
| * | | | | | | | | Remove include of windows.h from allocators.hGavin Andresen2013-10-093-54/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create an allocators.cpp, and move all of the #ifdef WIN32 code and the #include of windows.h into it. Two motives for this cleanup: 1. I'm getting a weird error in windows.h in my smartfee branch. 2. allocators.h is included (indirectly) just about everywhere, so this should speed up Windows compiles quite a lot.
* | | | | | | | | | Merge pull request #3066 from Diapolo/rem_globalWladimir J. van der Laan2013-10-093-2/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | make fCommandLine a local variable in AppInit()
| * | | | | | | | | make fCommandLine a local variable in AppInit()Philip Kaufmann2013-10-083-2/+1
| | | | | | | | | |
* | | | | | | | | | Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0Philip Kaufmann2013-10-081-0/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3059 from Diapolo/ShutdownGavin Andresen2013-10-071-4/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add missing Boost Thread join_all() call during shutdown
| * | | | | | | | | add missing Boost Thread join_all() call during shutdownPhilip Kaufmann2013-10-071-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixes #3037 by adding missing join_all() call and brings bitcoind shutdown code in line with Bitcoin-Qt shutdown code - added a comment for the if (!fRet) case
* | | | | | | | | | style-police: fixed badly readable code in ProcessMessage()Philip Kaufmann2013-10-071-4/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | - I introduced the problem and fixed it with better readable code
* | | | | | | | | Merge pull request #3056 from Diapolo/stuck_debug_windowWladimir J. van der Laan2013-10-061-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Bitcoin-Qt: prevent stuck/unusable debug window on exit
| * | | | | | | | | Bitcoin-Qt: prevent stuck/unusable debug window on exitPhilip Kaufmann2013-10-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - when closing the client with an open debug window, that window could become stuck/unsuable (it was still shown wherea the main window was hidden already) - fix this by hiding the debug window, when quitting the the client
* | | | | | | | | | Hurricane Electric uses block 2001:470::, not 2011:470::David Hill2013-10-041-1/+1
|/ / / / / / / / /
* / / / / / / / / special case DoS value == 0 in ProcessMessage()Philip Kaufmann2013-10-041-4/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - prevents unneeded log messages, which could make users think something bad was happening
* | | | | | | | Merge pull request #2947 from gmaxwell/theyre_maturing_faster_these_daysGavin Andresen2013-10-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [wallet] Consider generated coins mature at COINBASE_MATURITY+1
| * | | | | | | | [wallet] Consider generated coins mature at COINBASE_MATURITY+1Gregory Maxwell2013-08-281-1/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're not seeing large reorgs that would justify waiting a large amount past the rule required maturity, and the extra three hours is just a nuisance. Take one more block to at least give the 100th block time to propagate.
* | | | | | | | Merge pull request #3040 from Diapolo/Qt_misc2Gavin Andresen2013-10-031-5/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bitcoin-Qt: add missing change from branch Qt_misc
| * | | | | | | | Bitcoin-Qt: add missing change from branch Qt_miscPhilip Kaufmann2013-10-011-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove an unneeded debug message in walletframe
* | | | | | | | | Merge pull request #3050 from Diapolo/fix_IsRFC4193_commentGavin Andresen2013-10-031-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix #3049 by changing comment for CNetAddr::IsRFC4193()
| * | | | | | | | | fix #3049 by changing comment for CNetAddr::IsRFC4193()Philip Kaufmann2013-10-031-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3051 from Diapolo/bitcoind-rcGavin Andresen2013-10-032-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | rename bitcoin-res.rc to bitcoind-res.rc
| * | | | | | | | | | rename bitcoin-res.rc to bitcoind-res.rcPhilip Kaufmann2013-10-032-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - helps recognizing that the resource file belongs to bitcoind.exe
* | | | | | | | | | Merge pull request #3038 from Diapolo/Log_ShutdownJeff Garzik2013-10-031-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | log start and end of Shutdown()
| * | | | | | | | | | log start and end of Shutdown()Philip Kaufmann2013-10-021-0/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - could be helpful when debugging shutdown related problems
* / / / / / / / / / RPC validateaddress: test pwalletMain for NULL (no-wallet mode)Jeff Garzik2013-10-021-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'pwalletmain' - checking pwalletMain for NULL,Jeff Garzik2013-10-016-92/+123
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a pre-req for no-wallet support.
| * | | | | | | | | Support absence of wallet (pwalletMain==NULL) in several locations,Jeff Garzik2013-10-016-92/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notably RPC.
* | | | | | | | | | Merge pull request #2991 from Diapolo/translation_fixesWladimir J. van der Laan2013-10-014-66/+61
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Bitcoin-Qt: translation fixes in sendcoins
| * | | | | | | | | Bitcoin-Qt: translation fixes in sendcoinsPhilip Kaufmann2013-10-014-66/+61
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove some unneeded translatable strings from sendcoinsentry.ui file and rename some elements for better readability - optimize string prorcessing in SendCoinsDialog::on_sendButton_clicked() - make all UI labels for secure payments plain text and move the settings to sendcoinsentry.ui file - remove unneeded button and default button definiton from warning message boxes - remove fixed font-size when sending coins to an address with label and use monospace font for addresses
* | | | | | | | | Merge pull request #2888 from litecoin-project/getnetworkhashpsJeff Garzik2013-10-013-0/+58
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Add getnetworkhashps to get the estimated network hashrate
| * | | | | | | | Add getnetworkhashps to get the calculated network hashratecoblee2013-09-173-0/+58
| | | | | | | | |
* | | | | | | | | misc small spelling/indentation fixesPhilip Kaufmann2013-10-012-4/+4
| | | | | | | | |
* | | | | | | | | Merge pull request #3015 from theuni/win32-version-infoPieter Wuille2013-09-297-13/+54
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Win32 version info
| * | | | | | | | | win32: add version info to bitcoind.exeCory Fields2013-09-182-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: Add icon info
| * | | | | | | | | autotools: fix the Makefile.include to be safely included anywhere.Cory Fields2013-09-185-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we can reuse rules rather than duplicating them.
| * | | | | | | | | autotools: fix subdir m4 check, never let it return -ICory Fields2013-09-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If BDB_CPPFLAGS returns only "-I", the next argument sent to the preprocessor is treated as a path. There are 2 fixes here: 1. Check in CPPFLAGS, as a user might have manually passed a path to check. 2. Ensure the value is not empty before setting BDB_CPPFLAGS to "-I value"
* | | | | | | | | | several small Qt-related fixesPhilip Kaufmann2013-09-286-12/+10
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make BitcoinGUI::showPaymentACK() use a reference for msg and use our own GUIUtil::HtmlEscape() function - ensure QTimer usage in clientmodel is the same as in walletmodel - remove an unneeded debug message in walletframe - flag some parameters as unused in DebugMessageHandler() - small code formatting changes
* | | | | | | | | Merge pull request #3031 from Diapolo/minerWladimir J. van der Laan2013-09-284-11/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | internal miner: move 2 globals from main to miner
| * | | | | | | | | internal miner: move 2 globals from main to minerPhilip Kaufmann2013-09-254-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - moves 2 global variables from main.cpp/h to miner.cpp/h - also removes 2 unneded includes in miner.cpp, that come from miner.h already
* | | | | | | | | | Merge pull request #3027 from cozz/cozz2Wladimir J. van der Laan2013-09-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | GUI: fix sendcoinsdialog/sendcoinsentry
| * | | | | | | | | GUI: fix sendcoinsdialog/sendcoinsentryCozz Lovan2013-09-241-1/+1
| | | | | | | | | |