Commit Graph

10011 Commits

Author SHA1 Message Date
Jonas Schnelli
fe98533b40 [Qt] Disable some menu items during splashscreen/verification state
Github-Pull: #8042
Rebased-From: 276ce84fd3a9561a11ae4c5a00c71ff44d3a59a9
2016-07-04 11:05:07 +02:00
Wladimir J. van der Laan
080457c4ee
Merge #8148: Backport leveldb build integration to 0.12
9462e79 This is a cherry-pick of 89c844d back to 0.12. (Johnathan Corgan)
932aedd Cherry-pick of f59dceb (#7925) to 0.12. (Johnathan Corgan)
03c709b Backport leveldb build integration to 0.12 (Johnathan Corgan)
2016-06-28 16:05:07 +02:00
Wladimir J. van der Laan
9adad33938
Merge #8236: [doc] 0.12.2: prepare release notes
ffff324 [doc] 0.12: prepare release notes (MarcoFalke)
2016-06-22 16:44:06 +02:00
MarcoFalke
ffff324c1b [doc] 0.12: prepare release notes 2016-06-22 09:49:19 +02:00
Wladimir J. van der Laan
f3eebcf515
Merge #8230: Fix LogPrint to LogPrintf
ba61949 Fix LogPrint to LogPrintf (TheLazieR Yip)
2016-06-21 10:10:04 +02:00
TheLazieR Yip
ba6194928a Fix LogPrint to LogPrintf
Printing Log without category defined should use LogPrintf
2016-06-21 00:46:59 +07:00
Wladimir J. van der Laan
44fdacc19f
Merge #8185: [0.12.2] Various qa and test backports
dc38a53 [qa] Move create_tx() to util.py (MarcoFalke)
c0fe8b5 [qa] smartfees: Properly use ordered dict (MarcoFalke)
493b89e [qa] test_framework: Properly print exceptions and assert empty dict (MarcoFalke)
7a83489 Tests: Fix deserialization of reject messages (Suhas Daftuar)
e0b1bbe [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke)
697ed8c Check if zmq is installed in tests, update docs (Elliot Olds)
d5a9de3 tests: Check Content-Type header returned from RPC server (Wladimir J. van der Laan)
ed2f0e3 [qa] maxblocksinflight: Actually enable test (MarcoFalke)
3036282 [qa] httpbasics: Actually test second connection (MarcoFalke)
afbc000 test_framework: python3.4 authproxy compat (Wladimir J. van der Laan)
80b6bfa test_framework: detect failure of bitcoind startup (Wladimir J. van der Laan)
4ffd309 Create SingleNodeConnCB class for RPC tests (Alex Morcos)
4fd6008 travis: 'make check' in parallel and verbose (Cory Fields)
2d2b045 Reenable multithread scheduler test (Pavel Janík)
658307e test: Add more thorough test for dbwrapper iterators (Wladimir J. van der Laan)
2016-06-20 14:06:16 +02:00
MarcoFalke
dc38a53d56 [qa] Move create_tx() to util.py
(cherry picked from commit fa8cd46f39778925eaf2caf812cccd9fb8503368)
2016-06-10 00:33:26 +02:00
MarcoFalke
c0fe8b5c7d [qa] smartfees: Properly use ordered dict
Github-Pull: #7980
Rebased-From: fa17f93fbd2889c020849b941a94c5bd8a619a3c 43bbcd075355630544a530f3cc52014edb3787b2
2016-06-10 00:25:22 +02:00
MarcoFalke
493b89e959 [qa] test_framework: Properly print exceptions and assert empty dict
Github-Pull: #7951
Rebased-From: 5555528b47b7d33a5b963c076e6bb09ee25931b5 fada064f67302502f6b51d9d22927381c2707cbb
2016-06-10 00:22:41 +02:00
Suhas Daftuar
7a8348994b Tests: Fix deserialization of reject messages
Github-Pull: #7912
Rebased-From: 807fa47a1e5c9f072d7dbf549bf17f66c47dbf46
2016-06-10 00:20:33 +02:00
MarcoFalke
e0b1bbeae0 [qa] pull-tester: Don't mute zmq ImportError
Github-Pull: #7851
Rebased-From: fa05e22e919b7e2e816606f0c0d3dea1bd325bfd faa4f22342b682a5ead1bbb8587facd761b4ac2d fae1f4ebfe6be4426685b22166f5367c92ba0833
2016-06-10 00:11:51 +02:00
Elliot Olds
697ed8c827 Check if zmq is installed in tests, update docs
Github-Pull: #7635
Rebased-From: 2ab835ae6c02de14264896d571c0bba230a1e9f0
2016-06-10 00:07:50 +02:00
Wladimir J. van der Laan
d5a9de352c tests: Check Content-Type header returned from RPC server
Github-Pull: #7833
Rebased-From: 5078ca45438e8f8d8e7cd937659887fb8ec70038
2016-06-10 00:03:57 +02:00
MarcoFalke
ed2f0e3ac1 [qa] maxblocksinflight: Actually enable test
Github-Pull: #7803
Rebased-From: fac724c78f281168ea174c36cada4f95112aea6d
2016-06-10 00:01:51 +02:00
MarcoFalke
3036282c7a [qa] httpbasics: Actually test second connection
Github-Pull: #7802
Rebased-From: fa24456d0c4cd0f6571bcf3d8f1f51d8d4242a3e
2016-06-10 00:01:08 +02:00
Wladimir J. van der Laan
afbc000b0b test_framework: python3.4 authproxy compat
Github-Pull: #7751
Rebased-From: d7b80b54fbb73acc92ddee84697ac4cc10d4d336 e7e48ba66cb597621a30945da9ca7fc36a6dc84c
2016-06-09 23:55:27 +02:00
Wladimir J. van der Laan
80b6bfaeaa test_framework: detect failure of bitcoind startup
Github-Pull: #7744
Rebased-From: 018b60c5ea703ed12edcde034a185f79e77e5576
2016-06-09 23:51:53 +02:00
Alex Morcos
4ffd309b25 Create SingleNodeConnCB class for RPC tests
(cherry picked from commit 5fa66e4682a59047d2ed2934760ccc052fd85f50)
2016-06-09 23:44:55 +02:00
Cory Fields
4fd6008105 travis: 'make check' in parallel and verbose
Github-Pull: #8072
Rebased-From: 401ae654b247d80e29e76ebd094e9e37409941bd
2016-06-09 23:30:18 +02:00
Pavel Janík
2d2b04543d Reenable multithread scheduler test
Github-Pull: #8016
Rebased-From: db18ab28c7a74bb289bfe6a5f9a4a9f963f71c0b 166e4b0dfa283fbdedc9a6a1e83296500c853a31
2016-06-09 22:52:04 +02:00
Wladimir J. van der Laan
658307e835 test: Add more thorough test for dbwrapper iterators
Github-Pull: #7992
Rebased-From: 84c13e759dbb0de282e2c8ce43d77f4d52fda6d9 6030625631c62b0ffab2ac545c8351fa59dca483 269a4402a8617a539a70b2c332e86f0fe292a7a6
2016-06-09 22:47:27 +02:00
Jonas Schnelli
0f8d574e8f
OSX diskimages need 0775 folder permissions
Avoids endless Gatekeeper warnings (#7085)

Conflicts:
	contrib/gitian-descriptors/gitian-osx-signer.yml

Github-Pull: #8169
Rebased-From: cdf7dff4248ec4050e535079227dd57cbfb610e4
2016-06-09 10:52:43 +02:00
Wladimir J. van der Laan
20d00a180e
Merge #7938: [0.12.2] Backports
c3d1bc3 CBase58Data::SetString: cleanse the full vector (Kaz Wesley)
43c14ac Fix headers announcements edge case (Suhas Daftuar)
06c73a1 Removed call to `TryCreateDirectory` from `GetDefaultDataDir` in `src/util.cpp`. (Alexander Regueiro)
7e71785 Use txid as key in mapAlreadyAskedFor (Suhas Daftuar)
5583a3d Add curl to Gitian setup instrustions (BtcDrak)
d3ead9b Avoid "Unknown command" messages when receiving getaddr on outbound connections. (R E Broadley)
a5bc6a1 Remove vfReachable and modify IsReachable to only use vfLimited. (Patrick Strateman)
52c1011 Clarify description of blockindex (Matthew Zipkin)
21b2f82 Don't resend wallet txs that aren't in our own mempool (Alex Morcos)
66d5408 Fix memleak in TorController [rework] (Wladimir J. van der Laan)
1c3d38b Remove spurious dollar sign. Fixes #7189. (Chris Moore)
64fd0ce fix spelling of advertise in src and doc (jloughry)
a9e73f7 Fix and cleanup listreceivedbyX documentation (instagibbs)
9095594 Do not download transactions during inital sync (ptschip)
2016-06-09 10:22:52 +02:00
Johnathan Corgan
9462e791b7 This is a cherry-pick of 89c844d back to 0.12.
=====

Re-instate TARGET_OS=linux in configure.ac. Removed by 351abf9e035.
2016-06-08 06:41:03 -07:00
Johnathan Corgan
932aedd99a Cherry-pick of f59dceb (#7925) to 0.12.
=====

qt: Fix out-of-tree GUI builds

Without this patch:

- When I compile the GUI from the bitcoin directory itself, it works as
  expected.

- When I build the GUI in an out-of-tree build, I cannot get it to
  select tabs. When I click, say the "Receive" tab nothing happens,
  the button selects but it doesn't switch the page. The rest - even
  the debug window - seems to work.

See full discussion here:
https://github.com/bitcoin/bitcoin/pull/7911#issuecomment-212413442

This turned out to be caused by a mismatch in the arguments to moc,
preventing it from finding `bitcoin-config.h`. Fix this by passing
`$(DEFAULT_INCLUDES)` to it, which gets set to the appropriate
path by autoconf itself.
2016-06-08 06:29:27 -07:00
Johnathan Corgan
03c709b422 Backport leveldb build integration to 0.12
This is a cherry-pick of a4625acb with minor conflict
resolution.

Conflicts:
	src/Makefile.am

=====

leveldb: integrate leveldb into our buildsystem

leveldb's buildsystem causes us a few problems:
- breaks out-of-tree builds
- forces flags used for some tools
- limits cross builds

Rather than continuing to add wrappers around it, simply integrate it into our
build.
2016-06-05 12:48:57 -07:00
Kaz Wesley
c3d1bc33b5 CBase58Data::SetString: cleanse the full vector
SetString seems to be passing the length of the wrong variable to
memory_cleanse, resulting in the last byte of the temporary buffer not being
securely erased.

Github-Pull: #7922
Rebased-From: 57704499be948c640c789c7fc11ed1abf8a681bd
2016-06-04 18:01:02 +02:00
Wladimir J. van der Laan
e7ec24e336
Merge #8001: [0.12.2] backport script_tests improvements
e3a9ce9 Refactor script tests (Pieter Wuille)
87129b2 test: script_error checking in script_invalid tests (Wladimir J. van der Laan)
2016-05-31 15:52:55 +02:00
Wladimir J. van der Laan
c3aedca2df
doc: Remove outdated qt4 install information from README.md
- doc: Remove outdated qt4 install information from README.md
- doc: 32 and 64 bit packages are seperate

Github-Pull: #8048
Rebased-From: e5764e69cbd0bf4eb98c96eeb31c94349bbe7b7c 6075bc4d67bcd5f95561dc6d53b4fdbaf2c63f4b
2016-05-18 12:17:58 +02:00
Pieter Wuille
e3a9ce9c94 Refactor script tests
Github-Pull: #7818
Rebased-From: c7c664191fd6ca4843cfe9d00abf8f2362b9550f 269281b7cc56e728fa64803fc7509ab3a0ce1805 d03e46625ac95954bb9ecbc2cf73ffd8de6b8a13 76da7613517d05aca31c2cee42b5ebf3d5c54974 009b503792737ab03aeb6e15060bc4f499500a96 dde46d3ae1de18700e089bc1861cf1e18649dc5d
2016-05-04 13:01:59 +02:00
Wladimir J. van der Laan
87129b24e1 test: script_error checking in script_invalid tests
Github-Pull: #7517
Rebased-From: b0ff8572aeb8211ad30f24ca42d20a46debb5e9d 2317ad7c56c6f5a55984459947f69cc3bfbe340a 0ecb3401fe157cb0779d3970c6080b463b1b0ed2
2016-05-04 13:01:55 +02:00
Suhas Daftuar
43c14acf14 Fix headers announcements edge case
Previously we would assert that if every block in vBlockHashesToAnnounce is in
chainActive, then the blocks to be announced must connect.  However, there are
edge cases where this assumption could be violated (eg using invalidateblock /
reconsiderblock), so just check for this case and revert to inv-announcement
instead.

Github-Pull: #7919
Rebased-From: 3a99fb2cb14955f5e029d315041a093e957e6c3e
2016-04-27 22:34:48 +02:00
Alexander Regueiro
06c73a1751 Removed call to TryCreateDirectory from GetDefaultDataDir in src/util.cpp.
See https://github.com/bitcoin/bitcoin/issues/7845#issuecomment-207684728.
Also refactored `GetDefaultDataDir` function to return path for Mac in one expression.

Github-Pull: #7850
Rebased-From: 41dbc4849e0bf14eef98962b0f0bddcde0bb3014
2016-04-27 22:34:48 +02:00
Suhas Daftuar
7e71785c40 Use txid as key in mapAlreadyAskedFor
Previously we used the CInv that would be sent to the peer announcing the
transaction as the key, but using the txid instead allows us to decouple the
p2p layer from the application logic (which relies on this map to avoid
duplicate tx requests).

Github-Pull: #7862
Rebased-From: 7e91f632c70ff1848a152f24ee67a06796803943
2016-04-27 22:34:48 +02:00
BtcDrak
5583a3d0a7 Add curl to Gitian setup instrustions
curl is required to fetch dependencies

Github-Pull: #7658
Rebased-From: ce41cf082c861cc8d333b811b3101d52d06f50ec
2016-04-27 22:34:48 +02:00
R E Broadley
d3ead9bcb6 Avoid "Unknown command" messages when receiving getaddr on outbound connections.
Github-Pull: #7642
Rebased-From: d84ea1a59ce3704457a162f1fd8a7353047156de
2016-04-27 22:34:48 +02:00
Patrick Strateman
a5bc6a1bc4 Remove vfReachable and modify IsReachable to only use vfLimited.
We do not know that a class of Network is reachable, only that it is not.

Github-Pull: #7553
Rebased-From: 110b62f06992d0fb989153afff2dc3aea62a674f
2016-04-27 22:34:48 +02:00
Matthew Zipkin
52c101158f Clarify description of blockindex
see issues:

https://github.com/bitcoin-dot-org/bitcoin.org/issues/1237

https://github.com/bitcoin/bitcoin/issues/7532

Github-Pull: #7541
Rebased-From: 7eef1d0dad0c48e9faefdc4fe5cfb6182edc79ab
2016-04-27 22:34:48 +02:00
Alex Morcos
21b2f82eb7 Don't resend wallet txs that aren't in our own mempool
Github-Pull: #7521
Rebased-From: 5a2b1c0c8b49c5ae79946e71b9f989b33c9fcf5c
2016-04-27 22:34:48 +02:00
Wladimir J. van der Laan
66d5408559 Fix memleak in TorController [rework]
It looks like, TorController::disconnected_cb(TorControlConnection&
conn) gets called multiple times which results in multiple event_new().

Avoid this by creating the event only once in the constructore, and
deleting it only once in the destructor (thanks to Cory Fields for the
idea).

Replaces the fix by Jonas Schnelli in #7610, see discussion there.

Github-Pull: #7637
Rebased-From: e2195037116f47b11b66452351dba4fe606423a2
2016-04-27 22:34:48 +02:00
Chris Moore
1c3d38bde7 Remove spurious dollar sign. Fixes #7189.
Github-Pull: #7189
Rebased-From: 3d19193f14b9400f7c908a61375c330113571a38
2016-04-27 22:34:48 +02:00
jloughry
64fd0ce1d9 fix spelling of advertise in src and doc
Github-Pull: #7526
Rebased-From: 37767fd46f673a06864df6e14d3030622b1cb2c9
2016-04-27 22:34:48 +02:00
instagibbs
a9e73f71d4 Fix and cleanup listreceivedbyX documentation
Github-Pull: #7527
Rebased-From: c372572595b6b19a4dd88258401d8a0046ce4469
2016-04-27 22:34:48 +02:00
ptschip
90955940d5 Do not download transactions during inital sync
Github-Pull: #7164
Rebased-From: 39a525c21fd1b34df63ab30868423b97b708ee49
2016-04-27 22:34:47 +02:00
Wladimir J. van der Laan
18b3c3ced8
Merge #7950: [0.12] travis: switch to Trusty
564aaa2 travis: switch to Trusty (Cory Fields)
9ca957b tests: Make proxy_test work on travis servers without IPv6 (Wladimir J. van der Laan)
2016-04-27 14:11:44 +02:00
Cory Fields
564aaa2cd0 travis: switch to Trusty
Github-Pull: #7920
Rebased-From: 06fdffd222ba0a00add4abe9fab9ad2c3e220d8f, 9267a47d86d0673eae9e504ee566aa4e0410d923, cf77fcdb1fe525b63b004ef729173f04bdb48882, 174023c9b008fc02316bce972b0c1031de3feee3, a33b7c9cb545985771d074748c0e368ca2d06702
2016-04-27 12:29:56 +02:00
Wladimir J. van der Laan
9ca957bcd4 tests: Make proxy_test work on travis servers without IPv6
Github-Pull: #7489
Rebased-From: 7539f1aae3b41279dc5d49e09f448a78a071e114
2016-04-27 12:29:56 +02:00
MarcoFalke
89ae85484c
Merge #7811: [0.12.2] qa Backports
6862627 Add listunspent() test for spendable/unspendable UTXO (Joao Fonseca)
28ba22c [qa] Remove misleading "errorString syntax" (MarcoFalke)
f1f1b82 [qa] py2: Unfiddle strings into bytes explicitly (MarcoFalke)
c0d9e31 Tests: make prioritise_transaction.py more robust (Suhas Daftuar)
ff9b436 [qa] Bug fixes and refactor (MarcoFalke)
b1dd64b [qa] wallet: Wait for reindex to catch up (MarcoFalke)
f23cb7c [qa] Add tests verifychain, lockunspent, getbalance, listsinceblock (MarcoFalke)
3316552 [qa] Test walletpassphrase timeout (MarcoFalke)
6aae129 [qa] wallet: Print maintenance (MarcoFalke)
ad8c743 [qa] Extend tests (MarcoFalke)
d89fbfe [qa] rpc-test: Normalize assert() (MarcoFalke)
2016-04-25 14:59:52 +02:00
Joao Fonseca
6862627ce6 Add listunspent() test for spendable/unspendable UTXO
Github-Pull: #7822
Rebased-From: fa942c755ab513829dcab27487ba1e7ab5a806ee 5d217decc1145823a3c126658c82c60cf7dbfec8
2016-04-19 16:37:14 +02:00