Pieter Wuille
5ccd735d30
Merge pull request #4887
...
4bb30a1
Correct logging AcceptBlock()->AcceptBlockHeader() (R E Broadley)
2014-10-03 04:31:44 +02:00
Wladimir J. van der Laan
29f96e8bc6
Merge pull request #4994
...
54510f2
DRY: Avoid repetitions in script_test (jtimon)
2014-10-02 22:41:54 +02:00
Wladimir J. van der Laan
0e64566a82
Merge pull request #4978
...
938bcce
CAutoFile: make file private (Philip Kaufmann)
0c35486
CBufferedFile: add explicit close function (Philip Kaufmann)
c9fb27d
CBufferedFile: convert into a non-refcounted RAII wrapper (Philip Kaufmann)
2014-10-02 22:35:36 +02:00
jtimon
54510f2672
DRY: Avoid repetitions in script_test
2014-10-02 21:48:29 +02:00
Wladimir J. van der Laan
6faee79426
Merge pull request #5034
...
609adc7
depends: disable unused bdb replication manager. Fixes new mingw builds (Cory Fields)
2014-10-02 20:00:59 +02:00
Cory Fields
609adc7660
depends: disable unused bdb replication manager. Fixes new mingw builds
...
Newer mingw supports the features necessary to enable this api, whereas older
versions didn't. However once enabled (automatically by configure), it triggers
an unrelated build bug.
Since it was not enabled previously anyway, and we don't depend on the
functionality, just disable it across the board.
2014-10-02 13:41:31 -04:00
R E Broadley
4bb30a1eb8
Correct logging AcceptBlock()->AcceptBlockHeader()
2014-10-03 01:35:51 +08:00
Wladimir J. van der Laan
20a4b69360
Merge pull request #4985
...
bc470c4
Changed mixed indentation to four spaces (Eric Shaw)
31d6390
Fixed setaccount accepting foreign address (Eric Shaw)
2014-10-02 19:31:50 +02:00
Eric Shaw
bc470c43ee
Changed mixed indentation to four spaces
...
Put `test/rpc_wallet_tests.cpp` through clang-format.
2014-10-02 19:23:30 +02:00
Eric Shaw
31d6390fd1
Fixed setaccount accepting foreign address
...
Fixed issue #4209 where using setaccount with a foreign
address causes the address to be added to your receiving addresses.
2014-10-02 19:21:46 +02:00
Gavin Andresen
4b73b758a3
Merge pull request #5026
...
dd367ff
build: macdeploy: filter out irrelevant qt5 frameworks and dylibs (Cory Fields)
9fedafb
build: Fix OSX build when using Homebrew and qt5 (Cory Fields)
Signed-off-by: Gavin Andresen <gavinandresen@gmail.com>
2014-10-02 11:49:13 -04:00
Wladimir J. van der Laan
45c41c05a0
Merge pull request #5030
...
fbd36d8
Avoid introducing a virtual into CChainParams (Wladimir J. van der Laan)
f0fd00c
Switch testing framework from MAIN to new UNITTEST network (SergioDemianLerner)
2014-10-02 15:28:27 +02:00
Wladimir J. van der Laan
fbd36d8fb5
Avoid introducing a virtual into CChainParams
...
Treat fSkipProofOfWorkCheck the same as other parameters.
2014-10-02 13:54:26 +02:00
SergioDemianLerner
f0fd00cb77
Switch testing framework from MAIN to new UNITTEST network
...
UNITTEST inherites from MAIN but allows synamically changing its parameters using the ModifiableParams() interface
2014-10-02 13:51:39 +02:00
Wladimir J. van der Laan
2dc37e7a49
Merge pull request #4991
...
0dcb0a5
doc: Add instructions for consistent Mac OS X build names (Saivann)
2014-10-02 12:07:13 +02:00
Wladimir J. van der Laan
b76a767906
Merge pull request #5031
...
e2efdf3
amount.h: update license, add header end comment + rem from util.h (Philip Kaufmann)
2014-10-02 11:48:38 +02:00
Philip Kaufmann
e2efdf3937
amount.h: update license, add header end comment + rem from util.h
2014-10-02 11:25:21 +02:00
Philip Kaufmann
938bccebf1
CAutoFile: make file private
2014-10-02 10:59:28 +02:00
Philip Kaufmann
0c35486dc9
CBufferedFile: add explicit close function
...
- also use identical close function for CAutoFile (avoids setting file to
NULL under wrong conditions)
2014-10-02 10:56:10 +02:00
Philip Kaufmann
c9fb27da0a
CBufferedFile: convert into a non-refcounted RAII wrapper
...
- it now takes over the passed file descriptor and closes it in the
destructor
- this fixes a leak in LoadExternalBlockFile(), where an exception could
cause the file to not getting closed
- disallow copies (like recently added for CAutoFile)
- make nType and nVersion private
2014-10-02 10:46:31 +02:00
Wladimir J. van der Laan
8d132431b4
Revert merge of pull #4845
...
It breaks the new mingw tests!
See
- https://travis-ci.org/bitcoin/bitcoin/jobs/36845581
- https://travis-ci.org/bitcoin/bitcoin/jobs/36845582
This reverts commit 4705902777
, 5e2e7fcb99
, a25fd6be13
.
2014-10-02 10:39:55 +02:00
Wladimir J. van der Laan
ad51e14583
Merge pull request #4845
...
4705902
Avoid introducing a virtual into CChainParams (Wladimir J. van der Laan)
5e2e7fc
Suggested corrections on comments, variable names. Also new test case testing the PoW skip in UNITTEST. (SergioDemianLerner)
a25fd6b
Switch testing framework from MAIN to new UNITTEST network (SergioDemianLerner)
2014-10-02 09:47:54 +02:00
Wladimir J. van der Laan
3b390723c1
Merge pull request #5025
...
5ad450a
travis: If the comparison-tool fails, dump the tail of the debug log (Cory Fields)
2014-10-02 09:08:33 +02:00
Wladimir J. van der Laan
00eef5d6e9
Merge pull request #5017
...
f74fc9b
Print input index when signature validation fails, to aid debugging. (Mark Friedenbach)
217a5c9
When transaction outputs exceed inputs, show the offending amounts so as to aid debugging. (Mark Friedenbach)
2014-10-02 08:44:08 +02:00
Wladimir J. van der Laan
90aa73e900
Merge pull request #5027
...
0f78a0a
Upgrade comparison tool further (Pieter Wuille)
2014-10-02 08:29:23 +02:00
Pieter Wuille
76c171033c
Merge pull request #4926
...
584a358
Do merkle root and txid duplicates check simultaneously (Pieter Wuille)
2014-10-02 06:10:19 +02:00
Pieter Wuille
471d38b015
Merge pull request #4980
...
20a11ff
minor variable init changes in init.cpp (Philip Kaufmann)
2014-10-02 04:29:01 +02:00
Pieter Wuille
0f78a0a2eb
Upgrade comparison tool further
2014-10-02 03:55:33 +02:00
Cory Fields
dd367ff8c9
build: macdeploy: filter out irrelevant qt5 frameworks and dylibs
2014-10-01 19:26:29 -04:00
Cory Fields
9fedafba4b
build: Fix OSX build when using Homebrew and qt5
...
Qt5 is bottled, so configure won't find it without some help. Use
brew to find out its prefix.
Also, qt5 added the host_bins variable to pkg-config, use it.
2014-10-01 19:26:29 -04:00
Gavin Andresen
35eaa6b457
Merge pull request #5024 from gavinandresen/osx_sign_fix
...
Keep symlinks when copying into .app bundle
2014-10-01 18:15:18 -04:00
Cory Fields
5ad450a65a
travis: If the comparison-tool fails, dump the tail of the debug log
...
The entire debug log would be huge, and could cause issues for automated tools
like travis. Printing 200 lines is an initial guess at a reasonable number,
more may be required.
2014-10-01 16:47:33 -04:00
Mark Friedenbach
f74fc9b22d
Print input index when signature validation fails, to aid debugging.
2014-10-01 19:14:38 +02:00
Mark Friedenbach
217a5c9238
When transaction outputs exceed inputs, show the offending amounts so as to aid debugging.
2014-10-01 19:14:38 +02:00
Gavin Andresen
965c306d6d
Keep symlinks when copying into .app bundle
...
Code signing failed for me on OSX 10.9.5 because the
Versions/Current symbolic links were being replaced
with a duplicate copy of the frameworks' code.
Releases were bigger than they needed to be, for the
same reason.
2014-10-01 09:58:00 -04:00
Wladimir J. van der Laan
1fbccda8d0
Merge pull request #4940
...
62e5f8f
CMessageHeader sanity changes (Wladimir J. van der Laan)
2014-10-01 13:28:16 +02:00
Wladimir J. van der Laan
a41943df58
Merge pull request #5023
...
e9f3fa7
travis: enable windows tests (Cory Fields)
2014-10-01 13:21:32 +02:00
Cory Fields
e9f3fa7c0b
travis: enable windows tests
2014-10-01 06:59:59 -04:00
Wladimir J. van der Laan
a419f82670
Merge pull request #5022
...
c375b5c
remove dead/unused code in walletdb.cpp (Philip Kaufmann)
2014-10-01 12:56:11 +02:00
Whit J
f60dc15c50
doc: add make install to build-osx.md and build-unix.md
2014-10-01 12:52:32 +02:00
Wladimir J. van der Laan
3fd192f8b4
Merge pull request #4234
...
c122f55
qt: Register CAmount metatype (Wladimir J. van der Laan)
a372168
Use a typedef for monetary values (Mark Friedenbach)
2014-10-01 11:28:55 +02:00
Wladimir J. van der Laan
c122f5528c
qt: Register CAmount metatype
...
This allows sending the type over queued connections.
Also normalize signal/slot names.
2014-10-01 11:06:41 +02:00
Philip Kaufmann
c375b5c102
remove dead/unused code in walletdb.cpp
...
- closes #5021
2014-10-01 11:00:29 +02:00
Wladimir J. van der Laan
b25551101c
Merge pull request #5008
...
41020eb
Fix formatting in init.md (Whit J)
2014-10-01 09:07:42 +02:00
Wladimir J. van der Laan
437634a79e
Merge pull request #5005
...
af0bd5e
osx: fix signing to make Gatekeeper happy (again) (Cory Fields)
2014-10-01 09:00:45 +02:00
Wladimir J. van der Laan
211d2939fd
Merge pull request #5018
...
347a3a3
Update build-unix.md (JL2035)
2014-10-01 08:56:53 +02:00
Wladimir J. van der Laan
a6f3e9d843
Merge pull request #5014
...
41d67c7
tests: fix python test-runner for windows (Cory Fields)
2014-10-01 08:55:34 +02:00
Gavin Andresen
e5836eb692
Merge pull request #5015 from theuni/win64test
...
tests: fix false-positive under win64
2014-09-30 19:54:08 -04:00
JL2035
347a3a3eaa
Update build-unix.md
...
Debian also need libboost-all-dev installed.
2014-10-01 01:53:46 +02:00
Gavin Andresen
7def85e1b5
Merge pull request #5006 from TheBlueMatt/travis-new-comparisontool
...
depends: update the comparison tool to a more recent version
2014-09-30 19:53:35 -04:00