zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,793 Commits 9 Branches 176 Tags 87 MiB
Commit Graph

13793 Commits

Author SHA1 Message Date
Spencer Lievens 012fa9b99d Add OSX keystroke to clear RPCConsole 
Currently only Ctrl-L is mentioned in help, but, (⌘)-L functions on OSX and isn't mentioned.
 2017-05-08 21:39:34 +02:00
MarcoFalke 6a796b2b53
Merge #10342: [tests] Improve mempool_persist test 
329ac3b [tests] use wait_until in mempool_persist.py (John Newbery)

Tree-SHA512: 3f5fe3dcdb5da3b10a41f7b88d29c15b79c02fbb037914b4342b77428f2afe8b342f6adacb28a9eb5549aa156cd146175389bd61909a20df3fecb88361c4779f
 2017-05-08 20:14:36 +02:00
John Newbery 329ac3bab1 [tests] use wait_until in mempool_persist.py 2017-05-08 14:00:40 -04:00
MarcoFalke 23d78c4dd0
Merge #10352: test: Add elapsed time to RPC tracing 
20187e4 test: Add elapsed time to RPC tracing (Wladimir J. van der Laan)

Tree-SHA512: f271acedd14020cf911711577f6dd940850fa84d2577618af06a2247c940fcc5b339a86c1c7a179899c556d217a6c967c785fb311bba43a9b6073cbe470b6737
 2017-05-08 19:32:34 +02:00
MarcoFalke f4b15e2de9
Merge #10310: [doc] Add hint about getmempoolentry to getrawmempool help. 
3a0a5bc [doc] Add hint about getmempoolentry to getrawmempool help. (Karl-Johan Alm)

Tree-SHA512: 8327d7d7ad93296525fbf95b7a824e3525bde84653999f125afd845823eb39e3a03cd39725962ed949aa2b9ad207ecad6d287294fa321ff1a4d7fbd5a4b8560b
 2017-05-08 19:28:58 +02:00
Pieter Wuille 3f57c55dba
Merge #10351: removed unused code in INV message 
c707ca8 removed unused code in INV message (Greg Griffith)

Tree-SHA512: 8152e9bfb7e1e8a321e7c05ea46826b3ecea6fa5e176727a9c944db170cb134ba1adfa0251bece9683a68d52266291bca58240929337aba6328b915931e60eb9
 2017-05-07 22:01:51 -07:00
MarcoFalke fff72de5bf
Merge #10171: [tests] Add node methods to test framework 
4550049 Reorganize BitcoinTestFramework class (John Newbery)
b7dd44c Add start and stop node methods to BitcoinTestFramework (John Newbery)
b111324 move initialize_chain() and initialize_chain_clean() to be methods of BitcoinTestFramework (John Newbery)

Tree-SHA512: 17e541aea8ca4c0d1189701499384e26239e2d5905de8adb0f042d3cf4c0bbed79fcaad61d563e1743bf4c62ad4915cebb4714783db839d9c53dfbbedcae6e9a
 2017-05-07 15:13:53 +02:00
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
 2017-05-07 10:01:51 +02:00
Wladimir J. van der Laan 20187e4ad0 test: Add elapsed time to RPC tracing 
Add elapsed time to output of `--tracerpc`. To find out why tests are
slow.
 2017-05-07 09:17:28 +02:00
Greg Griffith c707ca872d removed unused code in INV message 
vToFetch is never used after declaration. When checked if not empty,
evaluation is always false. Best case scenario this is optimized by the
compiler, worst case it wastes  cpu cycles.  It should be removed either
way.
 2017-05-07 00:42:04 -04:00
MarcoFalke 170bc2c381
Merge #10318: [tests] fix wait_for_inv() 
3e3c22f [tests] fix wait_for_inv() (John Newbery)

Tree-SHA512: b8070b8461e9c792cc3d9c17fd9d3faf87f550c7c0fc1788e0cd382f0794932b70cc87d480805a3b3c1ca2fdca9f8f1bcb9759300d777d9aaa8d41c016260d93
 2017-05-06 12:21:01 +02:00
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
 2017-05-06 12:07:27 +02:00
MarcoFalke e9274839bf
Merge #10344: [tests] Fix abandonconflict.py intermittency 
965a124 [tests] Fix abandonconflict.py intermittency (John Newbery)

Tree-SHA512: e0aeeaa2713fb842b92d8c474823b4ed4b7adb840c59141c99216f6611998339776afe0be17a53da9e85137fd53fd8d4985e11a65476765ee1c97df36e237142
 2017-05-06 12:00:12 +02:00
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.
 2017-05-06 05:25:18 -04:00
Karl-Johan Alm 3a0a5bc234
[doc] Add hint about getmempoolentry to getrawmempool help. 2017-05-06 12:51:01 +09:00
John Newbery 4550049903 Reorganize BitcoinTestFramework class 2017-05-05 18:05:42 -04:00
John Newbery 965a124427 [tests] Fix abandonconflict.py intermittency 2017-05-05 13:01:27 -04:00
Cory Fields 0f3471f3ad net: make CNode's id private 2017-05-04 01:04:47 -04:00
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-
 2017-05-04 01:04:47 -04:00
Cory Fields e50c33ea27 devtools: add script to verify scriptable changes 2017-05-04 01:04:47 -04:00
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
 2017-05-03 15:42:58 +02:00
John Newbery 981e586ab8 [tests] remove import-abort-rescan.py 
Reverts PR 10225
 2017-05-03 09:16:42 -04:00
John Newbery 3e3c22f09d [tests] fix wait_for_inv() 2017-05-03 09:08:29 -04:00
Wladimir J. van der Laan 22d870016e
Merge #10311: Remove unused args from GetFetchFlags() 
1ff2bb4 Remove unused args from GetFetchhFlags() (BtcDrak)

Tree-SHA512: 75ed1076651f4e255720425386cbce0677c2e38c789a94cda95f51a8e5ed9cb7213f21a974c65539f256da9b91ccbc2fcc16b164815b46cd499b733becbddc57
 2017-05-03 11:47:35 +02:00
Wladimir J. van der Laan 0912620888
Merge #10302: [Makefile] Alphabetically Reorder addrdb.cpp 
56f09df [Makefile] Alphabetically Reorder addrdb.cpp (Spencer Lievens)

Tree-SHA512: cedf64f5b4a6b20c07881f7e9c1c36421ee04a1ba17319946bae0197f9475dba6d5bda05f8f5d72539fbffcaa0adf8f474ecb2089106215c996576ab1235e8e1
 2017-05-03 11:40:29 +02:00
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
 2017-05-03 11:03:48 +02:00
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
 2017-05-03 09:11:45 +02:00
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
 2017-05-03 08:47:37 +02:00
Wladimir J. van der Laan d4732f3232
Merge #9733: Add getchaintxstats RPC 
bd1f138 Add getchaintxstats RPC (Pieter Wuille)

Tree-SHA512: 270785b25e7e2faad4528b5ef591d9dc6266f15236563e3f02dac1f2d9ce3732c4d44903fcccf38549f7921f29d1a93cb0a118b7453ccc5afd79739b51e68f46
 2017-05-03 08:14:56 +02:00
Pieter Wuille bd1f138e73 Add getchaintxstats RPC 2017-05-03 08:08:27 +02:00
Pieter Wuille 431a548faa
Merge #10297: Simplify DisconnectBlock arguments/return value 
db994b2 Simplify DisconnectBlock arguments/return value (Pieter Wuille)

Tree-SHA512: 62ce1a85bde2a5baffb9173ed28f2d8008200ecf8b09332122f1516fe68b33b9d7223cc1c2fffe804e38f767874c6353b76bd483e8ad7d48c4a5e80d6b683039
 2017-05-02 20:42:15 -07:00
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
 2017-05-02 20:51:16 +02:00
John Newbery b7dd44c528 Add start and stop node methods to BitcoinTestFramework 2017-05-02 14:20:13 -04:00
John Newbery b111324acd move initialize_chain() and initialize_chain_clean() to be methods of BitcoinTestFramework 2017-05-02 14:18:55 -04:00
MarcoFalke 3c5e6c94ca
Merge #10255: [test] Add test for listaddressgroupings 
dadfee3 [test] Add test for listaddressgroupings (Jimmy Song)

Tree-SHA512: 21cf0233c7fcf585f9a31306612ae1113ea916d2972b834efef0cb2154bd4dd24d9746d0632c778c699328f7e7a336d2da6e2bac9f0fb657c30290757563ad22
 2017-05-02 20:18:34 +02:00
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
 2017-05-02 20:03:03 +02:00
John Newbery c9cc76dcaa [tests] Remove is_network_split from funtional test cases 2017-05-02 13:31:54 -04:00
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
 2017-05-02 19:11:55 +02:00
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
BtcDrak 1ff2bb4e3e
Remove unused args from GetFetchhFlags() 2017-05-02 07:32:21 +00: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