aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-05Clarify help messages for path args to mention datadir prefixJames O'Beirne
Change `-conf`'s and others' help messages to indicate that relative path values will be prefixed by the datadir path. This behavior is confusing when attempting to specify a configuration file in the current directory with `-conf=bitcoin.conf`, but loading the `bitcoin.conf` file in ~/.bitcoin datadir.
2018-02-05Merge #12330: Reduce scope of cs_main and cs_wallet locks in listtransactionsMarcoFalke
c409b1adac [rpc] Reduce scope of cs_main and cs_wallet locks in listtransactions (João Barbosa) Pull request description: Trivial change, no behaviour change. Benchmark done as follow: - run with `-regtest` - wallet with 5000 transactions - measured the time spent with the lock and the total time - times are an average of 100 `listtransactions --count=...` calls | `--count` | lock (ms) | total (ms) | saving | |--:|--:|--:|--:| | 10 | 0.2230 | 0.2510 | 11% | | 100 | 2.5150 | 2.8690 | 12% | | 1000 | 20.0320 | 23.3490 | 14% | | 10000 | 105.2070 | 125.5310 | 16% | Tree-SHA512: ebedfeeb4c8ad75c89128e53cae976a82967dbb5ffd129da0f7204ccf9c3c15070b3d509f3767bebd745512e410200cc546147c836e82409f95fc9b8d14fc3ed
2018-02-04Merge #12331: Docs: Properly alphabetize output of CLI --help option.MarcoFalke
d3e467520f Properly alphabetize output of CLI --help option. (murrayn) Pull request description: The --help output of bitcoind, bitcoin-cli, bitcoin-tx, qt/bitcoin-qt, et al. is only about 90% alphabetized by option, which is kind of sloppy and occasionally misleading. This change (mostly) organizes the output alphabetically. Tree-SHA512: 3029900dbe99f03397c1cbdb5e4ac09a13bc99bafe73c6855097206e4cdd9ad70d0b5cedb5e1e520005c3e9ef1c4cd32bb9d8c98ce6918d8434fec8bf06e56c8
2018-02-02Merge #12317: Document method for reviewers to verify chainTxDataWladimir J. van der Laan
7444149 Document method for reviewers to verify chainTxData (John Newbery) Pull request description: This commit adds the final block hash of the window to getchaintxstats and documents how reviewers can verify changes to chainTxData. Tree-SHA512: d16abb5f47d058e52660f4d495f1e453205b1b83716d7c810ff62a70338db721386c1808ec1fc8468f514e4d80cc58e3c96eeb3184cbbcb1d07830fa5e53f342
2018-02-02Document method for reviewers to verify chainTxDataJohn Newbery
This commit adds the final block hash of the window to getchaintxstats and documents how reviewers can verify changes to chainTxData.
2018-02-02Merge #11869: QA: segwit.py: s/find_unspent/find_spendable_utxo/MarcoFalke
9bb59cf7ba QA: segwit.py: s/find_unspent/find_spendable_utxo/ (Jorge Timón) Pull request description: Separated from #8994 It was found out testing that PR but I think this fix should be done even without #8994 the fix is not necessary by luck. Unless I'm missing something. Tree-SHA512: ba1a970e674878ae2f27ee8bba372fa3b42dafff682374f50e5ddc9896fd8808fef2b2b70c7028f2a7b0dbea9f3e29a757e2cde98970f5761bf414455ba02c09
2018-02-02Merge #12283: Fix typosMarcoFalke
1340eda3b7 Fix typos (practicalswift) Pull request description: Fix typos. Tree-SHA512: 533a136831387ef26e9a74ba078437496bee38cc026da73fa9e6f6e7f4d5665eccac24cf3ef05e6d3af1329a1214f5ce71b039ddb8378b074e6d4408b8701f95
2018-02-02Merge #12329: net: don't retry failed oneshot connections foreverWladimir J. van der Laan
660f5f1 net: don't retry failed oneshot connections forever (Cory Fields) Pull request description: As introduced by (my suggestion, sorry, in) #11512, failed dns resolves end up as oneshots. But failed oneshots are re-added as oneshots, so we need to make sure that we're not queuing these up forever after failed resolves. Rather than trying to differentiate, I think we should just not re-add failed oneshots and be done with it. Maybe @sipa can shed a light on what the original intention was. Tree-SHA512: 2dfe35dabfb6354c315cf6f8ae42971765d36575e685662caae7ed8f9dea9472c6fb1fd5e62ec35301550b74b6613a54265e90fca2a6618544f78dacaac4d4fd
2018-02-01Properly alphabetize output of CLI --help option.murrayn
2018-02-02[rpc] Reduce scope of cs_main and cs_wallet locks in listtransactionsJoão Barbosa
2018-02-01Merge #12327: [gui] Defer coin control instancingJonas Schnelli
6558f8acc [gui] Defer coin control instancing (João Barbosa) Pull request description: Defer the GUI coin control instancing so that argument processing is taken into account for the default coin control values. Fixes #12312 Tree-SHA512: ecda28b94f4709319e9484b01afe763c7c3569097d2afb89db79da8a195c46d20ea77166df7edce0c8ab77627b295def01c072148714503436d27675d5e75d99
2018-02-01[gui] Defer coin control instancingJoão Barbosa
Defer the GUI coin control instancing so that argument processing is taken into account for the default coin control values.
2018-02-01net: don't retry failed oneshot connections foreverCory Fields
2018-02-01Merge #12326: net: initialize socket to avoid closing random fd'sWladimir J. van der Laan
96dbd38 net: initialize socket to avoid closing random fd's (Cory Fields) Pull request description: An excellent spot by @david60. Even if it isn't causing the fd issue we're looking for, this should be fixed. Tree-SHA512: 062a8f2cdd39d895213e1263dbd7b8391473ddaea2f93c82c211a9bb6ea6744d48a6c84c8ff804b16b865d14145492635c500a9fd138d0988fee5e4f719ebb91
2018-02-01net: initialize socket to avoid closing random fd'sCory Fields
2018-01-31QA: segwit.py: s/find_unspent/find_spendable_utxo/Jorge Timón
2018-01-31Merge #12309: doc: Explain how to update chainTxData in release processMarcoFalke
7f968ae107 doc: Explain how to update chainTxData in release process (Wladimir J. van der Laan) Pull request description: Adds a short explanation how to update chainTxData to the release process. Mention where to get the data, and link to an example. Tree-SHA512: 66b0eb12a25afb7b1da0788c8f9f9701d566cb7ce55899402440a57bef0e177b55e926442d3c8aa482299abe7c48ab94735d501c37f0a11fefb86e2fc2e33d9b
2018-01-31doc: Explain how to update chainTxData in release processWladimir J. van der Laan
Adds a short explanation how to update chainTxData to the release process. Mention where to get the data, and link to an example.
2018-01-31Merge #12306: Docs: Improvements to UNIX documentationWladimir J. van der Laan
ee5e896 Organise Linux build instructions to be categorised by distro (Alex Vear) 4c85517 Add NetBSD build instruction links (Alex Vear) Pull request description: * Added references to the newly created [`doc/build-netbsd.md`] (#12294) instructions in the [`doc/README.md`] and the [`doc/build-unix.md`] files. * Organise [`doc/build-unix.md`] dependency build instructions by Linux distribution. This will help discoverability of dependency build instructions for specific distros. Future instructions will also be able to be added easier. I am not quite sure about the FreeBSD instructions being in the [`doc/build-unix.md`], while both the OpenBSD and NetBSD instructions are contained within separate files ([`doc/build-openbsd.md`] and [`doc/build-netbsd.md`] respectively). Feedback is greatly appreciated. 😄 [`doc/build-netbsd.md`]:https://github.com/bitcoin/bitcoin/blob/master/doc/build-netbsd.md [`doc/build-unix.md`]:https://github.com/bitcoin/bitcoin/blob/master/doc/build-unix.md [`doc/build-openbsd.md`]:https://github.com/bitcoin/bitcoin/blob/master/doc/build-openbsd.md [`doc/README.md`]:https://github.com/bitcoin/bitcoin/blob/master/doc/README.md Tree-SHA512: ebe2604d1802795851bbfce2335f159b53ea696bc9afb309be7825c697b992cc3963270fe945ca3e449b18522046e227fde3fae1b9c01bd49c3a7a513b5bd40c
2018-01-30Organise Linux build instructions to be categorised by distroAlex Vear
2018-01-30Add NetBSD build instruction linksAlex Vear
2018-01-30Merge #12302: test: Make ua_comment test pass on 0.16.0MarcoFalke
aac6bce112 test: Make ua_comment test pass on 0.16.0 (Wladimir J. van der Laan) Pull request description: The specific length of the uacomment is one shorter on `0.16.0` than on `0.15.99` causing the (stupid) test to fail. This change makes `assert_start_raises_init_error` optionally take a regexp, so that the error message can be checked without being specific about the reported length. Tree-SHA512: 1c5e9f1d0b36f004f8113c7e211e8281194ce8057869ac3702172d8b021df3c3aa3b8f79b9434678ed0fb7146f848802410647d434fc884aa200b6a5e26afe8b
2018-01-30test: Make ua_comment test pass on 0.16.0Wladimir J. van der Laan
The specific length of the uacomment is one shorter on `0.16.0` than on `0.15.99` causing the (stupid) test to fail. Just match the latter part of the message only.
2018-01-30doc: Update manpages to 0.16.99Wladimir J. van der Laan
Master was bumped to 0.16.99, so update the man pages too to avoid confusion. Tree-SHA512: 63622d6ebea2fb052ffe05fb80fe08bd627c34310a7ca22b2bc1af74003b20ab1a1fde51746ee69d401379d65232981b68541a9fc7f329e04b854507f836b19e
2018-01-30build: Bump version to 0.16.99Wladimir J. van der Laan
Also clean out release notes. Tree-SHA512: c4d5b52c089e14438be37381e1b0dab3711cc72aa8d345d1024169fff0055f3d021c8ca9d46fb794110694ebcbf7cbca0a12619f650873c9d381530adea7100e
2018-01-30Merge #12252: Require all tests to follow naming conventionMarcoFalke
125f4a4909 [tests] Require all tests to follow naming convention (Anthony Towns) Pull request description: Based on top of #11774 Tree-SHA512: 1eb156b5a97b30c203b7b0ad3d2055b391ef825e2e57805c7745b5259a9b1caaa115768ec225452f12f354e550f83e071f9c6fee2c36698b4679191895aab8de
2018-01-30qt: Periodic translations updateWladimir J. van der Laan
Pull 0.16 translations before forking, to avoid having to do it twice. Tree-SHA512: 9c093885f03783e0f64718985c5f9d385d2a8592e2acc87d922ca973d07c756a6b7fff585388094f0e1b673c41e792ce918c1f594b45e82a262acd93e1b91a8e
2018-01-30Merge #12266: Move scheduler/threadGroup into common-init instead of per-appWladimir J. van der Laan
082a61c Move scheduler/threadGroup into common-init instead of per-app (Matt Corallo) Pull request description: This resolves #12229 which pointed out a shutdown deadlock due to scheduler/checkqueue having been shut down while network message processing is still running. Tree-SHA512: 0c0a76113996b164b0610d3b8c40b396f3e384d165bf098768e31fe3701b00763d0d810ef24702387e2e936fefb9fb900a6225f7417bb0175b585f365d542660
2018-01-30Merge #12276: Remove duplicate mapWallet lookupsWladimir J. van der Laan
039425c [wallet] Remove duplicate mapWallet lookups (João Barbosa) Pull request description: Tree-SHA512: 8075925d2adb64737c691e988d74a37bc326711aaee2c37327361679c051f219fa500e14cbcdb6a169352bcdbab160e11df4276b2657e19e12908ee2d4444d30
2018-01-30Merge #12278: Add special error for genesis coinbase to getrawtransactionWladimir J. van der Laan
ee11121 Add special error for genesis coinbase to gettransaction (MeshCollider) Pull request description: Suggested by sipa here: https://botbot.me/freenode/bitcoin-core-dev/2018-01-23/?msg=96069825&page=2 Just adds a special error message for the genesis block coinbase transaction when using `getrawtransaction` Tree-SHA512: cd102c7983ec5457b299bff4b6db747d339fda157933a3ac54aec26b1e48b115aa68c1c9e6cb7a916f15c7786273ab558b2b20ab9768544d211e0ae9d1480e34
2018-01-30Merge #12294: [Docs] Create NetBSD build instructions and fix compilationWladimir J. van der Laan
11c5827 [build] Add NETBSD leveldb target to configure.ac (fanquake) 1944fa3 [doc] Create build-netbsd.md (Randolf Richardson) 336685e [build] Add db4_cxx to bitcoin_find_bdb48.m4 (Randolf Richardson) Pull request description: Replaces #12125. Tree-SHA512: 411d082ffff7198bcc1b2b6fcdf86c378baf228d8f4fee0e6c9f0688efe9c6b6dcfd5c1ab9c1dfd0c4637723b8584dbbb614634ace0e1a417b59e88a6c736dc0
2018-01-30[tests] Require all tests to follow naming conventionAnthony Towns
2018-01-30[build] Add NETBSD leveldb target to configure.acfanquake
2018-01-30[doc] Create build-netbsd.mdRandolf Richardson
2018-01-30Add special error for genesis coinbase to gettransactionMeshCollider
2018-01-29Merge #12293: [rpc] Mention that HD is enabled if hdmasterkeyid is presentMarcoFalke
c6b6385651 [rpc] Mention that HD is enabled if hdmasterkeyid is present (fanquake) Pull request description: Also adds optional flag. Replaces #12042 Tree-SHA512: 6aded2cf36799f697eacbe4f51dff7c8110281092ca3c4fd73e26f57d788ec95a4fcbaf6976ef144e64f2e52759dbe241ac218a95e5ca2233cae1b98bfa5872e
2018-01-29Merge #11989: [build] .gitignore: add QT Creator artifactsWladimir J. van der Laan
ac5104f [build] .gitignore: add QT Creator artifacts (Sjors Provoost) Pull request description: These files appear on OSX if you follow the [QT Creator instructions](https://github.com/bitcoin/bitcoin/blob/master/doc/build-osx.md#using-qt-creator-as-ide). The files don't contain anything terribly useful that might warrant including them in the repo instead. Tree-SHA512: 346ece7846e7707abe599fe53b91472f7f6b79609dfdd0cb471a3363919d941385eec402045f8344f52d4d2212d29ae7c3cb2f4d55bbd978d49ac333e83f0fca
2018-01-29Merge #11711: bitcoin_qt.m4: Minor fixes and clean-ups.Wladimir J. van der Laan
06abcbf scripted-diff: Orthogonalize string quoting (Werner Lemberg) e0496d3 bitcoin_qt.m4: Add missing dollar sign for variable. (Werner Lemberg) 079f4b2 bitcoin_qt.m4: Add missing braces around variables in autoconf messages. (Werner Lemberg) 8695315 bitcoin_qt.m4: Use correct M4 quoting characters. (Werner Lemberg) db32a4f bitcoin_qt.m4: Improve QT_VERSION tests. (Werner Lemberg) Pull request description: Replaces #11222. Dropped the last commit, and converted e90d91c (now 06abcbf) into a scripted-diff using @theuni's suggestion. Tree-SHA512: f2e1713bda96e8875be08839af914b24b3240f2eecf18cb268f83c82d965ebf544a0022af4f6f73b88b637a4fdd404a96b9fcf8e5bdd11c507b5bb425eeb7e1d
2018-01-29Merge #12292: [tests] Fix names of excluded extended tests for travisMarcoFalke
a2808cf8a4 [tests] Fix names of excluded extended tests for travis (Anthony Towns) Pull request description: Tree-SHA512: 2cb8b9690dd41e996d0b1b3b7ecc95dee43132ea8a8d56fb7398a99dfc082d337c22060138b67486f45c11120c11a2d0639abf2dedf7be71ca78f1a8be6f832d
2018-01-29Merge #11577: Fix warnings (-Wsign-compare) when building with DEBUG_ADDRMANWladimir J. van der Laan
6eddd43 Fix warnings when building with DEBUG_ADDRMAN (practicalswift) Pull request description: Fix warnings when building with `DEBUG_ADDRMAN`. Warnings prior to this commit: ``` addrman.cpp:390:24: warning: comparison of integers of different signs: 'size_type' (aka 'unsigned long') and 'int' [-Wsign-compare] if (vRandom.size() != nTried + nNew) ~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~ addrman.cpp:411:52: warning: comparison of integers of different signs: 'int' and 'size_type' (aka 'unsigned long') [-Wsign-compare] if (info.nRandomPos < 0 || info.nRandomPos >= vRandom.size() || vRandom[info.nRandomPos] != n) ~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~ addrman.cpp:419:25: warning: comparison of integers of different signs: 'size_type' (aka 'unsigned long') and 'int' [-Wsign-compare] if (setTried.size() != nTried) ~~~~~~~~~~~~~~~ ^ ~~~~~~ addrman.cpp:421:23: warning: comparison of integers of different signs: 'size_type' (aka 'unsigned long') and 'int' [-Wsign-compare] if (mapNew.size() != nNew) ~~~~~~~~~~~~~ ^ ~~~~ 4 warnings generated. ``` Tree-SHA512: 0316faecfe95066d2c9a0b6b3960086e43824f21a67086a895ea45fbce1327f8d6df5945fe923c2dbe4efce430bc1384d515d317c3930d97d24965e507cf734d
2018-01-29[build] Add db4_cxx to bitcoin_find_bdb48.m4Randolf Richardson
Added "db4_cxx" as this is the name used in NetBSD for the Berkeley DB library. Without this additional base filename alternative, the "configure" script will fail to find this library and compilation will not succeed.
2018-01-29Merge #12159: Use the character based overload for std::string::find.Wladimir J. van der Laan
a73aab7 Use the character based overload for std::string::find. (Alin Rus) Pull request description: std::string::find has a character based overload as can be seen here (4th oveload): http://www.cplusplus.com/reference/string/string/find/ Use that instead of constantly allocating temporary strings. Tree-SHA512: dc7684b1551e6d779eb989e9a74363f9b978059a7c0f3db09d01744c7e6452961f9e671173265e71efff27afbcb80c0fe2c11b6dff2290e54a49193fa25a5679
2018-01-29[rpc] Mention that HD is enabled if hdmasterkeyid is presentfanquake
2018-01-29Merge #12108: [Refactor] Remove unused fQuit var from checkqueue.hWladimir J. van der Laan
30ded3e [Refactor] Remove unused fQuit var from checkqueue.h (donaloconnor) Pull request description: As per PR title, this var is no longer required Tested by doing a successful compile. Tree-SHA512: 845e5e0a250cb99e353e8584e9af2df44d97683174e8caa1069bd192b72ab622063765f29676272aecaef87596d72c63ae628404e2f42555136ec2c26d419f2d
2018-01-29Merge #12095: [contrib] Use BDB_LIBS/CFLAGS and pass --disable-replicationWladimir J. van der Laan
f3196a0 [contrib] Add --disable-replication to install_db4 (fanquake) 311a423 [contrib] Use BDB_LIBS/CFLAGS in install_db4 (fanquake) Pull request description: Switch install_db4 to use BDB_LIBS/BDB_CFLAGS, mentioned [here](https://github.com/bitcoin/bitcoin/pull/12041/files#r159616003). Pass ```--disable-replication``` to configure to match what we do in [depends](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/bdb.mk#L9). Documentation about --disable-replication is available [here](https://docs.oracle.com/cd/E17275_01/html/programmer_reference/build_unix_small.html). Tree-SHA512: 6f58728f27859614f499719583b0c2e8cd0ee89cb7e8fa34d1c54399877d6822ec2d8549c72ae4aff61daf7169bd330ad6ddc6c81e63008dedf028abd834f24c
2018-01-29Merge #12197: Log debug build status and warn when running benchmarksWladimir J. van der Laan
34328b4 Use PACKAGE_NAME instead of hardcoding application name in log message (Wladimir J. van der Laan) 0c74e2e Log debug build status and warn when running benchmarks (Wladimir J. van der Laan) Pull request description: Log whether the starting instance of bitcoin core is a debug or release build (--enable-debug). Also warn when running the benchmarks with a debug build, to prevent mistakes comparing debug to non-debug results. Tree-SHA512: f612dcb7d0a8435016cff0df8aef4942144dfb88be8a00df45cc8830d2aba4b167f6d397b83f8f57d57685888babd04ba88d4dac5a202d3dbd91bcbea3708ef0
2018-01-29[tests] Fix names of excluded extended tests for travisAnthony Towns
2018-01-29Merge #12217: qa: Add missing syncwithvalidationinterfacequeue to testsWladimir J. van der Laan
fa796bb qa: Add missing syncwithvalidationinterfacequeue to tests (MarcoFalke) Pull request description: Fixes intermittent travis failures with those tests caused by a missing flush of mempool txes to the wallet. Tree-SHA512: 4f57c93a81af9c07b36c16996bf3e6bbb2af61779f0d6ae0126b64563eb4ec4b53f64241c9cf4c3f322db56f4339fd939319747653bebc93bbc7e3d5dceedda6
2018-01-28[wallet] Remove duplicate mapWallet lookupsJoão Barbosa
2018-01-28Fix typospracticalswift