Wladimir J. van der Laan
70ac71b877
Merge #7801 : [qa] Remove misleading "errorString syntax"
...
ffff866
[qa] Remove misleading "errorString syntax" (MarcoFalke)
2016-04-06 14:12:44 +02:00
Jonas Schnelli
9f7336b457
[Wallet] slightly refactor GetOldestKeyPoolTime()
2016-04-06 11:06:25 +02:00
Jonas Schnelli
4f7c959af1
Refactor IsRBFOptIn, avoid exception
2016-04-06 10:59:03 +02:00
Wladimir J. van der Laan
07398e8e9d
init: allow shutdown during 'Activating best chain...'
...
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...)
2016-04-06 10:33:19 +02:00
mruddy
eda3d92489
Net: Add IPv6 Link-Local Address Support
2016-04-05 22:26:38 +00:00
Wladimir J. van der Laan
1b2460bd58
Merge #7793 : [doxygen] Fix member comments
...
fada0c4
[doc] Fix doxygen comments for members (MarcoFalke)
2016-04-05 17:49:47 +02:00
Wladimir J. van der Laan
4dc1b3a296
Merge #7788 : Use relative paths instead of absolute paths in protoc calls
...
0087f26
Use relative paths instead of absolute paths (Pavel Janík)
2016-04-05 17:38:41 +02:00
Wladimir J. van der Laan
e30a5b0aaa
Merge #7791 : Doc: change Precise to Trusty in gitian-building.md
...
190c1e2
Doc: change Precise to Trusty in gitian-building.md (JeremyRand)
2016-04-05 16:21:21 +02:00
Pieter Wuille
dde46d3ae1
Merge script_valid and script_invalid tests
2016-04-05 16:11:47 +02:00
Wladimir J. van der Laan
916b15a87a
Merge #7774 : RPC: add versionHex in getblock and getblockheader JSON results
...
92107d5
RPC: add versionHex in getblock and getblockheader JSON results; expand data in getblockchaininfo bip9_softforks field. (mruddy)
2016-04-05 16:09:17 +02:00
Pieter Wuille
009b503792
Get rid of expect in script_tests as it's implied by scripterror
2016-04-05 15:50:17 +02:00
Pieter Wuille
76da761351
Make script_error a mandatory 4th field for script_tests
2016-04-05 15:46:16 +02:00
Wladimir J. van der Laan
3cc0fb3a23
Merge #7776 : build: Remove unnecessary executables from gitian release
...
f063863
build: Remove unnecessary executables from gitian release (Wladimir J. van der Laan)
2016-04-05 15:44:48 +02:00
Wladimir J. van der Laan
55db5f07b1
Merge #7781 : devtools: Auto-set branch to merge to in github-merge
...
10d3ae1
devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)
2016-04-05 15:41:34 +02:00
Wladimir J. van der Laan
214ec0b5e8
Merge #7813 : [doc] Update port in tor.md
...
3373c43
[doc] Update port in tor.md (Adam Brown)
2016-04-05 15:40:10 +02:00
Adam Brown
3373c43505
[doc] Update port in tor.md
...
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)
2016-04-05 14:54:39 +02:00
Pieter Wuille
269281b7cc
Fix some misconstructed tests
...
They claimed to be testing P2SH scripts with non-push scriptSigs, but
1) they were not enabling P2SH
2) they have push-only scriptSigs
Fix this, and add a few more related cases.
2016-04-05 14:54:37 +02:00
Pieter Wuille
d03e46625a
Fix formatting of NOPs for generated script tests
2016-04-05 14:54:37 +02:00
Pieter Wuille
c7c664191f
Fix JSON pretty printing in script_tests
2016-04-05 14:54:33 +02:00
MarcoFalke
fac9ca2ec6
[travis] echo $TRAVIS_COMMIT_RANGE
2016-04-05 12:40:05 +02:00
Cory Fields
11d9f6b8b8
depends: qt/cctools: fix checksum checksum tests
...
Checksums were being verified after download, but not again before extraction
2016-04-04 19:26:45 -04:00
Cory Fields
bb717f4375
depends: fix "unexpected operator" error during "make download"
2016-04-04 19:26:44 -04:00
Cory Fields
fe740f1469
depends: fix fallback downloads
...
In some cases, failed downloads wouldn't trigger a fallback download attempt.
Namely, checksum mismatches.
2016-04-04 19:26:44 -04:00
Cory Fields
dc4ec6d3db
depends: create a hostid and buildid and add option for salts
...
These add very simple sanity checks to ensure that the build/host toolchains
have not changed since the last run. If they have, all ids will change and
packages will be rebuilt.
For more complicated usage (like parsing dpkg), HOST_ID_SALT/BUILD_ID_SALT may
be used to introduce arbitrary data to the ids.
2016-04-04 19:26:44 -04:00
mruddy
92107d574d
RPC: add versionHex in getblock and getblockheader JSON results; expand data in getblockchaininfo bip9_softforks field.
2016-04-04 22:21:00 +00:00
Pavel Janík
0087f26848
Use relative paths instead of absolute paths
2016-04-04 19:56:59 +02:00
Jonas Schnelli
a9149688f8
Merge #7707 : [RPC][QT] UI support for abandoned transactions
...
8efed3b
[Qt] Support for abandoned/abandoning transactions (Jonas Schnelli)
2016-04-04 09:58:33 +02:00
Jonas Schnelli
8efed3bc93
[Qt] Support for abandoned/abandoning transactions
2016-04-04 09:25:34 +02:00
MarcoFalke
ffff866da8
[qa] Remove misleading "errorString syntax"
2016-04-03 21:33:56 +02:00
MarcoFalke
fac724c78f
[qa] maxblocksinflight: Actually enable test
2016-04-03 20:49:32 +02:00
MarcoFalke
fa24456d0c
[qa] httpbasics: Actually test second connection
2016-04-03 20:43:56 +02:00
Wladimir J. van der Laan
e662a76288
Merge #7797 : RPC: fix generatetoaddress failing to parse address
...
60361ca
RPC: fix generatetoaddress failing to parse address and add unit test (mruddy)
2016-04-03 17:34:00 +02:00
mruddy
60361ca481
RPC: fix generatetoaddress failing to parse address and add unit test
2016-04-03 14:30:00 +00:00
Wladimir J. van der Laan
ff5874bcf7
Merge #7778 : [qa] Bug fixes and refactor
...
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)
2016-04-03 15:54:35 +02:00
Wladimir J. van der Laan
f063863d1f
build: Remove unnecessary executables from gitian release
...
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
```
2016-04-03 15:11:44 +02:00
Wladimir J. van der Laan
e0b3e19816
Merge #7789 : [Doc] Add note about using the Qt official binary installer.
...
4b9dfd6
Add note about using the Qt official binary installer. (Pavel Janík)
2016-04-03 15:06:41 +02:00
MarcoFalke
faef3b710f
[travis] Print the commit which was evaluated
2016-04-03 14:50:49 +02:00
MarcoFalke
fada0c422c
[doc] Fix doxygen comments for members
2016-04-03 11:58:01 +02:00
JeremyRand
190c1e234d
Doc: change Precise to Trusty in gitian-building.md
...
2cecb24600
changed "precise" to "trusty" in the shell command, but didn't change the text above it accordingly. This commit fixes that.
2016-04-02 22:10:28 +00:00
Pavel Janík
4b9dfd6d81
Add note about using the Qt official binary installer.
2016-04-02 18:54:12 +02:00
MarcoFalke
fabbf80f2f
[ui] Move InitError, InitWarning, AmountErrMsg
2016-04-02 15:26:21 +02:00
MarcoFalke
444480649f
[qa] mininode: Combine struct.pack format strings
2016-04-02 11:48:07 +02:00
Wladimir J. van der Laan
30c2dd8d05
Merge #7691 : [Wallet] refactor wallet/init interaction
...
25340b7
[Wallet] refactor wallet/init interaction (Jonas Schnelli)
2016-04-02 11:07:39 +02:00
Wladimir J. van der Laan
a67bc5e128
Merge #7711 : [build-aux] Update Boost & check macros to latest serials
...
cf5c786
[build-aux] Update Boost & check macros to latest serials (fanquake)
2016-04-02 08:15:11 +02:00
Wladimir J. van der Laan
10d3ae102a
devtools: Auto-set branch to merge to in github-merge
...
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.
2016-04-02 08:13:49 +02:00
Wladimir J. van der Laan
c4df72bafc
Merge #7785 : Trivial: Fix typo: Optimizaton -> Optimization [skip ci]
...
a22bde9
Fix typo: Optimizaton -> Optimization (paveljanik)
2016-04-02 07:15:01 +02:00
paveljanik
a22bde9449
Fix typo: Optimizaton -> Optimization
2016-04-01 21:31:48 +02:00
MarcoFalke
faaa3c9b65
[qa] mininode: Catch exceptions in got_data
2016-04-01 21:23:49 +02:00
MarcoFalke
fa2cea163b
[qa] rpc-tests: Properly use integers, floats
2016-04-01 21:23:30 +02:00
Wladimir J. van der Laan
e9723cb273
Merge #7489 : tests: Make proxy_test work on travis servers without IPv6
...
7539f1a
tests: Make proxy_test work on travis servers without IPv6 (Wladimir J. van der Laan)
2016-04-01 14:42:26 +02:00