aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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
2017-05-16torcontrol: Add unit tests for Tor reply parsersJack Grigg
2017-05-16torcontrol: Improve commentsJack Grigg
2017-05-16Merge #10383: [logging] log system time and mock timeWladimir J. van der Laan
761392d [logging] log system time and mock time (John Newbery) Tree-SHA512: 0a4b3ad74bcac201be490fe12e4b45adeabc39030ac46f40e1aeb2a20b2f3963e4468e65798d8aaeca1818759cab55ff2b2aa214500aa11571492c3301dd31c1
2017-05-15Merge #10380: [doc] Removing comments about dirty entries on txmempoolPieter Wuille
4f3782e [doc] Removing comments about dirty entries on txmempool (Simone Madeo) Tree-SHA512: 12ffad7237e2a8ec658cfcff263dad5a2220beadda48d67095df90c2f8ea55ffb6891d919698893b625965fb3069a05e7901fac6cceb3d1228e6833356408074
2017-05-15Merge #10376: [tests] fix disconnect_ban intermittencyMarcoFalke
3ba2c08 [tests] fix disconnect_ban intermittency (John Newbery) Tree-SHA512: f4e1a88b4126ad5e1aa861a99f9b2589194a25610b5e18bcc196e7dccfa02491f0b9549fbb9f9a73776ed5ee2f6b8ade264b92ac378a25c1a92df4b0272487a7
2017-05-15Merge #8704: [RPC] Transaction details in getblockWladimir J. van der Laan
e3c9f2d Use a verbosity instead of two verbose parameters (Andrew Chow) c99ab3c RPC: Allow multiple names for parameters (Luke Dashjr) Tree-SHA512: 686b38f6b0106563738d51f55666fe6d49a5b121b30d4480c2bfb640a59ede8e6f7f3c05c3c5d80a5288e127991e191d19d1d4f9ace566fd39edeb27b31857ff
2017-05-15tests: Correct testcase in script_tests.json for large number OP_EQUALWladimir J. van der Laan
Fix a test case that was passing correctly by accident, but not testing the right thing. Reported by helo on IRC.
2017-05-15Add logging to FinalizeNode()Suhas Daftuar
2017-05-15Merge #9494: Introduce an ArgsManager class encapsulating cs_args, mapArgs ↵Wladimir J. van der Laan
and mapMultiArgs 78da882 Util: Small improvements in gArgs usage (Jorge Timón) 5292245 Util: Put mapMultiArgs inside ArgsManager (Jorge Timón) b3cbd55 scripted-diff: Util: Encapsulate mapMultiArgs behind gArgs (Jorge Timón) f2957ce Util: Create ArgsManager class... (Jorge Timón) Tree-SHA512: 7d58250da440ad0f41745f46ab6021d6ecbb292035cab3d86fb08ce6bd822df604ac31b3ded6fd6914f7cfd12ba531cbc06a76eb500f629627f47ae6ac8350a7
2017-05-14Merge #10253: [test] Add test for getnetworkhashpsMarcoFalke
de487b7 Tests: Add test for getnetworkhashps (Jimmy Song) Tree-SHA512: b1418ad904618f639ffa34dd40906692aff1fdf1a0d13a9af00039e7a6a2b758091734b89c0c91e8d455da6b15a0e435a9a9ca97a41d97bf395b844c761ffa27
2017-05-14qa: Warn when specified test is not foundMarcoFalke
2017-05-13Replace boost::function with std::function (C++11)practicalswift
2017-05-12Use a verbosity instead of two verbose parametersAndrew Chow
Verbose is changed to an int. This can have values from 0-2 for each level of verbosity. Verbosity level 2 has transaction details displayed in the results.
2017-05-11Merge #10308: [wallet] Securely erase potentially sensitive keys/valuesWladimir J. van der Laan
6c914ac [wallet] Securely erase potentially sensitive keys/values (Thomas Snider) Tree-SHA512: 071d88c4093108d4e4eced35a6ffcebe3f499798194f5b1be661ffa5b78b5f55311667f6d2a72758d85290f61f958381ee95d380b9045ca18e9e1875f0e686c8
2017-05-11Merge #10317: Remove unused Python importsWladimir J. van der Laan
0c60c63 Remove unused Python imports (practicalswift) Tree-SHA512: c7ae6a8ae2c751b771804960498bf270ab022c80fa9e1b39118d5986d890c8cdfc27a3cc24bf28c080d8088ddc11facd1f2881ba2c209cdd819675fda4689d83
2017-05-11Merge #10341: rpc/wallet: Workaround older UniValue which returns a ↵Wladimir J. van der Laan
std::string temporary for get_str a637734 rpc/wallet: Workaround older UniValue which returns a std::string temporary for get_str (Luke Dashjr) Tree-SHA512: 8f03f1d301f714f700bf64e259a1c986136fd1ac532f091aa97198a39c131290c320094f4fc38c774c8db4469a75437596b1d933300e4f04037abc158a252bad
2017-05-11Output line to debug.log when IsInitialBlockDownload latches to falseAlex Morcos
2017-05-11Merge #10328: Update contrib/debian to latest Ubuntu PPA upload.Wladimir J. van der Laan
91700aa Re-enable upnp support in contrib/debian (Matt Corallo) c5071e1 Build with QT5 on Debian-based systems using contrib/debian (Matt Corallo) a8e9286 Bump minimum boost version in contrib/debian (Matt Corallo) 9970219 Update contrib/debian to latest Ubuntu PPA upload. (Matt Corallo) Tree-SHA512: ee4d3c5927a9cfb2794672eaca883c4af5df541383afbdbc6500714ee17518e78b58f509b2e9805bbc424ef97a5e64be0b9a977212c5002cb682f0569d28099b
2017-05-11Make sure we re-check the conditions of a feebump during commitJonas Schnelli
2017-05-11Only update the transactionrecord if the fee bump has been commitedJonas Schnelli