aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-29Merge #15026: [test] Rename rpc_timewait to rpc_timeoutMarcoFalke
4999992c34 whitespace: Split ~300 char line into multiple ones (MarcoFalke) fa71b38168 scripted-diff: Rename rpc_timewait to rpc_timeout (MarcoFalke) fa3e5786d0 scripted-diff: Remove unused 'split' parameter to setup_network (MarcoFalke) Pull request description: This is a bugfix, since wallet_dump currently uses the wrong name: https://github.com/bitcoin/bitcoin/blob/18857b4c4034af54e7ad3cbd78ff6f87f4f22567/test/functional/wallet_dump.py#L89-L92 Rename all to the same name with a scripted diff (and some unrelated cleanups). Tree-SHA512: 338ddd20dae12e6cf7aa7adbcfb239cf648017a1572b373f8431fecb184bd2a65492846d81e75a023864d9e41c94afb53044c16b79651a5937d34a5a6b772f81
2018-12-29Merge #14738: Tests: Fix running wallet_listtransactions.py individually ↵MarcoFalke
through test_runner.py 2474de0265 Fix running individually through test_runner.py, as suggested by @MarcoFalke (#14732) (Kristaps Kaupe) Pull request description: As suggested by @MarcoFalke. Resolves #14732. Tree-SHA512: b4e400ba06075e218dbd97d0390845f1c55be42a2b6fd70513381318cfc2693473ba1d0f9d7f379a96939d1960b53801fad7c02e06bddc50c5a835ad024c37ef
2018-12-29Merge #15022: tests: Upgrade Travis OS to XenialMarcoFalke
b6f0db69a9 Increase timeout of featuer_assumevalid test to fix flaky tests (Graham Krizek) aa9aca85f1 If tests are ran with (ASan + LSan), Docker needs access to ptrace (Graham Krizek) a3b8b43663 Update Travis base OS to Xenial (Graham Krizek) Pull request description: Update base Travis OS to `xenial` from `trusty`. Link to Travis Docs for Xenial: https://docs.travis-ci.com/user/reference/xenial/ As noted in the documentation, Docker version is also updated from `17.06` to `18.06` Also includes: - If running Bitcoin config with LSan sanitizer, Allow ptrace in Docker run command - Increase timeout of feature_assumevalid test to fix flaky tests Tree-SHA512: baf2eda0cbb9990c43c76de1aebc8dd4a3f540323ac1fe2e164ac3bcf1fe3afa3e5b026bfeb5d650dae09a6854695d5744c1130c2fa82ece86c6835ba152f68d
2018-12-29Merge #13743: refactor: Replace boost::bind with std::bindMarcoFalke
cb53b825c2 scripted-diff: Replace boost::bind with std::bind (Chun Kuan Lee) 2196c51821 refactor: Use boost::scoped_connection in signal/slot, also prefer range-based loop instead of std::transform (Chun Kuan Lee) Pull request description: Replace boost::bind with std::bind - In `src/rpc/server.cpp`, replace `std::transform` with simple loop. - In `src/validation.cpp`, store the `boost::signals2::connection` object and use it to disconnect. - In `src/validationinterface.cpp`, use 2 map to store the `boost::signals2::scoped_connection` object. Tree-SHA512: 6653cbe00036fecfc495340618efcba6d7be0227c752b37b81a27184433330f817e8de9257774e9b35828026cb55f11ee7f17d6c388aebe22c4a3df13b5092f0
2018-12-29Merge #14966: docs: fix testmempoolaccept CLI syntaxMarcoFalke
b74a52192b fix testmempoolaccept CLI syntax (1Il1) Pull request description: `testmempoolaccept "hexstring"` will give a "JSON parse error". The correct syntax is `testmempoolaccept \[\"hexstring\"\]` (but seems escaping is not displayed in other areas so leaving backspaces out). Tree-SHA512: ad755147d6db0bd3f2d8481517dab29df755a32b28a3bdb4553b1fddd1940850450d1e9a6c3bd04e4e3faa7bc09aadfd3412b4cd65e61d61ea34452831597967
2018-12-28Increase timeout of featuer_assumevalid test to fix flaky testsGraham Krizek
2018-12-28If tests are ran with (ASan + LSan), Docker needs access to ptraceGraham Krizek
See https://github.com/google/sanitizers/issues/764 for details
2018-12-28Update Travis base OS to XenialGraham Krizek
Updating the base OS used in Travis to Xenial from Trusty. This also updates Docker to 18.06 instead of 17.06 in CI.
2018-12-28Merge #14981: rpc: Clarifying RPC getrawtransaction's time help textMarcoFalke
84104c781a clarifying getrawtransaction[time] get help text (Ben Carman) Pull request description: #12339 The `time` and `blocktime` entries have the same value so they should have the same help text as well Tree-SHA512: 1e9a94678eec8501c761f16bf3d8e269d68620596d1fdd31a32989a1b53be5a8097ece8bfabe99979e658dec82237e37d8194ae2acd7c1deef7501ee701667fb
2018-12-28Merge #14944: doc: update NetBSD build instructions for 8.0Wladimir J. van der Laan
be5ca825a38bc71c3a79ef35335e9c2e597ad225 doc: update NetBSD build instructions for 8.0 (fanquake) Pull request description: Updates the NetBSD build documentation for 8.0. Use Python37 and add pkg-config. Switches to using our `contrib/install_db4.sh` script for installing bdb. Tree-SHA512: c0ac1a89349a752d9d4d87e2d134fd402e9beaac84e471ec9a0b507ebc5e762e973c8d2821db3824dea82841e38c39b0bb0a0d97f7e58318f2b15e93e81bf654
2018-12-28Merge #14973: doc: Improve Windows native build instructionsWladimir J. van der Laan
523785042b5fccda981d85a7ea85a8ce30fe1709 Modify build instructions to work with Command Prompt as well as PowerShell; other minor changes (Murray Nesbitt) Pull request description: The current instructions assume usage of `PowerShell`; running in a `Command Prompt` results in a syntax error. Proposed change works with both `Command Prompt` and `PowerShell`. Also a few other minor formatting changes. Tree-SHA512: 5f8782d8706c99d7680db01e560ccd823c8442f0f19b65ae54183a810994418d168527bbf3430fa5d88b3a55264e66ef08fe1f5949cce810b0a103a6b55ea363
2018-12-28Merge #15012: Docs: Fix minor error in doc/psbt.mdWladimir J. van der Laan
72b63bc9054f7742a9b12ea29b21770b5e437092 Fix minor grammar error in doc (bitcoinhodler) Pull request description: It's pretty clear that the author meant "rather than" here. Tree-SHA512: aa31d0e8a8a203dba5c0f6edd73ba935b701449243a0fa75d7ca4a35d20c0fd44ba45b58e3d1c7f1854eb1ed66543ecd5d53181c54352e4c3d42eb3ab38cf6f2
2018-12-27Merge #14930: test: pruning: Check that verifychain can be called when prunedMarcoFalke
fa3e874d69 test: pruning: Check that verifychain can be called when pruned (MarcoFalke) Pull request description: Tree-SHA512: b921e550fdad27b791665883ed9fc50210575b0f968840a45284ad0e060ddd443ea7b9b12c17916f68ad28877c58ac51a6acc76ae4ea71bf7bfb2f744b286884
2018-12-25Merge #15033: doc: Add historical release notes for 0.17.1Wladimir J. van der Laan
488563ea1c688c7d1150f3e58c07f7bc756c977a doc: Add historical release notes for 0.17.1 (Wladimir J. van der Laan) Pull request description: Tree-SHA512: e313a70858046ea7d29064ca134db14343618cdb855ac800ca9924279b2c2b3bed412c26a590ef47faa3a301bdead26186381c75950bce815be2c1a03ea2c4a3
2018-12-25doc: Add historical release notes for 0.17.1Wladimir J. van der Laan
2018-12-24Merge #14565: Overhaul importmulti logicMeshCollider
eacff95de Add release notes (Pieter Wuille) bdacbda25 Overhaul importmulti logic (Pieter Wuille) Pull request description: This is an alternative to #14558 (it will warn when fields are being ignored). In addition: * It makes sure no changes to the wallet are made when an error in the input exists. * It validates all arguments, and will fail if anything fails to parse. * Adds a whole bunch of sanity checks Tree-SHA512: fdee0b6aca8c643663f0bc295a7c1d69c1960951493b06abf32c58977f3e565f75918dbd0402dde36e508dc746c9310a968a0ebbacccc385a57ac2a68b49c1d0
2018-12-22Merge #13930: doc: Better explain GetAncestor check for m_failed_blocks in ↵MarcoFalke
AcceptBlockHeader 66e15e8f97 Explain GetAncestor check for m_failed_blocks in AcceptBlockHeader (Sjors Provoost) Pull request description: Salvaged (but slightly modified) from #12138, the comment there was really helpful to wrap my head around that part of the code. In addition, a naive reader like yours truly will first think `IsValid(BLOCK_VALID_SCRIPTS)` means the previous block was invalid. But IIUC that's not what it means. Instead, it means the block hasn't been checked for validity at the `BLOCK_VALID_SCRIPTS` level yet. So in that case the existing text "previous block index isn't valid" is wrong. Tree-SHA512: 442a319a83290d94697fdf51376463b70454e0f3909d4a45594ddc2e7c26cd19dc703808385a25e26d6d2dddab0aa35ca41722f2e65ee6fe57bbaf62652d3ec8
2018-12-22whitespace: Split ~300 char line into multiple onesMarcoFalke
2018-12-22scripted-diff: Rename rpc_timewait to rpc_timeoutMarcoFalke
-BEGIN VERIFY SCRIPT- sed -i -e 's/self.rpc_timewait/self.rpc_timeout/g' $(git grep -l self.rpc_timewait) -END VERIFY SCRIPT-
2018-12-22scripted-diff: Remove unused 'split' parameter to setup_networkMarcoFalke
-BEGIN VERIFY SCRIPT- sed -i -e 's/, split=False//g' $(git grep -l 'def setup_network') -END VERIFY SCRIPT-
2018-12-22Merge #14960: lint/format-strings: Correctly exclude escaped percent symbolsMarcoFalke
57281199b8 lint/format-strings: Correctly exclude escaped percent symbols (Luke Dashjr) Pull request description: The current code fails to exclude correctly for patterns like `"%%%X"` Tree-SHA512: cac6f6fb3f06a9190310cd9764ec31cd7d636f9c831057622f418ae5fd2e1d80927a88f585d18f57b279ac21e81518f714dc1a25155377b9297741a73600461e
2018-12-22Merge #13128: policy: Add Clang thread safety annotations for variables ↵MarcoFalke
guarded by cs_feeEstimator dae1423e5a Add locking annotations to feeStats, shortStats and longStats (practicalswift) 764e42fee2 scripted-diff: Rename from cs_feeEstimator to m_cs_fee_estimator (practicalswift) 9a789d4dc6 policy: Add Clang thread safety annotations for variables guarded by cs_feeEstimator (practicalswift) Pull request description: * Add Clang thread safety annotations for variables guarded by `cs_feeEstimator` * ~~Add missing `cs_feeEstimator` locks~~ Tree-SHA512: 24b1d876ad53524ee8989b9658ac1a1b2766ebb3b27a1f84601d207e74d090e33738b814afac2a1f5bcd37565abcb361c6e5adae212840ff1ca32c3c42953391
2018-12-22Merge #14172: Refactor and add tests for BlockFilter constructionMarcoFalke
e4ed8ce2c8 blockfilter: Remove default clause in switch statement. (Jim Posen) c30620983d blockfilter: Additional constructors for BlockFilter. (Jim Posen) 20b812993a blockfilter: Refactor GCS params into struct. (Jim Posen) Pull request description: These commits have been split out of #14121 because they are fairly independent and that PR is very large. Tree-SHA512: b9643b159e114df50a295f433e807afe6082db55a2a3a17401c1509b850c71bf5011ab3638863b46663709726be4445be6fde1dec514aec7696135497a9f0183
2018-12-21blockfilter: Remove default clause in switch statement.Jim Posen
Now the compiler will warn if not all enums are handled in the switch.
2018-12-21Merge #15013: test: Avoid race in p2p_timeoutsMarcoFalke
fabcd645b9 test: Avoid racy test p2p_timeouts (MarcoFalke) Pull request description: Avoid filesystem/network racyness by sleeping another second. The alternative would be to poll the `debug.log`, but that seems overkill to avoid a sleep in a test that already requires them. Tree-SHA512: 32de75ecba38426323158fda241e37ffae73806d8c0e60b7ad73fb917e9cd25a3e5f0722cbc6f2f7a5b86501221c317783266bc2e3b4697fb120f05898ccc12d
2018-12-21Merge #14811: Mining: Enforce that segwit option must be set in GBTMarcoFalke
d2ce315fbf [docs] add release note for change to GBT (John Newbery) 0025c9eae4 [mining] segwit option must be set in GBT (John Newbery) Pull request description: Calling getblocktemplate without the segwit rule specified is most likely a client error, since it results in lower fees for the miner. Prevent this client error by failing getblocktemplate if called without the segwit rule specified. Of the previous 1000 blocks (measured at block [551591 (hash 0x...173c811)](https://blockstream.info/block/000000000000000000173c811e79858808abc3216af607035973f002bef60a7a)), 991 included segwit transactions. Tree-SHA512: 7933b073d72683c9ab9318db46a085ec19a56a14937945c73f783ac7656887619a86b74db0bdfcb8121df44f63a1d6a6fb19e98505b2a26a6a8a6e768e442fee
2018-12-21test: Avoid racy test p2p_timeoutsMarcoFalke
2018-12-21Merge #15005: test: Bump timeout to run tests in travis thread sanitizerMarcoFalke
fa05d52af4 test: Bump timeout to run tests in travis thread sanitizer (MarcoFalke) Pull request description: No need to exclude tests because their timeout was set too strict Tree-SHA512: ea7032e674a66456bab40122adf4beebd703fd626a7567ca76d2a4e78041af115564d863dc7f742d39bd4adb249c29751439a1238d5e5c34e474c7221d4fd6e1
2018-12-20Fix minor grammar error in docbitcoinhodler
2018-12-21Merge #14653: rpcwallet: Add missing transaction categories to rpc helptextsMarcoFalke
f3f6dde56e Test coinbase category in wallet rpcs (andrewtoth) e982f0b682 Add all category options to wallet rpc help (andrewtoth) Pull request description: The current helptext for `listtransactions`, `listsinceblock` and `gettransaction` only list two of the five possible options for `category`. This incorrectly implies that these are the only two options, and can cause problems if the other three options aren't accounted for. Also, some of the documentation is incorrect when specifying which options are returned for which categories. This PR updates the helptext for these RPCs and adds a functional regression test for the cases when the other three categories are returned. Tree-SHA512: 67dd7ff6269a3b0f17f5d1a61b0ae1fb1f3778f05e1c440bfbb9b3a005c9c6d740abcace20f3d597cf2bd6779c494448690f13fab0bd2340f206213bc7890b51
2018-12-20test: Bump timeout to run tests in travis thread sanitizerMarcoFalke
2018-12-19Merge #14993: rpc: Fix data race (UB) in InterruptRPC()Wladimir J. van der Laan
6c10037f72073eecc674c313580ef50a4f1e1e44 rpc: Fix data race (UB) in InterruptRPC() (practicalswift) Pull request description: Fix data race (UB) in `InterruptRPC()`. Before: ``` $ ./configure --with-sanitizers=thread $ make $ test/functional/test_runner.py feature_shutdown.py … SUMMARY: ThreadSanitizer: data race rpc/server.cpp:314 in InterruptRPC() … ALL | ✖ Failed | 2 s (accumulated) ``` After: ``` $ ./configure --with-sanitizers=thread $ make $ test/functional/test_runner.py feature_shutdown.py … ALL | ✓ Passed | 3 s (accumulated) ``` Tree-SHA512: b139ca1a0480258f8caa7730cabd7783a821d906630f51487750a6b15b7842675ed679747e1ff1bdade77d248807e9d77bae7bb88da54d1df84a179cd9b9b987
2018-12-19Merge #14875: RPCHelpMan: Support required arguments after optional onesMarcoFalke
fa9a5bc1a0 RPCHelpMan: Support required arguments after optional ones (MarcoFalke) Pull request description: There was a requirement that required arguments could not be positioned after an optional argument, but the deprecation of priority made the second argument to `prioritisetransaction` optional. So support that in `RPCHelpMan`. Also format all named arguments in the same way (without the wrapping `"` even for strings), since the extended description already mentions the type and it feels odd to special case strings. Tree-SHA512: c125145afb4a63abc995aaf0a89489efc0f470a720727a1ca6ee0bfd2bcbc59e87c38128dd1e0cdf03dbb5b18e84867887c3dabf6ec8378e66cb1f4cecb9e407
2018-12-19Merge #14985: test: Remove thread_local from test_bitcoinMarcoFalke
fa61202cae test: Add comment to g_insecure_rand_ctx (MarcoFalke) fa0d3c4407 test: Undo thread_local g_insecure_rand_ctx (MarcoFalke) Pull request description: `thread_local` seems to be highly controversial according to the discussion in #14953, so remove it again from the tests. Also remove boost::thread_group in the test that uses it, since I am touching it anyway. Tree-SHA512: 977c1f597e3cfbd0e97d0b037d998fdbc701f62e9a2f57e02dbe1727b63ae8ff478dbd9d3d6dc4ffdfa23f2058b331f04949d51f23a8f55b41ecb75f088f1cbe
2018-12-18rpc: Fix data race (UB) in InterruptRPC()practicalswift
2018-12-19Merge #14829: travis: Enable functional tests in the ThreadSanitizer (TSan) ↵MarcoFalke
build job eaf4070e3a Add suppression for InterruptRPC (fRPCRunning) data race (practicalswift) 5e5138a721 travis: Use trap and set -e errtrace (Chun Kuan Lee) 069752b726 build: Enable functional tests in the ThreadSanitizer (TSan) build job (practicalswift) Pull request description: Enable functional tests in the ThreadSanitizer (TSan) build job. This is a follow-up to @MarcoFalke's #14764 which added TSan but for unit tests only. Tree-SHA512: dcc24d311fa124772c3036b16c2bf94732ece36c3e22b4bb8fe941772e52157ab2b1a90b1880b81079c2eef2d344ca7e1da58324b75dbf82d16204d591ad49fb
2018-12-18Merge #14950: docs: add NSIS setup/install steps to windows docsMarcoFalke
82687b5034 docs: add NSIS setup/install steps to windows docs (luciana) Pull request description: Supersedes #14744 Fixes: #14699 Rearranged the changes in #14744 to be more similar to the macOS docs. Tree-SHA512: d68f952eee1a97702d23a02e4f35b66dedd3bf104b8ea05de9a642a596c476c40aa76fae5b00a1600b3758e25621226d89216885ec8f52acf89d6eb117421f9e
2018-12-18Add suppression for InterruptRPC (fRPCRunning) data racepracticalswift
2018-12-17Merge #14975: qt: Refactoring with QString::toNSString()Jonas Schnelli
4d454dcb6 Refactoring with QString::toNSString (Hennadii Stepanov) Pull request description: This PR makes `MacNotificationHandler::showNotification()` cleaner and more readable. The used `QString::toNSString()` function was introduced in Qt 5.2 which is minimum version now (#14725). The behavior of `MacNotificationHandler::showNotification()` has not been changed. cc: @jonasschnelli Tree-SHA512: 940327a77746ee016415efd3b696ad8ec85dcf12bf3f62e55c9bdc1700415d81a8d03fbc79310982d37a4098786dcaef7cd9702db5498d59d8065447babc27f5
2018-12-18Modify build instructions to work with Command Prompt as well asMurray Nesbitt
PowerShell; other minor changes
2018-12-18Merge #14957: wallet: Initialize stop_block in ↵MeshCollider
CWallet::ScanForWalletTransactions 8b9171ccf wallet: Initialize stop_block to nullptr in CWallet::ScanForWalletTransactions (Ben Woosley) Pull request description: Previously the argument would be untouched if the first block scan failed. This makes the behavior predictable, and consistent with the documentation. Tree-SHA512: 3efadf9fd5e25ecd9450f32545f58e61a123ad883e921ef427b13e4782ffdd8ffe905c9ad3edc7e8f9e4953342cd72247bb4cc9eeaf9e5fd04291ac5c1bb5eec
2018-12-17wallet: Initialize stop_block to nullptr in CWallet::ScanForWalletTransactionsBen Woosley
Previously the argument would be untouched if the first block scan failed. This makes the behavior predictable, and consistent with the documentation.
2018-12-17test: Add comment to g_insecure_rand_ctxMarcoFalke
2018-12-17clarifying getrawtransaction[time] get help textBen Carman
2018-12-17test: Undo thread_local g_insecure_rand_ctxMarcoFalke
2018-12-17Merge #14964: test: Fix race in mempool_acceptMarcoFalke
faee59103d test: Fix race in mempool_accept (MarcoFalke) Pull request description: If we happen to pick the same random coin to spend, there would be mempool conflicts in some runs of the test. Fix that by popping from a static list of coins to spend from. Tree-SHA512: f6fd37e43d919371aa8bc3a2c93b569f9169961fe702f3641bb63180c3a88f12ca1857e9ed4d3723d5f04ca8ab5ef009a90e679580f36246a10b987620a55bee
2018-12-17Merge #14979: [Qt] Restore < Qt5.6 compatibility for addActionWladimir J. van der Laan
3e21b690d1aedb73a7dc2bc5d2ff1b011b52d927 [Qt] Restore < Qt5.6 compatibility for addAction (Jonas Schnelli) Pull request description: #14573 broke < Qt5.6 compatibility due to calling the lambda version of `addAction` that was added in Qt5.6. This PR re-enables < Qt5.6 compatibility. Tree-SHA512: b3cf055d88a76713d100be05b2298d4091967e1a43de176af2647f59e76b98b216493dd12a6d68a942ae7946f2026e33dd8e8d20fc44a9a9614a3690ad9a2417
2018-12-17travis: Use trap and set -e errtraceChun Kuan Lee
2018-12-17build: Enable functional tests in the ThreadSanitizer (TSan) build jobpracticalswift
2018-12-16[Qt] Restore < Qt5.6 compatibility for addActionJonas Schnelli