aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-23Merge #10421: [qt] Remove excess logic: Prefer "return foo;" to "if (foo) { ↵Wladimir J. van der Laan
return true; } else { return false; }" e49b868 [qt] Remove excess logic (practicalswift) Tree-SHA512: ffcdc94843ea5ddd05ab5acec1f047def8d910da8f53c5019ec49199828d7c370efaedc801537b8e1f44e87f694d19d04b70c240416d2eddfaff9cd4abe3ca07
2017-05-23Merge #10372: Add perf counter data to GetStrongRandBytes state in schedulerWladimir J. van der Laan
888cce5 Add perf counter data to GetStrongRandBytes state in scheduler (Matt Corallo) 399fb8f Add internal method to add new random data to our internal RNG state (Matt Corallo) Tree-SHA512: 9732a3804d015eaf48d56b60c73880014845fd17a098f1ac2eff6bd50a4beb8b8be65956ac1f0d641e96e3a53c17daddd919401edbf2e3797c3fb687730fb913
2017-05-23Merge #10410: Fix importwallet edge case rescan bugWladimir J. van der Laan
2a8e35a Fix importwallet edge case rescan bug (Russell Yanofsky) Tree-SHA512: 59522c962290f9ef64436349d11183dd1fd829e515d1f5ec802b63dd813d04303e28d4f3ba38df77a6c151ee4c14f3ca5d3d82204c57456ac94054de62ae4bc7
2017-05-22Add perf counter data to GetStrongRandBytes state in schedulerMatt Corallo
2017-05-22Add internal method to add new random data to our internal RNG stateMatt Corallo
2017-05-22Merge #10390: [wallet] remove minimum total fee optionWladimir J. van der Laan
091a9ae remove minimum total fee option (Gregory Sanders) Tree-SHA512: 9be4df3dab0219f30917211408f47b242f7c96dd7663b06ab1cf3cc63027f14956dc680883be6c58673b6452d0f339cf893694e4f21d0d248e70760614d5a344
2017-05-22Merge #10415: [tests] Speed up fuzzing by ~200x when using afl-fuzzWladimir J. van der Laan
693247b [test] Speed up fuzzing by ~200x when using afl-fuzz (practicalswift) Tree-SHA512: 95922fc2616b8cb00dd531ed1140a52bbda4e04292dd8c1c60a8f49dbf6ccb797a18b61180b3fb68d695456b478a1f5ae7fda47e8ecee41dd65555487aef40a3
2017-05-22Merge #10424: Populate services in GetLocalAddressWladimir J. van der Laan
3070134 Populate services in GetLocalAddress (Alex Morcos) Tree-SHA512: b822d7e898ccb5b959ccb1b1d0f159f27190c2105fbf8f5b67ae54debab6fa6a0723d65a66e7341f55cd0d80398c3fbb39a41e067b9f4e0bfa2c1cd366032404
2017-05-22Merge #10433: [tests] improve tmpdir structureMarcoFalke
b040243 [tests] improve tmpdir structure (John Newbery) Tree-SHA512: b21ad555c3c23a43087b893ad18bd2398e1df91b82c0bf1804d07fdb582600a1c339e6f4aaca58074e52f146f459943a0e492abc045b2666d4a3a7e0e455d6dd
2017-05-22Merge #10431: Prevent shadowing the global dustRelayFeeMarcoFalke
43c5877 Prevent shadowing the global dustRelayFee. (Pavel Janík) Tree-SHA512: 9765931a7753c484990003396afd0bb65a53f42d1cad9502017720618ce90b3c5ae68591db01e3524adecdbe6925a5eeeebf04012ba644ef3b65073af207ae5d
2017-05-19Merge #10429: tests: fix spurious addrman test failureWladimir J. van der Laan
6b51b0a tests: fix spurious addrman test failure (Cory Fields) Tree-SHA512: 3d41723b1a31ff459d950331ffea7f383e4ef6187990be6a634978bead0c29d7c096f68e7edb6d4dc56069c1fe8a6f12a6daf573cb1e542b15d000eaa54ad288
2017-05-19Merge #10432: [Trivial] Add BITCOIN_FS_H endif footer in fs.hWladimir J. van der Laan
2300a5e [Trivial] Add BITCOIN_FS_H endif footer in fs.h (Ahmad Kazi) Tree-SHA512: fd56c5c78c12db74baeef93186b59814ac626beeecfad5db852ab8eaad8e71f7f47d64590bcdd9052cc9e97f4531ba90c1f66f0f9e6517d2f956d622803111df
2017-05-19[Trivial] Add BITCOIN_FS_H endif footer in fs.hAhmad Kazi
2017-05-19Prevent shadowing the global dustRelayFee.Pavel Janík
2017-05-19[test] Speed up fuzzing by ~200x when using afl-fuzzpracticalswift
Enable the `afl-clang-fast++` features deferred forkserver (`__AFL_INIT`) and persistent mode (`__AFL_LOOP(1000)`). Before this patch: ``` $ afl-fuzz -i input -o output -m512 -- src/test/test_bitcoin_fuzzy [*] Validating target binary... [!] WARNING: The target binary is pretty slow! See /usr/local/share/doc/afl/perf_tips.txt. [+] Here are some useful stats: Test case count : 1 favored, 0 variable, 1 total Bitmap range : 1072 to 1072 bits (average: 1072.00 bits) Exec timing : 20.4k to 20.4k us (average: 20.4k us) … exec speed : 57.58/sec (slow!) exec speed : 48.35/sec (slow!) exec speed : 53.78/sec (slow!) ``` After this patch: ``` $ afl-fuzz -i input -o output -m512 -- src/test/test_bitcoin_fuzzy [*] Validating target binary... [+] Persistent mode binary detected. [+] Deferred forkserver binary detected. [+] Here are some useful stats: Test case count : 1 favored, 0 variable, 1 total Bitmap range : 24 to 24 bits (average: 24.00 bits) Exec timing : 114 to 114 us (average: 114 us) … exec speed : 15.9k/sec exec speed : 13.1k/sec exec speed : 15.1k/sec ```
2017-05-19tests: fix spurious addrman test failureCory Fields
When inserting two addresses of the same class, from the same source, they have a 1/64 chance of colliding.
2017-05-18[tests] improve tmpdir structureJohn Newbery
2017-05-18Populate services in GetLocalAddressAlex Morcos
Previously if we didn't have any local addresses, GetLocalAddress would return 0.0.0.0 and then we'd swap in a peer's notion of our address in AdvertiseLocal, but then nServices would never get set.
2017-05-18Merge #8329: Consensus: MOVEONLY: Move functions for tx verificationWladimir J. van der Laan
618d07f MOVEONLY: tx functions to consensus/tx_verify.o (Jorge Timón) Tree-SHA512: 63fa2777c070a344dbfe61974526a770d962e049881c6f371b0034b1682c1e6e24f47454f01ee35ded20ade34488e023d4467a05369662906b99a73bb5de8497
2017-05-18[qt] Remove excess logicpracticalswift
Replace … ``` if (foo) { return true; } else { return false; } ``` … with the equivalent … ``` return foo; ```
2017-05-18Merge #10408: Net: Improvements to Tor control port parserWladimir J. van der Laan
49a199b torcontrol: Handle escapes in Tor QuotedStrings (Jack Grigg) 0182a11 torcontrol: Log invalid parameters in Tor reply strings where meaningful (Jack Grigg) 0b6f40d torcontrol: Check for reading errors in ReadBinaryFile (Jack Grigg) d63677b torcontrol: Fix ParseTorReplyMapping (Jack Grigg) 29f3c20 torcontrol: Add unit tests for Tor reply parsers (Jack Grigg) d8e03c0 torcontrol: Improve comments (Jack Grigg) Tree-SHA512: aa3ce8072d20299b38c4ba9471af7fab1f5df096c237bf40a96ee9274a357f7366f95ced0cc80f8da1f22f6455a1a8e68bad9a5ff71817eef3397b6aefcbc7ae
2017-05-18Merge #9697: [Qt] simple fee bumper with user verificationJonas Schnelli
a38783747 Make sure we re-check the conditions of a feebump during commit (Jonas Schnelli) 9b9ca538c Only update the transactionrecord if the fee bump has been commited (Jonas Schnelli) 6ed4368f1 Make sure we use nTxConfirmTarget during Qt fee bumps (Jonas Schnelli) be08fc39d Make sure we always update the table row after a bumpfee call (Jonas Schnelli) 2678d3dc6 Show old-fee, increase a new-fee in Qt fee bumper confirmation dialog (Jonas Schnelli) 2ec911f60 Add cs_wallet lock assertion to SignTransaction() (Jonas Schnelli) fbf385cc8 [Qt] simple fee bumper with user verification (Jonas Schnelli) Tree-SHA512: a3ce626201abf64cee496dd1d83870de51ba633de40c48eb0219c3eba5085c038af34c284512130d2544de20c1bff9fea1b78f92e3574c21dd4e96c11b8e7d76
2017-05-18Merge #9750: Bloomfilter: parameter variables made constantWladimir J. van der Laan
64aa36e param variables made const (ロハン ダル) Tree-SHA512: 7c19f9e7dd574c8ce8a9468555f27196735b583efe349c1309c90e1e5d2949daf6891574b4bea7122d6c6aca0c7ee4a782fe3d24918d889f7bf89227084a51cd
2017-05-17Merge #10061: [net] Added SetSocketNoDelay() utility functionPieter Wuille
ad415bc [net] Added SetSocketNoDelay() utility function (Thomas Snider) Tree-SHA512: c19e3c9910b3fc2ef86f2434f3e91d343e9cd9e2116153941de9789e2a6fc0389bffe762d21b55cda4a4b1de993afee0564c6946e65d05cef9e866b58896f9af
2017-05-17Merge #10395: Replace boost::function with std::function (C++11)Pieter Wuille
1b936f5 Replace boost::function with std::function (C++11) (practicalswift) Tree-SHA512: c4faec8cf3f801842010976115681f68ffa08fbc97ba50b22e95c936840f47e1b3bd8d7fd2f5b4e094b5a46bf3d29fc90b69d975a99e77322c0d19f8a00d53d3
2017-05-17Merge #8384: Add witness data output to TxInError messagesPieter Wuille
6e9e026 Expand signrawtransaction.py to cover error witness checking (Gregory Sanders) 9f7341b Add witness data output to TxInError messages (Gregory Sanders) Tree-SHA512: 6f2a758544fa2657f3a57051bdb80fb14cb10501c8ef4ccbab7a62d4b6a823e74f40991c8796248865def24619b620b859dc2bb08dc2cc72511c1cf3897ab1a9
2017-05-17Merge #10196: Bugfix: PrioritiseTransaction updates the mempool tx counterPieter Wuille
6c2e25c [qa] Test prioritise_transaction / getblocktemplate interaction (Suhas Daftuar) acc2e4b Bugfix: PrioritiseTransaction updates the mempool tx counter (Suhas Daftuar) Tree-SHA512: dcf834df52d84d5eb86acb847c3f28d3cffd1f78f3092b8ff8913c2c400675a071c48a19cd852fdbaac1582aa1dba23433e0e16055831ef2a5e76dde91199941
2017-05-17Merge #10199: Better fee estimatesPieter Wuille
38bc1ec Make more json-like output from estimaterawfee (Alex Morcos) 2d2e170 Comments and improved documentation (Alex Morcos) ef589f8 minor cleanup: remove unnecessary variable (Alex Morcos) 3ee76d6 Introduce a scale factor (Alex Morcos) 5f1f0c6 Historical block span (Alex Morcos) aa19b8e Clean up fee estimate debug printing (Alex Morcos) 10f7cbd Track first recorded height (Alex Morcos) 3810e97 Rewrite estimateSmartFee (Alex Morcos) c7447ec Track failures in fee estimation. (Alex Morcos) 4186d3f Expose estimaterawfee (Alex Morcos) 2681153 minor refactor: explicitly track start of new bucket range and don't update curNearBucket on final loop. (Alex Morcos) 1ba43cc Make EstimateMedianVal smarter about small failures. (Alex Morcos) d3e30bc Refactor to update moving average on fly (Alex Morcos) e5007ba Change parameters for fee estimation and estimates on all 3 time horizons. (Alex Morcos) c0a273f Change file format for fee estimates. (Alex Morcos) Tree-SHA512: 186e7508d86a1f351bb656edcd84ee9091f5f2706331eda9ee29da9c8eb5bf67b8c1f2abf6662835560e7f613b1377099054f20767f41ddcdbc89c4f9e78946d
2017-05-17Make more json-like output from estimaterawfeeAlex Morcos
2017-05-17Merge #10414: [depends] miniupnpc 2.0.20170509Wladimir J. van der Laan
af5d48c [depends] miniupnpc 2.0.20170509 (fanquake) Tree-SHA512: e6cfa7856aa4ceb17de5e84156cdb90094eedfb08a84ba1cd9a5ce1689533e17863e3f5692a1b7b7b096a7ac88f18539e4b6b7a79f7726401effb11bf9a5ef2f
2017-05-17Expand signrawtransaction.py to cover error witness checkingGregory Sanders
2017-05-17Add witness data output to TxInError messagesGregory Sanders
2017-05-17Merge #10257: [test] Add test for getmemoryinfoWladimir J. van der Laan
d4668f3 [test] Add test for getmemoryinfo (Jimmy Song) Tree-SHA512: f5285022504f7f3a5d85981c7c424e5cf1156167dbc4209933ea2a699b741e427f4f908f6d49435376c0e23347db24eb1129b74805cbfce5e0b4ce9e48f71fb0
2017-05-17[depends] miniupnpc 2.0.20170509fanquake
2017-05-17Merge #10388: Output line to debug.log when IsInitialBlockDownload latches ↵Wladimir J. van der Laan
to false 65d484a Output line to debug.log when IsInitialBlockDownload latches to false (Alex Morcos) Tree-SHA512: 8b9d1377167a78ea55afc4582c8b9305c8b0fe56063a25920e9d45ea9335470314e3cfdc92e78b803d304476fa4c19b228fea1758bbeadd20c719006d814b5f2
2017-05-17Merge #10319: Remove unused argument from MarkBlockAsInFlight(...)Wladimir J. van der Laan
6345f0b Remove unused argument from MarkBlockAsInFlight(...) (practicalswift) Tree-SHA512: c07616aac1a2e00d269ffd62861bb0fe3addc60c7a601ec4f9c212727697cf82d41d237cce8e043df02b7733d553bd99d9c999ebb299d376dbc63483ce182219
2017-05-17Merge #7522: Bugfix: Only use git for build info if the repository is ↵Wladimir J. van der Laan
actually the right one ed1fcdc Bugfix: Detect genbuild.sh in repo correctly (Luke Dashjr) e98e3dd Bugfix: Only use git for build info if the repository is actually the right one (Luke Dashjr) Tree-SHA512: 510d7ec8cfeff4e8e0c7ac53631eb32c7acaada7017e7f8cc2e6f60d86afe1cd131870582e01022f961c85a783a130bcb8fef971f8b110070c9c02afda020726
2017-05-17Merge #10405: tests: Correct testcase in script_tests.json for large number ↵Wladimir J. van der Laan
OP_EQUAL 2f84cf6 tests: Correct testcase in script_tests.json for large number OP_EQUAL (Wladimir J. van der Laan) Tree-SHA512: 3a4d33c7d65ea40f25e2f5f2dfab8b0262cac8a7c33698eef8332ca5ec4a6f88f73fc51441892b49ffa85660be5037644430585f2eab76e257d544f9c2271ab7
2017-05-17Merge #10413: Fix docs (there's no rpc command setpaytxfee)Wladimir J. van der Laan
0f1b26a Fix docs (there's no rpc command setpaytxfee) (Ryan Havar) Tree-SHA512: 5b9e1f16e172e712452873f82faa35f3ac949cd1df6e2ee7e2282fc8fad4eaf4548ebf05407426547ad859360ae837172e6343d66f8d302c7f5b097f39bb3994
2017-05-17Merge #8952: Add query options to listunspent RPC callWladimir J. van der Laan
bc63d0e Add query options to listunspent rpc call (Pedro Branco) Tree-SHA512: 2d296eee8df4e7ac378206ac3003a300e6478502d4b814f1ed1a47614222b01cc35dba871345ced68629860c227aff2c9e4b7f0d4ed0aa7de8b04f26c983580f
2017-05-17Add query options to listunspent rpc callPedro Branco
2017-05-17Merge #10374: qa: Warn when specified test is not foundWladimir J. van der Laan
fac79e4 qa: Warn when specified test is not found (MarcoFalke) Tree-SHA512: d11ecdde275309b12e23155f6cd8e26c99217436b5094a70dd51b95ae7688754227628dd9a801eb6a52ff3ebea4420938e2fc8e9dc9cd77a4dd5c28d2b822354
2017-05-17Merge #10404: doc: Add logging to FinalizeNode()Wladimir J. van der Laan
1530bfc Add logging to FinalizeNode() (Suhas Daftuar) Tree-SHA512: 34bd950eb7830f378d069229c24122e97db68435b313f0de2c8772c2feefdc6db5f4d1f43eeade237ffe91cdef0f1cfe3232e1a37c561a65767f4527b2e2e370
2017-05-16Fix docs (there's no rpc command setpaytxfee)Ryan Havar
2017-05-16Fix importwallet edge case rescan bugRussell Yanofsky
Start importwallet rescans at the first block with timestamp greater or equal to the wallet birthday instead of the last block with timestamp less or equal. This fixes an edge case bug where importwallet could fail to start the rescan early enough if there are blocks with decreasing timestamps or multiple blocks with the same timestamp.
2017-05-16Merge #10362: [GUI] Add OSX keystroke to RPCConsole infoJonas Schnelli
012fa9b99 Add OSX keystroke to clear RPCConsole (Spencer Lievens) Tree-SHA512: 124e9567d633fd80ab200e53b34c821947111ebb6ebd0b2ba3feacdbe2b6ab59ab447b87473f36d221d4189d92df6d53e34a8486aacaa8eaa4d9e413db01b11f
2017-05-16torcontrol: Handle escapes in Tor QuotedStringsJack Grigg
https://trac.torproject.org/projects/tor/ticket/14999 is tracking an encoding bug with the Tor control protocol, where many of the QuotedString instances that Tor outputs are in fact CStrings, but it is not documented which ones are which. https://spec.torproject.org/control-spec section 2.1.1 provides a future-proofed rule for handing QuotedStrings, which this commit implements. This commit merges all six commits from https://github.com/zcash/zcash/pull/2251
2017-05-16torcontrol: Log invalid parameters in Tor reply strings where meaningfulJack Grigg
2017-05-16torcontrol: Check for reading errors in ReadBinaryFileJack Grigg
This ensures that ReadBinaryFile never returns exactly TOR_COOKIE_SIZE bytes if the file was larger than that.
2017-05-16torcontrol: Fix ParseTorReplyMappingJack Grigg
- Ignore remaining input if it is an OptArguments - Correctly handle escapes