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

13831 Commits

Author SHA1 Message Date
Wladimir J. van der Laan eb8263bdc9
Merge #10317: Remove unused Python imports 
0c60c63 Remove unused Python imports (practicalswift)

Tree-SHA512: c7ae6a8ae2c751b771804960498bf270ab022c80fa9e1b39118d5986d890c8cdfc27a3cc24bf28c080d8088ddc11facd1f2881ba2c209cdd819675fda4689d83
 2017-05-11 19:27:18 +02:00
Wladimir J. van der Laan 18c9debe60
Merge #10341: rpc/wallet: Workaround older UniValue which returns a 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-11 19:19:30 +02:00
Wladimir J. van der Laan 79aeff6e08
Merge #10328: Update contrib/debian to latest Ubuntu PPA upload. 
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-11 18:55:10 +02:00
Wladimir J. van der Laan 7f2b9e0868
Merge #10381: Shadowing warnings are not enabled by default, update doc accordingly 
f203ecc Shadowing is not enabled by default, update doc accordingly. (Pavel Janík)

Tree-SHA512: a7170827caa9d35457356808445ef2387fd2edde72fb76c6241cfd5decad218558b307d223e86bb66041576b638f90f6efa8a46ea6208d43da275a993617c997
 2017-05-11 07:18:18 +02:00
Pavel Janík f203ecc621 Shadowing is not enabled by default, update doc accordingly. 2017-05-10 19:48:24 +02:00
Wladimir J. van der Laan a26280bc14
Merge #10325: 0.15.0 Depends Updates 
355c116 [depends] dbus 1.10.18 (fanquake)
a8d7474 [depends] ccache 3.3.4 (fanquake)
daeb767 [depends] libevent 2.1.8-stable (fanquake)
d78269a [depends] Boost 1.64.0 (fanquake)
7d92c6f [depends] Latest config.guess and config.sub (fanquake)

Tree-SHA512: c63cdffabb1f57b7efd71c85f845c30ce00cda56f6d665f935674f3324563a7364f3bc30c105a1ee1064f1d24eb7345d7e44791cd471094dcc5e20f307fec4cb
 2017-05-10 17:16:35 +02:00
MarcoFalke 4b766fcdd4
Merge #10371: [tests] Clean up addrman_tests.cpp 
a80f295 [tests] Clean up addrman_tests.cpp (Jimmy Song)

Tree-SHA512: c745ebb0b8867e8abacfab62561a883ee5219176951e9ad4821fdc1e6152c9548663824ad624bfce1294760284fc6bd2a598749d66e62af55f39c59a1ea357ce
 2017-05-09 23:23:53 +02:00
MarcoFalke f6241b3e42
Merge #10361: qa: disablewallet: Check that wallet is really disabled 
fa7396d qa: disablewallet: Check that wallet is really disabled (MarcoFalke)

Tree-SHA512: 8c999ae0763fad389ba06f23cca3f589edaaf6dabd29ea8493413eee574ef2c1d49a69cb1158d8b28254cf922277a86b45747e50f44ebc9b0545297c3987289d
 2017-05-09 23:15:18 +02:00
MarcoFalke 7ee5236048
Merge #10365: [tests] increase timeouts in sendheaders test 
56befa0 [tests] increase timeouts in sendheaders test (John Newbery)
b0bfa23 [tests] Make wait_until timeout 60 seconds by default (John Newbery)

Tree-SHA512: ca68ad91a7cabb0673f230631a9f2196a4a394cf7cea7a266b3dad3923f7887d2a192ceedd68f7a4a06d105a7d13870e75e971193b93476f8d72b34639d7c3d1
 2017-05-09 23:03:51 +02:00
Jimmy Song a80f295666 [tests] Clean up addrman_tests.cpp 
Cleanup request from #10287.
Change "Test #:" comments to "Test:"
Change BOOST_CHECK(... = ...) to BOOST_CHECK_EQUAL(..., ...)
Remove three unnecessary if statements
 2017-05-09 13:59:49 -07:00
Pieter Wuille daf3e7def7
Merge #10338: Maintain state across GetStrongRandBytes calls 
97477c5 Maintain state across GetStrongRandBytes calls (Pieter Wuille)

Tree-SHA512: 77e9b1f3c6eeb0c2a3e0c64358150767222ff0b7120ccd5f4ae0276cea0e4fa275c1b757e3f20be07dc0b4ef07f70ab0b70112080c8d3d0cb6ed703db8a59168
 2017-05-09 10:24:45 -07:00
Pieter Wuille bc64b5aa0f
Merge #10322: Use hardware timestamps in RNG seeding 
2c0a6f1 Use sanity check timestamps as entropy (Pieter Wuille)
33f853d Test that GetPerformanceCounter() increments (Pieter Wuille)
f544094 Use hardware timestamps in RNG seeding (Pieter Wuille)

Tree-SHA512: ea96ff56d425b5dc693b4dd35c8aa64ba20a01b9bd7d2d65298ece623f434e8cfa190f9c0f9b76df8aa496547bfa64533eb751edec8401d09bd5ee3478928a59
 2017-05-09 10:12:41 -07:00
John Newbery 56befa03ac [tests] increase timeouts in sendheaders test 2017-05-09 09:06:26 -04:00
John Newbery b0bfa233a1 [tests] Make wait_until timeout 60 seconds by default 2017-05-09 08:55:13 -04:00
MarcoFalke 776ba233e9
Merge #10287: [tests] Update Unit Test for addrman.h/addrman.cpp 
ed36de5 [tests] Update Unit Test for addrman.h/addrman.cpp (Jimmy Song)

Tree-SHA512: e7c08c19e227c34c230900e14a176b2290022b78b0ece387452e673662491c11f26249cbf1711235276c07a964c339e27b4cda9a2730ded5c0e23a650e0d72db
 2017-05-09 12:59:01 +02:00
Wladimir J. van der Laan c973cc5a43
Merge #8855: Use a proper factory for creating chainparams 
c1082a7 Chainparams: Use the factory for pow tests (Jorge Timón)
2351a06 Chainparams: Get rid of CChainParams& Params(std::string) (Jorge Timón)
f87f362 Chainparams: Use a regular factory for creating chainparams (Jorge Timón)

Tree-SHA512: 359c8a2a1bc9d02db7856d02810240ada28048ac088f878b575597a7255cdb0ffdd1a647085ee67a34c6a7e7ed9e6cfdb61240cf6e75139619b640dbb096072c
 2017-05-09 10:31:45 +02:00
Wladimir J. van der Laan 08a7316c14
Merge #9279: Consensus: Move CFeeRate out of libconsensus 
381a46e Consensus: Policy: MOVEONLY: Move CFeeRate out of the consensus module (Jorge Timón)
330bb5a Consensus: Minimal way to move dust out of consensus (Jorge Timón)

Tree-SHA512: 19a2ea8169afd5a9d3f940d8974e34cfaead153e3ff3068ac82fccdb8694d19d9b45938904ec9e8cd095bd5ca3a0080364da29372f6aaf56b11a6c2ccd6c7a4d
 2017-05-09 09:19:50 +02:00
MarcoFalke fa7396d6d9 qa: disablewallet: Check that wallet is really disabled 2017-05-08 21:05:40 +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
Pieter Wuille 2c0a6f157d Use sanity check timestamps as entropy 2017-05-05 11:56:24 -07:00
Pieter Wuille 33f853d8d8 Test that GetPerformanceCounter() increments 2017-05-05 11:56:24 -07:00
Pieter Wuille f544094d5e Use hardware timestamps in RNG seeding 2017-05-05 11:56:19 -07:00
Matt Corallo 91700aa1df Re-enable upnp support in contrib/debian 2017-05-05 13:29:38 -04:00
Matt Corallo c5071e1f03 Build with QT5 on Debian-based systems using contrib/debian 2017-05-05 13:29:38 -04:00
John Newbery 965a124427 [tests] Fix abandonconflict.py intermittency 2017-05-05 13:01:27 -04:00
Luke Dashjr a637734ba2 rpc/wallet: Workaround older UniValue which returns a std::string temporary for get_str 2017-05-05 00:21:00 +00:00
Matt Corallo a8e928699a Bump minimum boost version in contrib/debian 2017-05-04 17:16:01 -04:00
Pieter Wuille 97477c537e Maintain state across GetStrongRandBytes calls 2017-05-04 10:13:40 -07: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
Jorge Timón c1082a7d35
Chainparams: Use the factory for pow tests 2017-05-03 18:18:09 +02:00
Jorge Timón 2351a064a6
Chainparams: Get rid of CChainParams& Params(std::string) 2017-05-03 18:15:54 +02:00
Jorge Timón f87f3626e3
Chainparams: Use a regular factory for creating chainparams 2017-05-03 18:15:47 +02:00
Jorge Timón 381a46e38f
Consensus: Policy: MOVEONLY: Move CFeeRate out of the consensus module 
...from amount.o to policy/feerate.o

Policy, because it moves policy code to the policy directory (common module)
 2017-05-03 18:00:13 +02:00
Jorge Timón 330bb5a456
Consensus: Minimal way to move dust out of consensus 2017-05-03 17:55:52 +02:00