aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge #7785: Trivial: Fix typo: Optimizaton -> Optimization [skip ci]Wladimir J. van der Laan2016-04-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a22bde9 Fix typo: Optimizaton -> Optimization (paveljanik)
| | * | | | | | | | | | | | | | | | | | Fix typo: Optimizaton -> Optimizationpaveljanik2016-04-011-1/+1
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge #7489: tests: Make proxy_test work on travis servers without IPv6Wladimir J. van der Laan2016-04-012-31/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7539f1a tests: Make proxy_test work on travis servers without IPv6 (Wladimir J. van der Laan)
| | * | | | | | | | | | | | | | | | | tests: Make proxy_test work on travis servers without IPv6Wladimir J. van der Laan2016-02-092-31/+58
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge #7477: Fix quoting of copyright holders in configure.ac.Wladimir J. van der Laan2016-03-311-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72fd008 Fix quoting of copyright holders in configure.ac. (Daniel Kraft)
| | * | | | | | | | | | | | | | | | | | Fix quoting of copyright holders in configure.ac.Daniel Kraft2016-02-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old configure.ac did not work for a copyright holders string containing commas due to insufficient quoting. The new one allows this. While this is, of course, not of direct consequence to the current code (where the string is "Bitcoin Core"), it should still be fixed now that the string is actually factored out.
| * | | | | | | | | | | | | | | | | | | Merge #7772: Clear the input line after activating autocompleteJonas Schnelli2016-03-311-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae2156f Clear the input line after activating autocomplete (Pavel Janík)
| | * | | | | | | | | | | | | | | | | | | Clear the input line after activating autocompletePavel Janík2016-03-301-0/+2
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge #7747: [docs] added depends cross compile infoWladimir J. van der Laan2016-03-311-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e55b3a [doc] added depends cross compile info (accraze)
| | * | | | | | | | | | | | | | | | | | | | [doc] added depends cross compile infoaccraze2016-03-301-0/+23
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge #7763: Put hex-encoded version in UpdateTipWladimir J. van der Laan2016-03-312-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eff736e Reformat version in UpdateTip and other messages (Pieter Wuille)
| | * | | | | | | | | | | | | | | | | | | | | Reformat version in UpdateTip and other messagesPieter Wuille2016-03-312-5/+5
| | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the hardly-readable nBits from UpdateTip's log message.
| * | | | | | | | | | | | | | | | | | | | | Merge #7773: Fix comments in testsWladimir J. van der Laan2016-03-311-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40234ba Fix comments in tests (BtcDrak)
| | * | | | | | | | | | | | | | | | | | | | | Fix comments in testsBtcDrak2016-03-301-3/+3
| | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge #7766: rpc: Register calls where they are definedWladimir J. van der Laan2016-03-3115-137/+165
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb8a8cf rpc: Register calls where they are defined (Wladimir J. van der Laan)
| | * | | | | | | | | | | | | | | | | | | | rpc: Register calls where they are definedWladimir J. van der Laan2016-03-3115-137/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split out methods to every module, apart from 'help' and 'stop' which are implemented in rpcserver.cpp itself. - This makes it easier to add or remove RPC commands - no longer everything that includes rpcserver.h has to be rebuilt when there's a change there. - Cleans up `rpc/server.h` by getting rid of the huge cluttered list of function definitions. - Removes most of the bitcoin-specific code from rpcserver.cpp and .h. Continues #7307 for the non-wallet.
| * | | | | | | | | | | | | | | | | | | | | Merge #7648: BIP9 versionbits softfork for BIP68, BIP112 and BIP113Wladimir J. van der Laan2016-03-3010-7/+816
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71527a0 Test of BIP9 fork activation of mtp, csv, sequence_lock (NicolasDorier) 19d73d5 Add RPC test for BIP 68/112/113 soft fork. (Alex Morcos) 12c89c9 Policy: allow transaction version 2 relay policy. (BtcDrak) 02c2435 Soft fork logic for BIP68 (BtcDrak) 478fba6 Soft fork logic for BIP113 (BtcDrak) 65751a3 Add CHECKSEQUENCEVERIFY softfork through BIP9 (Pieter Wuille)
| | * | | | | | | | | | | | | | | | | | | | Test of BIP9 fork activation of mtp, csv, sequence_lockNicolasDorier2016-03-213-0/+225
| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Add RPC test for BIP 68/112/113 soft fork.Alex Morcos2016-03-182-0/+548
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This RPC test will test both the activation mechanism of the first versionbits soft fork as well as testing many code branches of the consensus logic for BIP's 68, 112, and 113.