Wladimir J. van der Laan
750c5a5b84
Merge #10189 : devtools/net: add a verifier for scriptable changes. Use it to make CNode::id private.
...
0f3471f
net: make CNode's id private (Cory Fields)
9ff0a51
scripted-diff: net: Use accessor rather than node's id directly (Cory Fields)
e50c33e
devtools: add script to verify scriptable changes (Cory Fields)
Tree-SHA512: a0ff50f4e1d38a2b63109b4996546c91b3e02e00d92c0bf04f48792948f78b1f6d9227a15d25c823fd4723a0277fc6a32c2c1287c7abbb7e50fd82ffb0f8d994
8 years ago
MarcoFalke
170bc2c381
Merge #10318 : [tests] fix wait_for_inv()
...
3e3c22f
[tests] fix wait_for_inv() (John Newbery)
Tree-SHA512: b8070b8461e9c792cc3d9c17fd9d3faf87f550c7c0fc1788e0cd382f0794932b70cc87d480805a3b3c1ca2fdca9f8f1bcb9759300d777d9aaa8d41c016260d93
8 years ago
MarcoFalke
314ebdfcb3
Merge #10134 : [qa] Fixes segwit block relay test after inv-direct-fetch was disabled
...
f19abd9
[qa] Fixes segwit block relay test after inv-direct-fetch was disabled (Suhas Daftuar)
Tree-SHA512: 4df0074cbf3d9d31b7906026dc3296b143c252a81aef47eee0bcdf6cddc2501f83cb8d1b5a13256f9d7e889306d4435f260c1fa827573ae8569bb241a89a5f82
8 years ago
MarcoFalke
e9274839bf
Merge #10344 : [tests] Fix abandonconflict.py intermittency
...
965a124
[tests] Fix abandonconflict.py intermittency (John Newbery)
Tree-SHA512: e0aeeaa2713fb842b92d8c474823b4ed4b7adb840c59141c99216f6611998339776afe0be17a53da9e85137fd53fd8d4985e11a65476765ee1c97df36e237142
8 years ago
Suhas Daftuar
f19abd9053
[qa] Fixes segwit block relay test after inv-direct-fetch was disabled
...
This test was passing because we never fetch blocks if we only receive
an inv and not the header (after 037159cebf
),
and this test wasn't delivering the header.
8 years ago
John Newbery
965a124427
[tests] Fix abandonconflict.py intermittency
8 years ago
Cory Fields
0f3471f3ad
net: make CNode's id private
8 years ago
Cory Fields
9ff0a51164
scripted-diff: net: Use accessor rather than node's id directly
...
-BEGIN VERIFY SCRIPT-
sed -i "s/\(node\|to\|from\)->id/\1->GetId()/" src/net.cpp src/net_processing.cpp
-END VERIFY SCRIPT-
8 years ago
Cory Fields
e50c33ea27
devtools: add script to verify scriptable changes
8 years ago
Wladimir J. van der Laan
35da2aeed7
Merge #10327 : [tests] remove import-abort-rescan.py
...
981e586
[tests] remove import-abort-rescan.py (John Newbery)
Tree-SHA512: 8658d42b5ecdefbb71c55849036ee4e8e113abbc9c549730524009fb6eacc50340ffb7ef99fb35809d4abd6b304d491a618e45ff6ded1990f01f18cbcebf2b12
8 years ago
John Newbery
981e586ab8
[tests] remove import-abort-rescan.py
...
Reverts PR 10225
8 years ago
John Newbery
3e3c22f09d
[tests] fix wait_for_inv()
8 years ago
Wladimir J. van der Laan
22d870016e
Merge #10311 : Remove unused args from GetFetchFlags()
...
1ff2bb4
Remove unused args from GetFetchhFlags() (BtcDrak)
Tree-SHA512: 75ed1076651f4e255720425386cbce0677c2e38c789a94cda95f51a8e5ed9cb7213f21a974c65539f256da9b91ccbc2fcc16b164815b46cd499b733becbddc57
8 years ago
Wladimir J. van der Laan
0912620888
Merge #10302 : [Makefile] Alphabetically Reorder addrdb.cpp
...
56f09df
[Makefile] Alphabetically Reorder addrdb.cpp (Spencer Lievens)
Tree-SHA512: cedf64f5b4a6b20c07881f7e9c1c36421ee04a1ba17319946bae0197f9475dba6d5bda05f8f5d72539fbffcaa0adf8f474ecb2089106215c996576ab1235e8e1
8 years ago
Wladimir J. van der Laan
2a183de0ec
Merge #9966 : Control mempool persistence using a command line parameter
...
a750d77
Add tests for mempool persistence (John Newbery)
91c91e1
Control mempool persistence using a command line parameter. (John Newbery)
Tree-SHA512: 157d01cefd1903b8bfc5cbab42a3cc5e9c1094179bf4b64b3d34c0d4d9b976d593755bfea5c41c631cb758e1de17c6c2058c130d487d20560b7c0bafcddfa520
8 years ago
Wladimir J. van der Laan
d3dce0eb67
Merge #10115 : Avoid reading the old hd master key during wallet encryption
...
185c7f0
Avoid reading the old hd master key during wallet encryption (Matt Corallo)
Tree-SHA512: b744e8490c0e948355bb77b2695902bb99f89a68af46aa2be9120bd2ccf3c340eb8a56340fec117f9a935192298028945c9b18120ee6b8b23e7da8ffdb635745
8 years ago
Wladimir J. van der Laan
83073de4bd
Merge #10307 : [tests] allow zmq test to be run in out-of-tree builds
...
b8251f6
[tests] allow zmq test to be run in out-of-tree builds (John Newbery)
Tree-SHA512: 6946d23bc8a0b57e841a6811989182732d0534989e0e3b94421387f7971379b25a25d238cad22272e04076293275f6e980c8a713fce87ba48c1c4463d9243051
8 years ago
Wladimir J. van der Laan
d4732f3232
Merge #9733 : Add getchaintxstats RPC
...
bd1f138
Add getchaintxstats RPC (Pieter Wuille)
Tree-SHA512: 270785b25e7e2faad4528b5ef591d9dc6266f15236563e3f02dac1f2d9ce3732c4d44903fcccf38549f7921f29d1a93cb0a118b7453ccc5afd79739b51e68f46
8 years ago
Pieter Wuille
bd1f138e73
Add getchaintxstats RPC
8 years ago
Pieter Wuille
431a548faa
Merge #10297 : Simplify DisconnectBlock arguments/return value
...
db994b2
Simplify DisconnectBlock arguments/return value (Pieter Wuille)
Tree-SHA512: 62ce1a85bde2a5baffb9173ed28f2d8008200ecf8b09332122f1516fe68b33b9d7223cc1c2fffe804e38f767874c6353b76bd483e8ad7d48c4a5e80d6b683039
8 years ago
MarcoFalke
75171f099e
Merge #10137 : Remove unused import. Remove accidental trailing semicolons.
...
73b3721
Remove accidental trailing semicolons (practicalswift)
b8d9a86
Remove unused import (practicalswift)
Tree-SHA512: 36ac38952f8a10f36d2300519c583ef77703cff761be97470be97cfda2fec9d5b7ac604e454f174cc2601160e5cef3f227021ab5d3a6febc97fcb486d78754d3
8 years ago
MarcoFalke
3c5e6c94ca
Merge #10255 : [test] Add test for listaddressgroupings
...
dadfee3
[test] Add test for listaddressgroupings (Jimmy Song)
Tree-SHA512: 21cf0233c7fcf585f9a31306612ae1113ea916d2972b834efef0cb2154bd4dd24d9746d0632c778c699328f7e7a336d2da6e2bac9f0fb657c30290757563ad22
8 years ago
MarcoFalke
dc8fc0c73b
Merge #10198 : [tests] Remove is_network_split from functional test framework
...
c9cc76d
[tests] Remove is_network_split from funtional test cases (John Newbery)
Tree-SHA512: a43ec63a7dc20cbe9048f8d3af755aef55e9247f605d6481e6d665112882a749af7514f29c83ca9d761421b8e0f7282e5b9f8fc471985d222de826da7cc80ccf
8 years ago
John Newbery
c9cc76dcaa
[tests] Remove is_network_split from funtional test cases
8 years ago
Wladimir J. van der Laan
8f3e38477e
Merge #10169 : [tests] Remove func test code duplication
...
2a52ae6
Remove duplicate method definitions in NodeConnCB subclasses (John Newbery)
52e15aa
Adds helper functions to NodeConnCB (John Newbery)
Tree-SHA512: 2d7909eb85b3bde0fc3ebf133798eca21e561f4b2a2880937750820a42856cfb61fc94e30591c14ac13218bcfae0ebe7c5e8662a7b10f5b02470325c44a86cf1
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
practicalswift
3fe8a83969
Remove unused forward declaration for non-existent ScriptPubKeyToJSON(...)
8 years ago
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
8 years ago
Wladimir J. van der Laan
f4a6180607
Merge #10175 : Remove excess logic.
...
9a763d4
Remove excess logic. (practicalswift)
Tree-SHA512: cfef280cc9cccf5042c9c49a8cd6fb6700764671cdd0d988149121f56c2d43a9ac38c5fc99c92385a9619d2d846480e02a9d655fa2586b1c284961b4634c229b
8 years ago
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
8 years ago
BtcDrak
1ff2bb4e3e
Remove unused args from GetFetchhFlags()
8 years ago
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
8 years ago
Wladimir J. van der Laan
c26655ed3f
doc: Add RPC interface guidelines
8 years ago
Pieter Wuille
e4bbd3d230
Merge #10292 : Improved efficiency in COutPoint constructors
...
4fbae77
Improved efficiency in COutPoint constructors (Marcos Mayorga)
Tree-SHA512: 1e402d5021a47724b6159af90955f1a5932c383f48e3e704f1c9a52daa18d2dce5d8e1fcd02fae6977eab04ab83fa22872110b821d4c6593d940d9642abc9bcd
8 years ago
Pieter Wuille
c45da32047
Merge #10305 : Fix potential NPD introduced in b297426c
...
70d3945
Fix potential NPD introduced in b297426c
(Matt Corallo)
Tree-SHA512: 920d03d2081ba2f3447cfa655dcbc3e17858454dab051436f717ada977d4f4bfe999c303018bc8aa33f30e37a97c63d70ba08632f5e7b7a8aa555615dde2191a
8 years ago
Pieter Wuille
ab1f1d3246
Merge #10309 : Trivial: remove extra character from comment
...
3503716
Trivial: remove extra character from comment (CryptAxe)
Tree-SHA512: 66ee474945b4f9fd098cee0d031c1860c0777d4b05c609c0eaba32234209356b630766de30235b49d22cc5ea7cf2bb93410dea4466396369a0cdc0b631512a33
8 years ago
CryptAxe
3503716f1e
Trivial: remove extra character from comment
8 years ago
John Newbery
b8251f6337
[tests] allow zmq test to be run in out-of-tree builds
8 years ago
Jimmy Song
dadfee38e8
[test] Add test for listaddressgroupings
...
Test added as part of wallet-accounts.py.
Make file a little more flake8 compliant
8 years ago
Matt Corallo
70d39454ee
Fix potential NPD introduced in b297426c
...
See https://github.com/bitcoin/bitcoin/pull/10290#discussion_r113954232
for more info.
8 years ago
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
8 years ago
Gregory Sanders
7c588637d4
[Wallet] unset change position when there is no change on exact match
8 years ago
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
8 years ago
Wladimir J. van der Laan
9c33ffd387
Merge #8824 : Refactor TxToJSON() and ScriptPubKeyToJSON()
...
0ff9320
refactor TxToJSON() and ScriptPubKeyToJSON() (jonnynewbs)
Tree-SHA512: caf7d590829e221522edd5b1ab8ce67b53a2c6986d3bbe8477eab420b1007bf60f885ed0a25ba9587e468c00768360ddc31db37847e862858573eaed5ed8b0d6
8 years ago
Wladimir J. van der Laan
8d6d43e933
Merge #10290 : Add -stopatheight for benchmarking
...
b297426
Add -stopatheight for benchmarking (Pieter Wuille)
Tree-SHA512: e8a4cca7fc1accd0dcd3a0eda97839fc34c61f25d6302082a8d6ecf9a0291b4abacbde16a0ecba7bdd2a56dd0c8d4d54300ad3b3478386da21dd7697acce381c
8 years ago
Spencer Lievens
56f09df9d8
[Makefile] Alphabetically Reorder addrdb.cpp
...
To keep conformity.
8 years ago
MarcoFalke
80c3a73429
Merge #10256 : [test] Add test for gettxout to wallet.py
...
dd1ea59
[test] Add gettxout call (Jimmy Song)
Tree-SHA512: 5cea3763de30ec09b6e28b5a0c70f44d0c72a5b6ce159fdc95c1d43689ccfd21a32002d075c47cf011f66e505d9b97ea679c7c8825081a078543472e3e5083fb
8 years ago
Pieter Wuille
db994b2de9
Simplify DisconnectBlock arguments/return value
...
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.
8 years ago