aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [qa] pull-tester: Exit early when no tests are runMarcoFalke2016-04-091-63/+61
|
* [qa] pull-tester: Don't mute zmq ImportErrorMarcoFalke2016-04-091-4/+4
|
* Merge #7835: Version 2 transactions remain non-standard until CSV activatesWladimir J. van der Laan2016-04-084-17/+63
|\ | | | | | | | | | | da5fdbb Test relay of version 2 transactions (Suhas Daftuar) 5cb1d8a Tests: move get_bip9_status to util.py (Suhas Daftuar) e4ba9f6 Version 2 transactions remain non-standard until CSV activates (Suhas Daftuar)
| * Test relay of version 2 transactionsSuhas Daftuar2016-04-071-4/+42
| |
| * Tests: move get_bip9_status to util.pySuhas Daftuar2016-04-072-13/+13
| |
| * Version 2 transactions remain non-standard until CSV activatesSuhas Daftuar2016-04-071-0/+8
| | | | | | | | | | Before activation, such transactions might not be mined, so don't allow into the mempool.
* | Merge #7570: Net: Add IPv6 Link-Local Address SupportWladimir J. van der Laan2016-04-082-4/+9
|\ \ | |/ |/| | | eda3d92 Net: Add IPv6 Link-Local Address Support (mruddy)
| * Net: Add IPv6 Link-Local Address Supportmruddy2016-04-052-4/+9
| |
* | Merge #7832: Reduce block timeout to 10 minutesWladimir J. van der Laan2016-04-071-2/+2
|\ \ | | | | | | | | | 62b9a55 Reduce block timeout to 10 minutes (Wladimir J. van der Laan)
| * | Reduce block timeout to 10 minutesWladimir J. van der Laan2016-04-071-2/+2
|/ / | | | | | | | | Now that #7804 fixed the timeout handling, reduce the block timeout from 20 minutes to 10 minutes. 20 minutes is overkill.
* | Merge #7804: Track block download times per individual blockWladimir J. van der Laan2016-04-072-31/+40
|\ \ | | | | | | | | | | | | 0e24bbf Self check after the last peer is removed (Pieter Wuille) 2d1d658 Track block download times per individual block (Pieter Wuille)
| * | Self check after the last peer is removedPieter Wuille2016-04-071-0/+7
| | |
| * | Track block download times per individual blockPieter Wuille2016-04-072-31/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we're keeping a timeout for each requested block, starting from when it is requested, with a correction factor for the number of blocks in the queue. That's unnecessarily complicated and inaccurate. As peers process block requests in order, we can make the timeout for each block start counting only when all previous ones have been received, and have a correction based on the number of peers, rather than the total number of blocks.
* | | Merge #7821: init: allow shutdown during 'Activating best chain...'Wladimir J. van der Laan2016-04-071-0/+2
|\ \ \ | |/ / |/| | | | | 07398e8 init: allow shutdown during 'Activating best chain...' (Wladimir J. van der Laan)
| * | init: allow shutdown during 'Activating best chain...'Wladimir J. van der Laan2016-04-061-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two-line patch to make it possible to shut down bitcoind cleanly during the initial ActivateBestChain. Fixes #6459 (among other complaints). To reproduce: - shutdown bitcoind - copy chainstate - start bitcoind - let the chain sync a bit - shutdown bitcoind - copy back old chainstate - start bitcoind - bitcoind will catch up with all blocks during Init() (the `boost::this_thread::interruption_point` / `ShutdownRequested()` dance is ugly, this should be refactored all over bitcoind at some point when moving from boost::threads to c++11 threads, but it works...)
* | Merge #7802: [qa] httpbasics: Actually test second connectionWladimir J. van der Laan2016-04-061-9/+9
|\ \ | | | | | | | | | fa24456 [qa] httpbasics: Actually test second connection (MarcoFalke)
| * | [qa] httpbasics: Actually test second connectionMarcoFalke2016-04-031-9/+9
| | |
* | | Merge #7803: [qa] maxblocksinflight: Actually enable testWladimir J. van der Laan2016-04-061-30/+26
|\ \ \ | | | | | | | | | | | | fac724c [qa] maxblocksinflight: Actually enable test (MarcoFalke)
| * | | [qa] maxblocksinflight: Actually enable testMarcoFalke2016-04-031-30/+26
| |/ /
* | | Merge #7801: [qa] Remove misleading "errorString syntax"Wladimir J. van der Laan2016-04-063-19/+16
|\ \ \ | |_|/ |/| | | | | ffff866 [qa] Remove misleading "errorString syntax" (MarcoFalke)
| * | [qa] Remove misleading "errorString syntax"MarcoFalke2016-04-033-19/+16
| |/
* | Merge #7793: [doxygen] Fix member commentsWladimir J. van der Laan2016-04-0511-49/+55
|\ \ | | | | | | | | | fada0c4 [doc] Fix doxygen comments for members (MarcoFalke)
| * | [doc] Fix doxygen comments for membersMarcoFalke2016-04-0311-49/+55
| | |
* | | Merge #7788: Use relative paths instead of absolute paths in protoc callsWladimir J. van der Laan2016-04-051-1/+1
|\ \ \ | | | | | | | | | | | | 0087f26 Use relative paths instead of absolute paths (Pavel Janík)
| * | | Use relative paths instead of absolute pathsPavel Janík2016-04-041-1/+1
| |/ /
* | | Merge #7791: Doc: change Precise to Trusty in gitian-building.mdWladimir J. van der Laan2016-04-051-1/+1
|\ \ \ | | | | | | | | | | | | 190c1e2 Doc: change Precise to Trusty in gitian-building.md (JeremyRand)
| * | | Doc: change Precise to Trusty in gitian-building.mdJeremyRand2016-04-021-1/+1
| |/ / | | | | | | https://github.com/bitcoin/bitcoin/commit/2cecb2460002bc645e47e8517b21099b0faec818 changed "precise" to "trusty" in the shell command, but didn't change the text above it accordingly. This commit fixes that.
* | | Merge #7774: RPC: add versionHex in getblock and getblockheader JSON resultsWladimir J. van der Laan2016-04-052-1/+16
|\ \ \ | | | | | | | | | | | | 92107d5 RPC: add versionHex in getblock and getblockheader JSON results; expand data in getblockchaininfo bip9_softforks field. (mruddy)
| * | | RPC: add versionHex in getblock and getblockheader JSON results; expand data ↵mruddy2016-04-042-1/+16
| | | | | | | | | | | | | | | | in getblockchaininfo bip9_softforks field.
* | | | Merge #7776: build: Remove unnecessary executables from gitian releaseWladimir J. van der Laan2016-04-054-12/+15
|\ \ \ \ | | | | | | | | | | | | | | | f063863 build: Remove unnecessary executables from gitian release (Wladimir J. van der Laan)
| * | | | build: Remove unnecessary executables from gitian releaseWladimir J. van der Laan2016-04-034-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following executables from the binary gitian release: - test_bitcoin-qt[.exe] - bench_bitcoin[.exe] @jonasschnelli and me discussed this on IRC a few days ago - unlike the normal `bitcoin_tests` which is useful to see if it is safe to run bitcoin on a certain OS/environment combination, there is no good reason to include these. Better to leave them out to reduce the download size. Sizes from the 0.12 release: ``` 2.4M bitcoin-0.12.0/bin/bench_bitcoin.exe 22M bitcoin-0.12.0/bin/test_bitcoin-qt.exe ```
* | | | | Merge #7781: devtools: Auto-set branch to merge to in github-mergeWladimir J. van der Laan2016-04-051-12/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 10d3ae1 devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)
| * | | | | devtools: Auto-set branch to merge to in github-mergeWladimir J. van der Laan2016-04-021-12/+22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we are already using the API to retrieve the pull request title, also retrieve the base branch. This makes sure that pull requests for 0.12 automatically end up in 0.12, and pull requests for master automatically end up in master, and so on. It is still possible to override the branch from the command line or using the `githubmerge.branch` git option.
* | | | | Merge #7813: [doc] Update port in tor.mdWladimir J. van der Laan2016-04-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | 3373c43 [doc] Update port in tor.md (Adam Brown)
| * | | | [doc] Update port in tor.mdAdam Brown2016-04-051-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Tor Browser Bundle spawns the Tor process and listens on port 9150, it doesn't randomly pick a port. [ci skip] (cherry picked from commit 1b63cf98347b2a62915425576930f55c2126c2ff)
* | | | Merge #7707: [RPC][QT] UI support for abandoned transactionsJonas Schnelli2016-04-0412-4/+70
|\ \ \ \ | |_|_|/ |/| | | | | | | 8efed3b [Qt] Support for abandoned/abandoning transactions (Jonas Schnelli)
| * | | [Qt] Support for abandoned/abandoning transactionsJonas Schnelli2016-04-0412-4/+70
| | | |
* | | | Merge #7797: RPC: fix generatetoaddress failing to parse addressWladimir J. van der Laan2016-04-032-1/+24
|\ \ \ \ | | | | | | | | | | | | | | | 60361ca RPC: fix generatetoaddress failing to parse address and add unit test (mruddy)
| * | | | RPC: fix generatetoaddress failing to parse address and add unit testmruddy2016-04-032-1/+24
|/ / / /
* | | | Merge #7778: [qa] Bug fixes and refactorWladimir J. van der Laan2016-04-0328-155/+161
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4444806 [qa] mininode: Combine struct.pack format strings (MarcoFalke) faaa3c9 [qa] mininode: Catch exceptions in got_data (MarcoFalke) fa2cea1 [qa] rpc-tests: Properly use integers, floats (MarcoFalke) fa524d9 [qa] Use python2/3 syntax (MarcoFalke)
| * | | | [qa] mininode: Combine struct.pack format stringsMarcoFalke2016-04-021-15/+15
| | | | |
| * | | | [qa] mininode: Catch exceptions in got_dataMarcoFalke2016-04-011-36/+39
| | | | |
| * | | | [qa] rpc-tests: Properly use integers, floatsMarcoFalke2016-04-0115-45/+45
| | | | |
| * | | | [qa] Use python2/3 syntaxMarcoFalke2016-03-3121-75/+78
| | |/ / | |/| |
* | | | Merge #7789: [Doc] Add note about using the Qt official binary installer.Wladimir J. van der Laan2016-04-031-2/+12
|\ \ \ \ | |_|_|/ |/| | | | | | | 4b9dfd6 Add note about using the Qt official binary installer. (Pavel Janík)
| * | | Add note about using the Qt official binary installer.Pavel Janík2016-04-021-2/+12
|/ / /
* | | Merge #7691: [Wallet] refactor wallet/init interactionWladimir J. van der Laan2016-04-025-125/+118
|\ \ \ | | | | | | | | | | | | 25340b7 [Wallet] refactor wallet/init interaction (Jonas Schnelli)
| * | | [Wallet] refactor wallet/init interactionJonas Schnelli2016-03-225-125/+118
| | | |
* | | | Merge #7711: [build-aux] Update Boost & check macros to latest serialsWladimir J. van der Laan2016-04-028-219/+395
|\ \ \ \ | | | | | | | | | | | | | | | cf5c786 [build-aux] Update Boost & check macros to latest serials (fanquake)
| * | | | [build-aux] Update Boost & check macros to latest serialsfanquake2016-03-198-219/+395
| | | | |