aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Squashed 'src/leveldb/' changes from be1b0ff..936b461Pieter Wuille2013-08-2413-67/+363
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 936b461 Merge upstream LevelDB 1.13. 748539c LevelDB 1.13 git-subtree-dir: src/leveldb git-subtree-split: 936b4613ea4551992e6096b1e05eeefc09a20e3b
* | | | | | | | | | | | | | | | | | | Merge pull request #3089 from gmaxwell/hsportGavin Andresen2013-10-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | [doc] Add testnet hidden service port to the example tor config.
| * | | | | | | | | | | | | | | | | | [doc] Add testnet hidden service port to the example tor config.Gregory Maxwell2013-10-141-0/+1
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like there are a lot of advertised testnet HS nodes that don't actually work. Lack of the testnet port on the example HS config might be one reason.
* | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | | | | | Merge pull request #3081 from Diapolo/silence_compilerWladimir J. van der Laan2013-10-111-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | prevent compiler redefinition warnings
| * | | | | | | | | | | | | | | | | 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 #3078 from gavinandresen/pulltesterGavin Andresen2013-10-102-20/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | Rework pull-tester scripts, disable blockchain tester
| * | | | | | | | | | | | | | | | | Disable code-coverage builds for nowGavin Andresen2013-10-111-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not working on the pull-tester machine, 'make cov' hangs there.
| * | | | | | | | | | | | | | | | | Rework pull-tester scripts, disable blockchain testerGavin Andresen2013-10-112-13/+45
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-organize the pull-tester scripts a bit. And disables running the blockchain tester, it is not working properly on the pull-tester machine for reasons I cannot explain (fails to start).
* | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #3068 from Diapolo/qt-iconWladimir J. van der Laan2013-10-081-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0
| * | | | | | | | | | | | | | | Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0Philip Kaufmann2013-10-081-0/+4
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'pulltestwin32'Gavin Andresen2013-10-081-11/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Re-enable win32 pull-testingGavin Andresen2013-10-081-11/+12
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | Merge pull request #3064 from Diapolo/styleWladimir J. van der Laan2013-10-071-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | style-police: fixed badly readable code in ProcessMessage()
| * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge pull request #3053 from dajohi/masterGavin Andresen2013-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | Hurricane Electric uses block 2001:470::, not 2011:470::
| * | | | | | | | | | | | | | Hurricane Electric uses block 2001:470::, not 2011:470::David Hill2013-10-041-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3047 from Diapolo/misbehaveGavin Andresen2013-10-041-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | special case DoS value == 0
| * | | | | | | | | | | | | 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 #2999 from TheBlueMatt/masterGavin Andresen2013-10-032-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update contrib/debian: proper desktop category and update changelog
| * | | | | | | | | | | | | Update contrib/debian: proper desktop category and update changelogMatt Corallo2013-09-172-1/+25
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | 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 #3028 from Michagogo/fix-dep-linksGavin Andresen2013-10-031-9/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix and improve release-process.md
| * | | | | | | | | | | | | | | HTTPS-ify the downloads for the depsMicha2013-10-041-5/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Switch the order of win32 deps and win32 qt in release-process.mdMicha2013-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-process.md has the deps being built after qt. However, the descriptors for qt call for the deps file.
| * | | | | | | | | | | | | | | Fix and improve release-process.mdMicha2013-10-041-3/+6
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a step, which is to git checkout the version to be built. This ensures that the gitian-descriptors for said version will be the correct ones. In addition, it updates the links for several dependencies, where the previously existing links were dead.
* | | | | | | | | | | | | | | 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.