Wladimir J. van der Laan
2580ff81f4
Merge #10314 : Remove unused forward declaration for non-existent ScriptPubKeyToJSON(...)
...
3fe8a83
Remove unused forward declaration for non-existent ScriptPubKeyToJSON(...) (practicalswift)
Tree-SHA512: 68d6a906fef86058ae7190228c7e65b5473b36f76b0cc53181b52c0de96f45d4a8dac0d1656f3793aaf4f79f4ca149ecb8293cc25b3f52fb09ceb114a343e933
2017-05-02 19:00:22 +02:00
Wladimir J. van der Laan
1d75597ba6
Merge #10260 : [doc] Minor corrections to osx dependencies
...
661caf8
[doc] Minor corrections to osx dependencies (fanquake)
Tree-SHA512: 61451807d6208002550d2e37d26094a5515b11daacab39eb508b6168eebcea86f93dcc7f853aab490baec3727740c90d404c481e11b3d03dcea9f76f8fc7be12
2017-05-02 18:49:31 +02:00
Wladimir J. van der Laan
faf2dea5ea
Merge #10234 : [net] listbanned RPC and QT should show correct banned subnets
...
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-02 18:41:58 +02:00
practicalswift
3fe8a83969
Remove unused forward declaration for non-existent ScriptPubKeyToJSON(...)
2017-05-02 17:18:03 +02:00
Jonas Schnelli
a3e756b7d6
Merge #10093 : [Qt] Don't add arguments of sensitive command to console window
...
7278537
[Qt] Don't add arguments of sensitive command to console window (Jonas Schnelli)
Tree-SHA512: 3e5aa19a3f157caf383a0fd7dbf9b0d298d31ddaf8e24e3d1a8b913e19f54f3b69e115f98a21f3e3a14e5ccb368b59de061490ed39718299456a04989f8e3366
2017-05-02 14:57:11 +02:00
Wladimir J. van der Laan
f4a6180607
Merge #10175 : Remove excess logic.
...
9a763d4
Remove excess logic. (practicalswift)
Tree-SHA512: cfef280cc9cccf5042c9c49a8cd6fb6700764671cdd0d988149121f56c2d43a9ac38c5fc99c92385a9619d2d846480e02a9d655fa2586b1c284961b4634c229b
2017-05-02 14:50:30 +02:00
Wladimir J. van der Laan
e7b90f78f5
Merge #10180 : [trivial] Fix typos (tempoarily → temporarily, inadvertantly → inadvertently)
...
66082e0
[trivial] Fix typos (tempoarily → temporarily, inadvertantly → inadvertently) (practicalswift)
Tree-SHA512: f377c379c9b6702894289c96fa50e64da01fa4e9353f8507ec5f1f58b0f3047fffdc473dffca61774f57793b82cf9e1c9b5f3d9a04fb864ccc1f44fc2a711f32
2017-05-02 14:49:04 +02:00
Wladimir J. van der Laan
0e8499c53f
Merge #10281 : doc: Add RPC interface guidelines
...
c26655e
doc: Add RPC interface guidelines (Wladimir J. van der Laan)
Tree-SHA512: e4cf1625d136fef9fe24361b6507c7e7ec2e676fb9727bbdcd4320aace6d0b49ce707592cb93a67b427168a1f373542e94bcea418b4e1c0cb1e9430af7412c8f
2017-05-02 07:53:14 +02:00
Wladimir J. van der Laan
c26655ed3f
doc: Add RPC interface guidelines
2017-05-02 07:51:49 +02:00
Pieter Wuille
e4bbd3d230
Merge #10292 : Improved efficiency in COutPoint constructors
...
4fbae77
Improved efficiency in COutPoint constructors (Marcos Mayorga)
Tree-SHA512: 1e402d5021a47724b6159af90955f1a5932c383f48e3e704f1c9a52daa18d2dce5d8e1fcd02fae6977eab04ab83fa22872110b821d4c6593d940d9642abc9bcd
2017-05-01 16:40:43 -07:00
Pieter Wuille
c45da32047
Merge #10305 : Fix potential NPD introduced in b297426c
...
70d3945
Fix potential NPD introduced in b297426c
(Matt Corallo)
Tree-SHA512: 920d03d2081ba2f3447cfa655dcbc3e17858454dab051436f717ada977d4f4bfe999c303018bc8aa33f30e37a97c63d70ba08632f5e7b7a8aa555615dde2191a
2017-05-01 15:01:32 -07:00
Pieter Wuille
ab1f1d3246
Merge #10309 : Trivial: remove extra character from comment
...
3503716
Trivial: remove extra character from comment (CryptAxe)
Tree-SHA512: 66ee474945b4f9fd098cee0d031c1860c0777d4b05c609c0eaba32234209356b630766de30235b49d22cc5ea7cf2bb93410dea4466396369a0cdc0b631512a33
2017-05-01 14:58:30 -07:00
CryptAxe
3503716f1e
Trivial: remove extra character from comment
2017-05-01 14:18:30 -07:00
Matt Corallo
70d39454ee
Fix potential NPD introduced in b297426c
...
See https://github.com/bitcoin/bitcoin/pull/10290#discussion_r113954232
for more info.
2017-05-01 11:51:06 -04:00
Wladimir J. van der Laan
e2b99b1313
Merge #10294 : [Wallet] unset change position when there is no change
...
7c58863
[Wallet] unset change position when there is no change on exact match (Gregory Sanders)
Tree-SHA512: ce8b9337e4132e32d80f954258d50938052c833a48e39431649d6adb16e3d18626a0ae5d300827e7fa397927fba72a1f066cb31af9b0a3ef7f1feb6024461626
2017-05-01 15:20:51 +02:00
Gregory Sanders
7c588637d4
[Wallet] unset change position when there is no change on exact match
2017-05-01 08:07:09 -04:00
MarcoFalke
492d22f929
Merge #10264 : [test] Add tests for getconnectioncount, getnettotals and ping
...
85f950a
[test] Add tests for getconnectioncount, getnettotals and ping (Jimmy Song)
Tree-SHA512: f9cccc749cd897a4e90400173d63da27798fe606ede216bdcfcce73848370327e010fa7ae70bd2974b24b3e688337e2ad18f0959ffed57cae9c0803456bab09a
2017-05-01 12:14:58 +02:00
Wladimir J. van der Laan
9c33ffd387
Merge #8824 : Refactor TxToJSON() and ScriptPubKeyToJSON()
...
0ff9320
refactor TxToJSON() and ScriptPubKeyToJSON() (jonnynewbs)
Tree-SHA512: caf7d590829e221522edd5b1ab8ce67b53a2c6986d3bbe8477eab420b1007bf60f885ed0a25ba9587e468c00768360ddc31db37847e862858573eaed5ed8b0d6
2017-05-01 09:24:01 +02:00
Wladimir J. van der Laan
8d6d43e933
Merge #10290 : Add -stopatheight for benchmarking
...
b297426
Add -stopatheight for benchmarking (Pieter Wuille)
Tree-SHA512: e8a4cca7fc1accd0dcd3a0eda97839fc34c61f25d6302082a8d6ecf9a0291b4abacbde16a0ecba7bdd2a56dd0c8d4d54300ad3b3478386da21dd7697acce381c
2017-05-01 09:17:15 +02:00
MarcoFalke
80c3a73429
Merge #10256 : [test] Add test for gettxout to wallet.py
...
dd1ea59
[test] Add gettxout call (Jimmy Song)
Tree-SHA512: 5cea3763de30ec09b6e28b5a0c70f44d0c72a5b6ce159fdc95c1d43689ccfd21a32002d075c47cf011f66e505d9b97ea679c7c8825081a078543472e3e5083fb
2017-04-29 14:47:41 +02:00
Jimmy Song
dd1ea59624
[test] Add gettxout call
...
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 14:54:12 -07:00
Jimmy Song
85f950a5c4
[test] Add tests for getconnectioncount, getnettotals and ping
...
* 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 14:21:30 -07:00
John Newbery
d6732d832a
[tests] update disconnect_ban.py test case to work with listbanned
2017-04-28 11:24:33 -04:00
John Newbery
77c54b270d
[net] listbanned RPC and QT should show correct banned subnets
2017-04-28 11:24:33 -04:00
jonnynewbs
0ff9320bf5
refactor TxToJSON() and ScriptPubKeyToJSON()
2017-04-28 10:01:56 -04:00
Marcos Mayorga
4fbae77929
Improved efficiency in COutPoint constructors
2017-04-28 09:33:34 +01:00
Pieter Wuille
b297426c96
Add -stopatheight for benchmarking
2017-04-27 14:39:27 -07:00
Wladimir J. van der Laan
4c924011f5
Merge #10075 : Remove unused C++ code not covered by unit tests
...
b51aaf1
Remove unused C++ code not covered by unit tests (practicalswift)
Tree-SHA512: 267bbd87df01a296bf23e82a8b6ee968e13e23a6aaecc535d803890a3e3e9f6208c7fc4c1f97afd98ed3e498b12fe1ada7e3cb2977ad12359a813f57336c74e5
2017-04-27 20:25:15 +02:00
Pieter Wuille
a550f6e415
Merge #10283 : Cleanup: reduce to one GetMinimumFee call signature
...
3edbd79
cleanup: reduce to one GetMinimumFee call signature (Alex Morcos)
Tree-SHA512: da7ae6f0eb06db630792243a47c95d4ceff3baf0ce1ebefa73f1eb6cab1c6fdf0a000770cf61700dd7a9e260d7a313083b79e1d667bd5cbef0b1fe8fbec411e7
2017-04-27 09:25:24 -07:00
MarcoFalke
47535d7c3e
Merge #10280 : [test] Unit test amount.h/amount.cpp
...
dcb69fd
[test] Unit test amount.h/amount.cpp (Jimmy Song)
Tree-SHA512: dc50e6158322a282a8b8b60c8eab7ce327a33c48113a1455b8a1784f07e6277ad499e85ec978199468a2dc34e9e288287c8803c215f810fa2d841cdda9a414f5
2017-04-26 23:49:39 +02:00
Alex Morcos
3edbd79a65
cleanup: reduce to one GetMinimumFee call signature
2017-04-26 15:54:23 -04:00
practicalswift
b51aaf1c42
Remove unused C++ code not covered by unit tests
2017-04-26 21:20:02 +02:00
Jimmy Song
dcb69fde5a
[test] Unit test amount.h/amount.cpp
...
Add tests for MoneyRange, binary operators, ToString and a constructor
2017-04-26 07:25:57 -07:00
Wladimir J. van der Laan
cf5782508a
Merge #9614 : [wallet] [refactor] Simplify getbalance implementation
...
02d9f50
[wallet] Remove unneeded legacy getbalance code (Russell Yanofsky)
82b7dc3
[wallet] Add GetLegacyBalance method to simplify getbalance RPC (Russell Yanofsky)
Tree-SHA512: c3b890ff1f5a3df7e886309bad94bdf5cc3c12b72983bb79c72f8655ce16edf581bff0faaade2f18c2cb723f50d516e53f87792f81c3f8143b0c4377c0d80e87
2017-04-26 13:11:32 +02:00
Russell Yanofsky
02d9f50d5f
[wallet] Remove unneeded legacy getbalance code
2017-04-26 06:36:38 -04:00
Russell Yanofsky
82b7dc373a
[wallet] Add GetLegacyBalance method to simplify getbalance RPC
...
This adds a simpler new implementation of getbalance logic along with asserts
to confirm it behaves identically to the old logic. The old logic is removed in
the next commit.
2017-04-26 06:36:38 -04:00
Wladimir J. van der Laan
6fdb319165
Merge #9743 : Fix several potential issues found by sanitizers
...
1d31093
fix tsan: utiltime race on nMockTime (Pieter Wuille)
321bbc2
fix ubsan: bitcoin-tx: not initialize context before IsFullyValid (Pieter Wuille)
Tree-SHA512: 39ea83c6122f06339cd425deb236357694e84ce2e4e9c61c10b90a8909b6e42e8c7b76396175cdc4723ababd2fa4f935d48f8a469baf853c5a06d7b962a5c8dc
2017-04-26 12:29:05 +02:00
Wladimir J. van der Laan
bd9ec0ef1e
Merge #9670 : contrib: github-merge improvements
...
b508424
contrib: github-merge improvements (Wladimir J. van der Laan)
Tree-SHA512: 56a34e887716bf6bfcd1b6520f6b9a1bb742e1ad17e75618caf982af71fceb75d50caec1bf4279cb9a2f7a74319f1bcec4c824682841bd6e994acc0991616451
2017-04-26 11:44:13 +02:00
Wladimir J. van der Laan
8979f4569e
Merge #10273 : [scripts] Minor improvements to macdeployqtplus
script.
...
e8babc4
Use `with` in `macdeployqtplus` script. (Chris Gavin)
4f3ac7d
Remove unused variable from `macdeployqtplus` script. (Chris Gavin)
Tree-SHA512: 0259506b36f3bfcc64ada951dcd4fdab1611ef76a39f92effd1163b6d8fab06bdbf50784b4b22f8b1483697c3029c12cfee5372b442ab445887ac4f928f6de80
2017-04-26 10:27:38 +02:00
Wladimir J. van der Laan
8254a8ae21
Merge #10278 : [test] Add Unit Test for GetListenPort
...
1b14449
[test] Add Unit Test for GetListenPort (Jimmy Song)
Tree-SHA512: aea5f60fb3699680cc5acac9d9c8d8712634db9d629bbfa1815a29e5cf46c22f783886c608664baaa91b3282c52ce8069c358850cf4f90acf731a9e6c1701caa
2017-04-26 09:34:41 +02:00
Wladimir J. van der Laan
9c94fb6c32
Merge #9930 : Trivial: Correct indentation and bracing
...
31a14d4
Correct indentation and remove unnecessary braces (Matthias Grundmann)
Tree-SHA512: c0e827ec4474133c7674254dfd13f59608820cd639debc7759bddae71d73451645fcfe14384f343d08f74d69ac3922bafc12a514f3b790ae2bf9271aa67d5f36
2017-04-26 08:50:18 +02:00
Jimmy Song
1b144495d0
[test] Add Unit Test for GetListenPort
...
Add very basic unit test for GetListenPort in net_tests.cpp
2017-04-25 10:17:04 -07:00
Wladimir J. van der Laan
e0a7e1994e
Merge #10225 : [test] Add aborttrescan tests
...
ed60970
[test] Test abortrescan command. (Karl-Johan Alm)
Tree-SHA512: 7f617adba65a6df8fdc4b01432992926a06c4a05da4e657653436f7716301fa5d6249d77894a097737e7fb9e118925883f2425c639058b8973680339bb8e61b6
2017-04-25 16:10:50 +02:00
Wladimir J. van der Laan
c29a0d4812
Merge #10265 : [wallet] [moveonly] Check non-null pindex before potentially referencing
...
c36ea69
[wallet] Make sure pindex is non-null before possibly referencing in LogPrintf call. (Karl-Johan Alm)
Tree-SHA512: a14c9f3e1228bca91977bea821c56a377d80889b41d250050c9be67aa93e460319a7cf1d4b63ee40f23b5a34159590f0e3fe15dc88698dc694c0c8098bd2db4d
2017-04-25 16:04:23 +02:00
Wladimir J. van der Laan
cb007e4346
Merge #10263 : Trivial: fix fee estimate write error log message
...
94807be
Trivial: fix fee estimate write error log message (CryptAxe)
Tree-SHA512: 998c9b331e901562c9ba575a85bc6c66f28d926dfe8116f08ab903e024c63a13fd37a58d19eb6504ad880d5bbccfbf6cba83ba0a6917f5d9068c52114f71b437
2017-04-25 13:28:26 +02:00
Wladimir J. van der Laan
95f5e44075
Merge #10270 : Remove Clang workaround for Boost 1.46
...
93dbb15
Remove Clang workaround for Boost 1.46 (fanquake)
Tree-SHA512: 1246841b264688f5fe5a2a514dd732d400307fa068686857e8aedaebb292ae65b21ab96b5ff9477ccd2f049882b967b6e143683963ce1be0b9e781596c5372d1
2017-04-25 12:04:52 +02:00
Chris Gavin
e8babc4330
Use with
in macdeployqtplus
script.
2017-04-25 09:18:08 +01:00
Chris Gavin
4f3ac7ddd7
Remove unused variable from macdeployqtplus
script.
2017-04-25 09:18:03 +01:00
Wladimir J. van der Laan
54e2d87e79
Merge #10272 : [Tests] Prevent warning: variable 'x' is uninitialized
...
5ec8836
Prevent warning: variable 'x' is uninitialized (Pavel Janík)
Tree-SHA512: 54e39d4b85303db033bd08c52ff2fa093ec9a1b1b9550911bb2123be60fa471cba81f36859681170695dfafb3a8a4c154122917c05b5a23837cf97c25907afc1
2017-04-25 09:39:02 +02:00
Karl-Johan Alm
c36ea693ee
[wallet] Make sure pindex is non-null before possibly referencing in LogPrintf call.
2017-04-25 16:18:52 +09:00