aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-04Bump minimum boost version in contrib/debianMatt Corallo
2017-05-03Update contrib/debian to latest Ubuntu PPA upload.Matt Corallo
This: * Partially reverts 9f68ed6 (which fixed spelling in a changelog, though generally changelogs should be append-only). * Disables UPnP support (PPA has not had it for a while, and I still don't trust miniupnpc, plus it seems uneccessary - its been a while since we needed to care about Bitcoin-Qt home users getting their inbound ports auto-mapped). * Enables ZMQ. * Forces GUI to Qt4 to fix various issues people have been seeing on Ubuntu and elsewhere with Qt5. * Reverts 70899d70b (Bitcoin does not enable "instant payments", not is transaction management "carried out collectively by the network", for whatever "transaction management" means, finally Bitcoin Core is not the only way to use the Bitcoin currency, as seemingly implied in the description).
2017-05-03Merge #10327: [tests] remove import-abort-rescan.pyWladimir J. van der Laan
981e586 [tests] remove import-abort-rescan.py (John Newbery) Tree-SHA512: 8658d42b5ecdefbb71c55849036ee4e8e113abbc9c549730524009fb6eacc50340ffb7ef99fb35809d4abd6b304d491a618e45ff6ded1990f01f18cbcebf2b12
2017-05-03[tests] remove import-abort-rescan.pyJohn Newbery
Reverts PR 10225
2017-05-03Merge #10311: Remove unused args from GetFetchFlags()Wladimir J. van der Laan
1ff2bb4 Remove unused args from GetFetchhFlags() (BtcDrak) Tree-SHA512: 75ed1076651f4e255720425386cbce0677c2e38c789a94cda95f51a8e5ed9cb7213f21a974c65539f256da9b91ccbc2fcc16b164815b46cd499b733becbddc57
2017-05-03Merge #10302: [Makefile] Alphabetically Reorder addrdb.cppWladimir J. van der Laan
56f09df [Makefile] Alphabetically Reorder addrdb.cpp (Spencer Lievens) Tree-SHA512: cedf64f5b4a6b20c07881f7e9c1c36421ee04a1ba17319946bae0197f9475dba6d5bda05f8f5d72539fbffcaa0adf8f474ecb2089106215c996576ab1235e8e1
2017-05-03Merge #9966: Control mempool persistence using a command line parameterWladimir J. van der Laan
a750d77 Add tests for mempool persistence (John Newbery) 91c91e1 Control mempool persistence using a command line parameter. (John Newbery) Tree-SHA512: 157d01cefd1903b8bfc5cbab42a3cc5e9c1094179bf4b64b3d34c0d4d9b976d593755bfea5c41c631cb758e1de17c6c2058c130d487d20560b7c0bafcddfa520
2017-05-03Merge #10115: Avoid reading the old hd master key during wallet encryptionWladimir J. van der Laan
185c7f0 Avoid reading the old hd master key during wallet encryption (Matt Corallo) Tree-SHA512: b744e8490c0e948355bb77b2695902bb99f89a68af46aa2be9120bd2ccf3c340eb8a56340fec117f9a935192298028945c9b18120ee6b8b23e7da8ffdb635745
2017-05-03Merge #10307: [tests] allow zmq test to be run in out-of-tree buildsWladimir J. van der Laan
b8251f6 [tests] allow zmq test to be run in out-of-tree builds (John Newbery) Tree-SHA512: 6946d23bc8a0b57e841a6811989182732d0534989e0e3b94421387f7971379b25a25d238cad22272e04076293275f6e980c8a713fce87ba48c1c4463d9243051
2017-05-03Merge #9733: Add getchaintxstats RPCWladimir J. van der Laan
bd1f138 Add getchaintxstats RPC (Pieter Wuille) Tree-SHA512: 270785b25e7e2faad4528b5ef591d9dc6266f15236563e3f02dac1f2d9ce3732c4d44903fcccf38549f7921f29d1a93cb0a118b7453ccc5afd79739b51e68f46
2017-05-03Add getchaintxstats RPCPieter Wuille
2017-05-02Merge #10297: Simplify DisconnectBlock arguments/return valuePieter Wuille
db994b2 Simplify DisconnectBlock arguments/return value (Pieter Wuille) Tree-SHA512: 62ce1a85bde2a5baffb9173ed28f2d8008200ecf8b09332122f1516fe68b33b9d7223cc1c2fffe804e38f767874c6353b76bd483e8ad7d48c4a5e80d6b683039
2017-05-02Merge #10137: Remove unused import. Remove accidental trailing semicolons.MarcoFalke
73b3721 Remove accidental trailing semicolons (practicalswift) b8d9a86 Remove unused import (practicalswift) Tree-SHA512: 36ac38952f8a10f36d2300519c583ef77703cff761be97470be97cfda2fec9d5b7ac604e454f174cc2601160e5cef3f227021ab5d3a6febc97fcb486d78754d3
2017-05-02Merge #10255: [test] Add test for listaddressgroupingsMarcoFalke
dadfee3 [test] Add test for listaddressgroupings (Jimmy Song) Tree-SHA512: 21cf0233c7fcf585f9a31306612ae1113ea916d2972b834efef0cb2154bd4dd24d9746d0632c778c699328f7e7a336d2da6e2bac9f0fb657c30290757563ad22
2017-05-02Merge #10198: [tests] Remove is_network_split from functional test frameworkMarcoFalke
c9cc76d [tests] Remove is_network_split from funtional test cases (John Newbery) Tree-SHA512: a43ec63a7dc20cbe9048f8d3af755aef55e9247f605d6481e6d665112882a749af7514f29c83ca9d761421b8e0f7282e5b9f8fc471985d222de826da7cc80ccf
2017-05-02[tests] Remove is_network_split from funtional test casesJohn Newbery
2017-05-02Merge #10169: [tests] Remove func test code duplicationWladimir J. van der Laan
2a52ae6 Remove duplicate method definitions in NodeConnCB subclasses (John Newbery) 52e15aa Adds helper functions to NodeConnCB (John Newbery) Tree-SHA512: 2d7909eb85b3bde0fc3ebf133798eca21e561f4b2a2880937750820a42856cfb61fc94e30591c14ac13218bcfae0ebe7c5e8662a7b10f5b02470325c44a86cf1
2017-05-02Merge #10314: Remove unused forward declaration for non-existent ↵Wladimir J. van der Laan
ScriptPubKeyToJSON(...) 3fe8a83 Remove unused forward declaration for non-existent ScriptPubKeyToJSON(...) (practicalswift) Tree-SHA512: 68d6a906fef86058ae7190228c7e65b5473b36f76b0cc53181b52c0de96f45d4a8dac0d1656f3793aaf4f79f4ca149ecb8293cc25b3f52fb09ceb114a343e933
2017-05-02Merge #10260: [doc] Minor corrections to osx dependenciesWladimir J. van der Laan
661caf8 [doc] Minor corrections to osx dependencies (fanquake) Tree-SHA512: 61451807d6208002550d2e37d26094a5515b11daacab39eb508b6168eebcea86f93dcc7f853aab490baec3727740c90d404c481e11b3d03dcea9f76f8fc7be12
2017-05-02Merge #10234: [net] listbanned RPC and QT should show correct banned subnetsWladimir J. van der Laan
d6732d8 [tests] update disconnect_ban.py test case to work with listbanned (John Newbery) 77c54b2 [net] listbanned RPC and QT should show correct banned subnets (John Newbery) Tree-SHA512: edd0e43377d456260d2697213c2829f8483630f3a668b6707d52605faefa610d951d10e6f22a95eff483cbd14faa8ac9b69fa7d3c0b5735c5f3df23fd71282e0
2017-05-02Remove unused forward declaration for non-existent ScriptPubKeyToJSON(...)practicalswift
2017-05-02Merge #10093: [Qt] Don't add arguments of sensitive command to console windowJonas Schnelli
7278537 [Qt] Don't add arguments of sensitive command to console window (Jonas Schnelli) Tree-SHA512: 3e5aa19a3f157caf383a0fd7dbf9b0d298d31ddaf8e24e3d1a8b913e19f54f3b69e115f98a21f3e3a14e5ccb368b59de061490ed39718299456a04989f8e3366
2017-05-02Merge #10175: Remove excess logic.Wladimir J. van der Laan
9a763d4 Remove excess logic. (practicalswift) Tree-SHA512: cfef280cc9cccf5042c9c49a8cd6fb6700764671cdd0d988149121f56c2d43a9ac38c5fc99c92385a9619d2d846480e02a9d655fa2586b1c284961b4634c229b
2017-05-02Merge #10180: [trivial] Fix typos (tempoarily → temporarily, inadvertantly ↵Wladimir J. van der Laan
→ inadvertently) 66082e0 [trivial] Fix typos (tempoarily → temporarily, inadvertantly → inadvertently) (practicalswift) Tree-SHA512: f377c379c9b6702894289c96fa50e64da01fa4e9353f8507ec5f1f58b0f3047fffdc473dffca61774f57793b82cf9e1c9b5f3d9a04fb864ccc1f44fc2a711f32
2017-05-02Remove unused args from GetFetchhFlags()BtcDrak
2017-05-02Merge #10281: doc: Add RPC interface guidelinesWladimir J. van der Laan
c26655e doc: Add RPC interface guidelines (Wladimir J. van der Laan) Tree-SHA512: e4cf1625d136fef9fe24361b6507c7e7ec2e676fb9727bbdcd4320aace6d0b49ce707592cb93a67b427168a1f373542e94bcea418b4e1c0cb1e9430af7412c8f
2017-05-02doc: Add RPC interface guidelinesWladimir J. van der Laan
2017-05-01Merge #10292: Improved efficiency in COutPoint constructorsPieter Wuille
4fbae77 Improved efficiency in COutPoint constructors (Marcos Mayorga) Tree-SHA512: 1e402d5021a47724b6159af90955f1a5932c383f48e3e704f1c9a52daa18d2dce5d8e1fcd02fae6977eab04ab83fa22872110b821d4c6593d940d9642abc9bcd
2017-05-01Merge #10305: Fix potential NPD introduced in b297426cPieter Wuille
70d3945 Fix potential NPD introduced in b297426c (Matt Corallo) Tree-SHA512: 920d03d2081ba2f3447cfa655dcbc3e17858454dab051436f717ada977d4f4bfe999c303018bc8aa33f30e37a97c63d70ba08632f5e7b7a8aa555615dde2191a
2017-05-01Merge #10309: Trivial: remove extra character from commentPieter Wuille
3503716 Trivial: remove extra character from comment (CryptAxe) Tree-SHA512: 66ee474945b4f9fd098cee0d031c1860c0777d4b05c609c0eaba32234209356b630766de30235b49d22cc5ea7cf2bb93410dea4466396369a0cdc0b631512a33
2017-05-01Trivial: remove extra character from commentCryptAxe
2017-05-01[tests] allow zmq test to be run in out-of-tree buildsJohn Newbery
2017-05-01[test] Add test for listaddressgroupingsJimmy Song
Test added as part of wallet-accounts.py. Make file a little more flake8 compliant
2017-05-01Fix potential NPD introduced in b297426cMatt Corallo
See https://github.com/bitcoin/bitcoin/pull/10290#discussion_r113954232 for more info.
2017-05-01Merge #10294: [Wallet] unset change position when there is no changeWladimir J. van der Laan
7c58863 [Wallet] unset change position when there is no change on exact match (Gregory Sanders) Tree-SHA512: ce8b9337e4132e32d80f954258d50938052c833a48e39431649d6adb16e3d18626a0ae5d300827e7fa397927fba72a1f066cb31af9b0a3ef7f1feb6024461626
2017-05-01[Wallet] unset change position when there is no change on exact matchGregory Sanders
2017-05-01Merge #10264: [test] Add tests for getconnectioncount, getnettotals and pingMarcoFalke
85f950a [test] Add tests for getconnectioncount, getnettotals and ping (Jimmy Song) Tree-SHA512: f9cccc749cd897a4e90400173d63da27798fe606ede216bdcfcce73848370327e010fa7ae70bd2974b24b3e688337e2ad18f0959ffed57cae9c0803456bab09a
2017-05-01Merge #8824: Refactor TxToJSON() and ScriptPubKeyToJSON()Wladimir J. van der Laan
0ff9320 refactor TxToJSON() and ScriptPubKeyToJSON() (jonnynewbs) Tree-SHA512: caf7d590829e221522edd5b1ab8ce67b53a2c6986d3bbe8477eab420b1007bf60f885ed0a25ba9587e468c00768360ddc31db37847e862858573eaed5ed8b0d6
2017-05-01Merge #10290: Add -stopatheight for benchmarkingWladimir J. van der Laan
b297426 Add -stopatheight for benchmarking (Pieter Wuille) Tree-SHA512: e8a4cca7fc1accd0dcd3a0eda97839fc34c61f25d6302082a8d6ecf9a0291b4abacbde16a0ecba7bdd2a56dd0c8d4d54300ad3b3478386da21dd7697acce381c
2017-04-30[Makefile] Alphabetically Reorder addrdb.cppSpencer Lievens
To keep conformity.
2017-04-29Merge #10256: [test] Add test for gettxout to wallet.pyMarcoFalke
dd1ea59 [test] Add gettxout call (Jimmy Song) Tree-SHA512: 5cea3763de30ec09b6e28b5a0c70f44d0c72a5b6ce159fdc95c1d43689ccfd21a32002d075c47cf011f66e505d9b97ea679c7c8825081a078543472e3e5083fb
2017-04-28Simplify DisconnectBlock arguments/return valuePieter Wuille
DisconnectBlock currently has a complicated interface: Situation Return value pfClean != nullptr pfClean == nullptr All good: true true Failure: false false Unclean rewind: true false with *pfClean=false Change this to return a tristate enum instead. As an added bonus, remove the ValidationState& argument which was unused.
2017-04-28[test] Add gettxout callJimmy Song
Test gettxout as part of the wallet test. Tests gettxout with a confirmed/unconfirmed tx with include_mempool flag on and off
2017-04-28[test] Add tests for getconnectioncount, getnettotals and pingJimmy Song
* Split run_test into 4 separate tests * Add 2 tests, getconnectioncount and getnettotals * getnettotals - Strategy of test is to get the network stats before and after a ping. The difference in bytes sent/received is the bytes needed for a ping/pong.
2017-04-28[tests] update disconnect_ban.py test case to work with listbannedJohn Newbery
2017-04-28[net] listbanned RPC and QT should show correct banned subnetsJohn Newbery
2017-04-28refactor TxToJSON() and ScriptPubKeyToJSON()jonnynewbs
2017-04-28Improved efficiency in COutPoint constructorsMarcos Mayorga
2017-04-27Add -stopatheight for benchmarkingPieter Wuille
2017-04-27Merge #10075: Remove unused C++ code not covered by unit testsWladimir J. van der Laan
b51aaf1 Remove unused C++ code not covered by unit tests (practicalswift) Tree-SHA512: 267bbd87df01a296bf23e82a8b6ee968e13e23a6aaecc535d803890a3e3e9f6208c7fc4c1f97afd98ed3e498b12fe1ada7e3cb2977ad12359a813f57336c74e5