aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-11-06qt: Revert "Force TLS1.0+ for SSL connections"Tim Ruffing
This reverts commit 15e26a6a9afe299b9ca6fced73b876644365879b, whose purpose was to tweak the Qt configuration to force TLS, i.e., to disable SSLv3, in Qt versions >= 5.5. However, the default behavior of Qt >= 5.4 is to disable SSLv3 anyway [1], so the configuration tweak is redundant. With Qt 5.11.2, the configuration tweak is not only redundant but in fact provokes a deadlock (#14359) due to Qt 5.11.2 being incompatible with OpenSSL 1.1.1 [2]. Since the deadlock occurs at the early startup stage of bitcoin-qt, it renders bitcoin-qt entirely non-functional when compiled against OpenSSL 1.1.1 and Qt 5.11.2 (and possible future combinations of OpenSSL and Qt versions). This commit fixes #14359 by removing the redundant code. [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=3fd2d9eff8c1f948306ee5fbfe364ccded1c4b84 [2] https://bugreports.qt.io/browse/QTBUG-70956 Github-Pull: #14403 Rebased-From: 7d173c4cd1885ff5bcf9e5f8f7f712138dd8a445 Tree-SHA512: 71a34b13202c834c5ca73bcb9b70efff26c34e1aac3b954f098620b62c2be53a8e319929c4764a5b5cc5d0dd163ff70f4eb3a4f1f608363b7d23d1b16b25ddc7
2018-10-28Merge #14589: Docs/Release notes: 0.17.0.1 is a minor releaseMarcoFalke
f046d846ae Docs/Release notes: 0.17.0.1 is a minor release (David A. Harding) Pull request description: Suggested by @jnewbery in https://github.com/bitcoin-core/bitcoincore.org/pull/624#pullrequestreview-169055865 Tree-SHA512: 7e3068febaaf13cc31ef48e56ac7c36450fb1fb115e9940af603bb7cb740e93702e69be0eaaf06ff19866837bf29b4f08c1d9e3e55d98a65746a89a0dcab2b69
2018-10-28Merge #14566: 0.17: qa backportsMarcoFalke
9461f98c53 Disable wallet and address book Qt tests on macOS minimal platform (Russell Yanofsky) 703a24418c descriptors.md: Refer to descriptors as describing instead of matching (Russell Yanofsky) 5f51fd6d59 doc/descriptors.md tweaks (Russell Yanofsky) 29899ecd36 Import CInv from correct module (Chun Kuan Lee) f7adb32e38 qa: Run all tests even if wallet is not compiled (MarcoFalke) 86fadee990 qa: Premine to deterministic address with -disablewallet (MarcoFalke) 8bc1badada Test rpc_help.py failed: Check whether ZMQ is enabled or not. (Kvaciral) 24d796a6cc test: Add tests for RPC help (João Barbosa) 168efeaca6 qa: Use named args in some tests (MarcoFalke) 73e538cf6a scripted-diff: Use named arguments in feature_block (MarcoFalke) 96dc936862 scripted-diff: Pass node into p2p_segwit acceptance tests (MarcoFalke) 7ff32a6b98 qa: Add some actual witness in rpc_rawtransaction (MarcoFalke) b72fbabe17 [qa] Use correct python index slices in example test (Suhas Daftuar) 06544faff0 qa: Add TestNode::assert_debug_log (MarcoFalke) Pull request description: Just the test and doc changes from #14328 to prevent that one from piling up. Tree-SHA512: 51c1e66d346cbf51bc67b2f365448620dd9992ba4ef70592c5eb489cd50a047dab8179c86db2cafe161d8b2aa04498cc760fb5deb7eef49b39272911c74227a9
2018-10-27Docs/Release notes: 0.17.0.1 is a minor releaseDavid A. Harding
2018-10-26Merge #14576: Release 0.17.0.1v0.17.0.1Wladimir J. van der Laan
dc4923a71bf64bd48708c7e4bd33765cdae68fdf build: Bump version for 0.17.0.1 (Wladimir J. van der Laan) 248e5ec348979c2d299b04adf93deaafd2b3b2b7 doc: Update release notes for 0.17.0.1 (Wladimir J. van der Laan) Pull request description: Update release notes and bump version Tree-SHA512: b1c3f77150d89450735c2a82cb5d859b11e7463cc3370c46f847a6f7b22318114cf4d3254eb3f6b15dc7204bc43d052781f97d02ef5a76d102d5d42a762be964
2018-10-25Merge #14579: [0.17] travis: Pin flake8 version to 3.5.0MarcoFalke
f9fc08c5f8 travis: Pin flake8 version to 3.5.0 (fanquake) Pull request description: Pin flake8 version to 3.5.0 to fix the linters. Tree-SHA512: 4f06d0aacbdfbbc6d090790aeea5185f2a61259381e586f4015bc0f8c0d0c8fec6156343a9587b8605bc776b39c080bd6584e6e9b685eaba3d90a58c726ac469
2018-10-26travis: Pin flake8 version to 3.5.0fanquake
2018-10-26build: Bump version for 0.17.0.1Wladimir J. van der Laan
2018-10-25doc: Update release notes for 0.17.0.1Wladimir J. van der Laan
2018-10-25[macOS] Remove DS_Store WindowBounds bytes objectJonas Schnelli
Github-Pull: #14416 Rebased-From: 43719e0a3411e6a08e04908332cb44adfa00c6a2 Tree-SHA512: 0b5987abf34a8c62c3f704c4ca3c9837a23fbce11954740461833099157db94418886001993f9f1a0b3252c923bd049bc1e1d0f99d04205c889270755a8cd245
2018-10-24Disable wallet and address book Qt tests on macOS minimal platformRussell Yanofsky
macOS Qt minimal platform is frequently broken, and these are currently failing with Qt 5.11.1. The tests do pass when run on the full cocoa platform (with `test_bitcoin-qt -platform cocoa`). Github-Pull: #14011 Rebased-From: a3197c5294df4711bab0ff6dcdd061ceab115c7d
2018-10-24descriptors.md: Refer to descriptors as describing instead of matchingRussell Yanofsky
Github-Pull: #14161 Rebased-From: eeeaa29214ab99e7f491b21d21bf362a86a48305
2018-10-24doc/descriptors.md tweaksRussell Yanofsky
Add some implementation details, and tweak phrasing in examples section to be more explicit about how script expressions are used for matching. Github-Pull: #14161 Rebased-From: eb494125624eb3d311c6b2e45ce403c61faddd62
2018-10-24Import CInv from correct moduleChun Kuan Lee
Github-Pull: #13965 Rebased-From: a9cf5c9623ad547d9aeebea2b51c2afcfc0f3f4f
2018-10-24qa: Run all tests even if wallet is not compiledMarcoFalke
Github-Pull: #14180 Rebased-From: fac95398366f644911b58f1605e6bc37fb76782d
2018-10-24qa: Premine to deterministic address with -disablewalletMarcoFalke
Github-Pull: #14180 Rebased-From: faa669cbcd1fc799517b523b0f850e01b11bf40a
2018-10-24Test rpc_help.py failed: Check whether ZMQ is enabled or not.Kvaciral
Github-Pull: #14122 Rebased-From: 8dfc2f30dea6bde0f74d23691377f248966011ab
2018-10-24test: Add tests for RPC helpJoão Barbosa
Github-Pull: #14020 Rebased-From: 6af6d9b23dae4edd20c3dad49c835caabf3909b5
2018-10-24qa: Use named args in some testsMarcoFalke
Github-Pull: #14101 Rebased-From: fa782a308dbe7bc579c122f63c1c65666fc85e91
2018-10-24scripted-diff: Use named arguments in feature_blockMarcoFalke
-BEGIN VERIFY SCRIPT- sed -i --regexp-extended -e "s/sync_blocks\((.*?), (True|False), (1.?), /sync_blocks(\1, success=\2, reject_code=\3, reject_reason=/g" ./test/functional/feature_block.py -END VERIFY SCRIPT- Github-Pull: #14101 Rebased-From: b4d33096734d787b0e1d754064039cbb64ce8d61
2018-10-24scripted-diff: Pass node into p2p_segwit acceptance testsMarcoFalke
-BEGIN VERIFY SCRIPT- sed -i --regexp-extended -e 's/(test_witness_block|test_transaction_acceptance)\((self\.nodes\[.\])\.rpc/\1(\2/g' test/functional/p2p_segwit.py -END VERIFY SCRIPT- Github-Pull: #14101 Rebased-From: 749ba35e7c9fbc21dbea27fd1be102b91313d132
2018-10-24qa: Add some actual witness in rpc_rawtransactionMarcoFalke
Github-Pull: #14052 Rebased-From: fae040010deda9404b15b214cec2a099fb831253
2018-10-24[qa] Use correct python index slices in example testSuhas Daftuar
Github-Pull: #14215 Rebased-From: 9dcb6763fb6851df6572e75278a41029fbfe8809
2018-10-24qa: Add TestNode::assert_debug_logMarcoFalke
Github-Pull: #14024 Rebased-From: fa3e9f7627784ee00980590e5bf044a0e1249999
2018-10-19Merge #14509: [0.17] doc: use SegWit in getblocktemplate examplePieter Wuille
f7dbcaa72f [doc] getblocktemplate: use SegWit in example (Sjors Provoost) Pull request description: Backport of #14472 Tree-SHA512: ac0863b5f04abe2cbdbb44f376094aa6c224aecd6d3a87689a2bb5a939cb18503eab6e33bfb9814dd2129ddf1dae0118054afc8eb4c438bd390c172defab343b
2018-10-18[doc] getblocktemplate: use SegWit in exampleSjors Provoost
2018-10-10[wallet] Restore ability to list incoming transactions by labelRussell Yanofsky
Backport of PR 14411 to v0.17. This change partially reverts #13075 and #14023. Fixes #14382
2018-10-03doc: Clean out release notes after release 0.17.0Wladimir J. van der Laan
Tree-SHA512: 0b641fdf4cf4ac6a6f9f5c1b45d65c4449b0d7bb777ba57498e389840ba7a37bfc0569ce5e70f0ac998785fc4eea600ecf6f7c7d83d86513997f4033bcc14a5d
2018-10-01Merge #14157: [0.17] doc: merge upstream release-notes from ↵v0.17.0Wladimir J. van der Laan
bitcoin-core/bitcoin-devwiki 786825c719e40f8c73643fae4ea9e9dca454715f doc: Update release-notes.md from upstream devwiki (fanquake) Pull request description: sipa [suggested in IRC](https://botbot.me/freenode/bitcoin-core-dev/2018-09-06/?msg=104094793&page=1) that now would be a good time to merge the release notes from the [bitcoin-devwiki](https://github.com/bitcoin-core/bitcoin-devwiki). Tree-SHA512: 6d9631e12147b4e64f5382a64cceb71b84ca21bdb3fc516248de79968f7f26e74ab5d569e3767018581bcda4d5b8c8ec103b1795929e98f7e9c4d6e95379f7de
2018-09-30doc: Update release-notes.md from upstream devwikifanquake
2018-09-29depends: fix bitcoin-qt back-compat with older freetype versions at runtimeCory Fields
A few years ago, libfreetype introduced FT_Get_Font_Format() as an alias for FT_Get_X11_Font_Format(), but FT_Get_X11_Font_Format() was kept for abi backwards-compatibility. Our qt bump to 5.9 introduced a call to FT_Get_Font_Format(). Replace it with FT_Get_X11_Font_Format() in order to remain compatibile with older freetype, which is still used by e.g. Ubuntu Trusty. Github-Pull: #14348 Rebased-From: 430bf6c7a1a24a59050e7c9dac56b64b820edb43 Tree-SHA512: fd22b824e7251a7975d9e9222eff06d2b04ebf30e13aeccab580596c042b3abe2f62da1f0ef75106b0b171368ee1062ef2f459cfa435aa54826766a9005b80df
2018-09-18Merge #14248: [0.17] Fix crash bug with duplicate inputs within a transactionv0.17.0rc4Wladimir J. van der Laan
0d49c82edd4c2c92f8ebe215c057b0173a258d77 [qa] backport: Test for duplicate inputs within a transaction (Suhas Daftuar) 833180f538c7fa16b097022c7c0d4b4d2f09688b Fix crash bug with duplicate inputs within a transaction (Suhas Daftuar) Pull request description: This is a backport of #14247. Tree-SHA512: 4d3b6244d501a48f56a728c571dac9a346019a671434edac943f4f535ef8f94ec6bfd569a0585ad5e23a6e488ecd7e0079510cbb10a2a22f576eb36d73accb0c
2018-09-17[qa] backport: Test for duplicate inputs within a transactionSuhas Daftuar
2018-09-17Fix crash bug with duplicate inputs within a transactionSuhas Daftuar
Introduced by #9049
2018-09-11Convert non-witness UTXOs to witness if witness sig createdAndrew Chow
If a witness signature was created when a non-witness UTXO is used, convert the non-witness UTXO to a witness one.
2018-09-11Drop the unnecessary UTXO based on the UTXOs present, not on earlier wallet ↵Andrew Chow
things Instead of dropping the unnecessary UTXO based on whether the wallet did something, do it based on whether two UTXOs are there.
2018-09-06Replace duplcate reference with reference to reference docv0.17.0rc3Pieter Wuille
Github-Pull: #14096 Rebased-From: 2b5d6f8df24b381d35b75187c97ae0cc9f7c3ed0 Tree-SHA512: 79af808c581ebb17d60aab8322b1debcc4182480b84eaedcbfac1e67c8b543c61df22789095742d67d732dba35e7e5fad77912385b695f89fb0f44f75db11560
2018-09-06Adjust TODO linkPieter Wuille
Github-Pull: #14096 Rebased-From: 89709db7a2710456011eac9dcd6a60d5e87b97ae Tree-SHA512: 0bf74e1179bee6e616d8fd2c125411ef30611d9aa3b32412025615a793abbc629a7b6d89a89ef05b11ac3541cc869c0caebba2d00942fdd6ab8d2e98d9b9caca
2018-09-06Add descriptor reference documentationPieter Wuille
Github-Pull: #14096 Rebased-From: 9254ffcf2d910ecb0f9ecbeef6d40a2008a44870 Tree-SHA512: 1fc466177dbe3b57b0025c102b1e75e4b05544440819885da7a85b70d20329fc3f6f4cbf89d7d6a48881e6ad176d81f7396f02925586140e19468a2f28f3414e
2018-09-06test: Add test for config file parsing errorsMarcoFalke
Github-Pull: #14105 Rebased-From: ed2332aeffb071a3404be9cff8f9fb8a81a9fbfb Tree-SHA512: 17fa88a2848f1c9c9c8a127b5ea4c45761ce8e06a609dd40f8e90bb9117d88c9d2c81e752c9c0f1a44ecadbb5bedd2973bc4548da2a6d463c789797191e85ab1
2018-09-06util: Report parse errors in configuration fileWladimir J. van der Laan
Report errors while parsing the configuration file, instead of silently ignoring them. $ src/bitcoind -regtest Error reading configuration file: parse error on line 22: nodebuglogfile, if you intended to specify a negated option, use nodebuglogfile=1 instead $ src/bitcoind -regtest Error reading configuration file: parse error on line 22: sdafsdfafs $ src/bitcoind -regtest Error reading configuration file: parse error on line 24: -nodebuglogfile=1, options in the configuration file must be specified without leading - Github-Pull: #14105 Rebased-From: a66c0f78a941968340f030911765a84219908c4d Tree-SHA512: 2b6be1ab643623e6ef9b53354820147a6c5d2baae3795ffe428fc60d8563ec00a68a379aee4029380f80f892abe23763afb1c75c32b60a13bffe7b82496bf2bb
2018-09-06Merge #14152: [0.17] doc: Change documentation for =0 for non-boolean optionsWladimir J. van der Laan
6bfee8a8c2ad0c77d47bedc282a7838aab137508 doc: Update v0.17.0.0 manpages (MarcoFalke) 2936dbc557084be1b0cc16d73250a9f220871062 doc: Change documentation for =0 for non-boolean options (Wladimir J. van der Laan) Pull request description: Github-Pull: #14100 Rebased-From: e9a78e9b3b17e09f923f09c5aae0eda9dfd58e66 Includes the bumped manpages. Tree-SHA512: 73d2dadb45418882122313975c0ab0e9f58310697d996dd2edeb400ebe73b3a45f1157c8a7fe65ae1f53d9ce68a88aae7c701f3e82e0b4db4c9417b36ddfecc0
2018-09-05doc: Update v0.17.0.0 manpagesMarcoFalke
2018-09-05doc: Change documentation for =0 for non-boolean optionsWladimir J. van der Laan
PR #12713 changed the interpretation for negation of non-boolean options (e.g. -noconnect) to no longer set the option to 0, but to remove it from the options. I think this is better because it gets rid of the special meaning of '0'. However it needs to be documented. I attempt to do so in this PR. Addreses #14064. Github-Pull: #14100 Rebased-From: e9a78e9b3b17e09f923f09c5aae0eda9dfd58e66
2018-08-28fix walletcreatefundedpsbt deriv paths, add testGregory Sanders
Github-Pull: #14055 Rebased-From: 61fe653bd919cb0533b2b9d6259bc86a4b2975c0 Tree-SHA512: 2f3edf62318fab4b405b47788096005f59cbe6ba4723fe51ce3b386539a58b7ea7369c31c3840c6baa76cdf6ba8f8440f977c36e2ee2916e711d7872bd1eadad
2018-08-28Merge #14084: [0.17] qa: BackportsWladimir J. van der Laan
cf3d7f94c2efd15a9cb910ccee31505934d55641 Use assert when running from multithreaded code as BOOST_CHECK_* are not thread safe (Jesse Cohen) fab0fbefcf51f38aa858423017b545df6d098311 qa: Stop txindex thread before calling destructor (MarcoFalke) b5ec6d4bf8a8ca18ca520e2f484e3ddd2d1138a3 Docs: Fix help message typo optiona -> optional (Ben Woosley) Pull request description: Fixes to make the unit tests and bench pass with the thread sanitizer (beside the issue with fChecked https://github.com/bitcoin/bitcoin/issues/14058#issuecomment-416042917). For testing: `./configure --with-sanitizers=undefined,thread && make -j 16 && ./src/test/test_bitcoin` Tree-SHA512: 5cb85ecc278b719dba03240265e93424ed1a28671834da7590adab88c2d43c6e6cbf3269bbe2fd79e5ed3a85ec77a268e05301e7a7421cf6a97d413dddac6327
2018-08-27Use assert when running from multithreaded code as BOOST_CHECK_* are not ↵Jesse Cohen
thread safe Github-Pull: #14069 Rebased-From: 737670c036e802e0fd8b51efffb41131d08f0204
2018-08-27qa: Stop txindex thread before calling destructorMarcoFalke
Github-Pull: #14071 Rebased-From: faf4a9b674186923f8c837e3621d147f504c1944
2018-08-27Docs: Fix help message typo optiona -> optionalBen Woosley
Github-Pull: #14056 Rebased-From: 7d0a8ad3103200145ab2e73368c3b8345a66c15d
2018-08-22Bugfix: NSIS: Exclude Makefile* from docsv0.17.0rc2Luke Dashjr
Otherwise, the generated Makefile is included in the NSIS-installed documentation, which can lead to non-determinism (eg, if gawk is installed on some build VMs, but others only have mawk) Github-Pull: #14018 Rebased-From: 8563341714a1ec452dd3304a39dd880face49c84 Tree-SHA512: 2d219a4a2027bcd7359b7320bafc6b7cd3bde3dcf9309ddd6198ff67407470025baa71e6d0ed3d6cec081834ddc9a0247043865eb26737e6fd0d2f09574f5932