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

11315 Commits

Author SHA1 Message Date
Alexey Vesnin ea51b0f5dd Berkeley DB v6 compatibility fix 
Fixes building error looking like this:
CXX wallet/libbitcoin_wallet_a-db.o
wallet/db.cpp: In member function ‘void CDBEnv::EnvShutdown()’:
wallet/db.cpp:46:16: error: call of overloaded ‘DbEnv(int)’ is ambiguous
DbEnv(0).remove(strPath.c_str(), 0);
^
wallet/db.cpp:46:16: note: candidates are:
In file included from wallet/db.h:21:0,
from wallet/db.cpp:6:
/usr/include/db_cxx.h:916:2: note: DbEnv::DbEnv(const DbEnv&)
DbEnv(const DbEnv &);
^
/usr/include/db_cxx.h:518:2: note: DbEnv::DbEnv(DB_ENV)
DbEnv(DB_ENV *dbenv);
^
/usr/include/db_cxx.h:516:2: note: DbEnv::DbEnv(u_int32_t)
DbEnv(u_int32_t flags);
^
Makefile:5780: recipe for target 'wallet/libbitcoin_wallet_a-db.o' failed
make[2]: ** [wallet/libbitcoin_wallet_a-db.o] Error 1

Github-Pull: #8626
Rebased-From: 323a5fe06a
 2016-09-21 02:43:47 +00:00
isle2983 0a35573534 [doc] - clarify statement about parallel jobs in rpc-tests.py 
Github-Pull: #8625
Rebased-From: 1467561024
 2016-09-21 02:43:47 +00:00
MarcoFalke 752fbae697 contrib: Make fix-copyright-headers.py more portable 
Github-Pull: #8607
Rebased-From: fafe7b3432
 2016-09-21 02:43:47 +00:00
MarcoFalke 486650ae6a [doc] Fix typos in comments, doxygen: Fix comment syntax 
Github-Pull: #8607
Rebased-From: fa27c0a2c4
 2016-09-21 02:43:47 +00:00
MarcoFalke c18a9ca788 [qa] pull-tester: Don't mute zmq ImportError 
Github-Pull: #8607
Rebased-From: fabfd5dae2
 2016-09-21 02:43:47 +00:00
Wladimir J. van der Laan 9556745dc2 init: Fix typo in help message for -whitelistforcerelay 
Reported by pryds on Transifex in the Danish translation.

Github-Pull: #8607
Rebased-From: 67a55025a1
 2016-09-21 02:43:47 +00:00
Jonas Schnelli 4f84082a74 Set jonasschnellis dns-seeder filter flag 
Github-Pull: #8573
Rebased-From: 40a95cfd8f
 2016-09-21 02:43:47 +00:00
MarcoFalke 863ae74a1f [doc] Update git-subtree-check.sh README 
Github-Pull: #8545
Rebased-From: fa3d974009
 2016-09-21 02:43:47 +00:00
Christian Barcenas c493f43621 Trivial: Fix two VarInt examples in serialize.h 
Github-Pull: #8560
Rebased-From: 7bd5ff4623
 2016-09-21 02:43:47 +00:00
crowning- cb07f19e90 CDB: fix debug output 
It doesn't really help to clear a variable before printing it to the debug log.

Github-Pull: #8539
Rebased-From: fab2e26d20
 2016-09-21 02:43:47 +00:00
Wladimir J. van der Laan 75d548475d Add copyright header to wallet_text_fixture.cpp 
I created the file but forgot to add this header.

Github-Pull: #8558
Rebased-From: 653bb3d640
 2016-09-21 02:43:47 +00:00
MarcoFalke 305d8ac90b Use __func__ to get function name for output printing 
Github-Pull: #8548
Rebased-From: fa785d1211
 2016-09-21 02:43:47 +00:00
Jonas Schnelli 464dedd6ab [Wallet] Trivial cleanup of HD wallet changes 
Github-Pull: #8443
Rebased-From: 7e5d94df1f
 2016-09-21 02:43:47 +00:00
Jameson Lopp b17a3f9e5a document return value of networkhashps for getmininginfo RPC endpoint 
Github-Pull: #8461
Rebased-From: 65f4532f13
 2016-09-21 02:43:47 +00:00
MarcoFalke a27cdd8edf [qa] abandonconflict: Use assert_equal 
Github-Pull: #8531
Rebased-From: fa64306520
 2016-09-21 02:43:47 +00:00
leijurv befe654f0f various typos 
Github-Pull: #8505
Rebased-From: 1aacfc2da5
 2016-09-21 02:43:47 +00:00
Jeremy Rubin 4e5fc31ae6 Fix a type error that would not compile on Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) 
Github-Pull: #8513
Rebased-From: 8194a6e525
 2016-09-21 02:43:47 +00:00
Sev 156e305dc1 Corrected JSON typo on setban of net.cpp 
Github-Pull: #8512
Rebased-From: 6ffd996b8e
 2016-09-21 02:43:47 +00:00
Luke Dashjr fa5b2498ca Bugfix: Allow building libbitcoinconsensus without any univalue 
Github-Pull: #8293
Rebased-From: 8a270b25fc
 2016-09-21 02:43:47 +00:00
Luke Dashjr 8b0bdd3923 configure: Allow building bench_bitcoin by itself 
Github-Pull: #8492
Rebased-From: 216d796ce0
 2016-09-21 02:43:47 +00:00
Justin Camarena 749c8a5655 [doc] typos, READMEs, comments 
Just a quick run through some docs and fixing some text errors.

Github-Pull: #8503
Rebased-From: e11f9a2f02
 2016-09-21 02:43:47 +00:00
Pieter Wuille fc349288cb Do diskspace check before import thread is started 
Github-Pull: #8392
Rebased-From: 9d4eb9ad99
 2016-09-21 02:43:47 +00:00
Pieter Wuille 3b354d213f Add extra message to avoid a long 'Loading banlist' 
Github-Pull: #8392
Rebased-From: aa59f2ed3f
 2016-09-21 02:43:47 +00:00
Pieter Wuille 30eac2d79a Use a signal to continue init after genesis activation 
Github-Pull: #8392
Rebased-From: 0fd2a33648
 2016-09-21 02:43:47 +00:00
Chris Stewart 9b0097976f Update README.md 
Updating documentation for adding new unit test files

Removing unneeded sentence from README

Removing uint160_tests.cpp as it DNE

Formatting command line instructions to use ``

fixing 80 char formatting issue in README

fixing more nits

Github-Pull: #8428
Rebased-From: b8db185952
 2016-09-21 02:43:47 +00:00
MarcoFalke 8bb1efd985 [qa] Rework hd wallet dump test 
Github-Pull: #8442
Rebased-From: fa4439d355
 2016-09-21 02:43:47 +00:00
Suhas Daftuar a7aa3ccc4f Enable size accounting in mining unit tests 
Github-Pull: #8419
Rebased-From: 8bfd70817b
 2016-09-21 02:43:47 +00:00
whythat bea02dc3b6 [qa]: enable rpcbind_test 
Github-Pull: #8400
Rebased-From: 9bbb414b80
 2016-09-21 02:43:47 +00:00
whythat e111904a76 [qa]: add parsing for '<host>:<port>' argument form to rpc_url() 
Github-Pull: #8400
Rebased-From: 0ff4375c93
 2016-09-21 02:43:47 +00:00
Wladimir J. van der Laan 69d1cd202d net: Ignore `notfound` P2P messages 
Github-Pull: #8427
Rebased-From: 5c9e49d12c
 2016-09-21 02:43:47 +00:00
Jonas Schnelli f70be14f8f [QA] Add walletdump RPC test (including HD- & encryption-tests) 
Github-Pull: #8417
Rebased-From: 54af51d98d
 2016-09-21 02:43:47 +00:00
Kaz Wesley 1f21d161a5 prepend license statement to indirectmap 
Add statement about MIT licensing to indirectmap.h. I forgot the license
preamble when I originally wrote the file.

Github-Pull: #8414
Rebased-From: d3af342276
 2016-09-21 02:43:47 +00:00
Jeremy Rubin 03b01966fa Fix obvious assignment/equality error in test 
Github-Pull: #8673
Rebased-From: 426e7bce0e
 2016-09-21 02:43:47 +00:00
Gaurav Rana 8a7d7ffe65 update name of file bitcoin.qrc 
Github-Pull: #8683
Rebased-From: df2d2e70ca
 2016-09-21 02:43:47 +00:00
Anthony Towns 147003c73e Add configure check for -latomic 
Github-Pull: #8563
Rebased-From: 878faacd7b
 2016-09-21 02:43:47 +00:00
Suhas Daftuar 091cdebfb8 Clear witness with vin/vout in CWallet::CreateTransaction() 
Github-Pull: #8664
Rebased-From: c40b034327
 2016-09-21 02:43:47 +00:00
Jonas Schnelli 8e03382279 [Qt][CoinControl] fix UI bug that could result in paying unexpected fee 
Github-Pull: #8678
Rebased-From: 04802930d4
 2016-09-21 02:43:47 +00:00
Johnson Lau 6b07362b37 Fix SIGHASH_SINGLE bug in test_framework SignatureHash 
The value for "other" inputs should be -1 (0xffffffffffffffff) instead of 0

Github-Pull: #8667
Rebased-From: 2f2548d5e0
 2016-09-21 02:43:47 +00:00
instagibbs a114a0208b p2psegwit.py transaction is rejected due to premature witness not size 
Github-Pull: #8528
Rebased-From: 5547aeb015
 2016-09-21 02:43:47 +00:00
instagibbs 3606b6b3a7 Update p2p-segwit.py to reflect correct AskFor behavior 
Github-Pull: #8528
Rebased-From: bc1d1f2660
 2016-09-21 02:43:47 +00:00
BtcDrak 733760a700 Update btcdrak signing key 
Github-Pull: #8662
Rebased-From: 46606af200
 2016-09-21 02:43:47 +00:00
instagibbs c6a629100b add witness address to address book 
Github-Pull: #8693
Rebased-From: 62ffbbdec3
 2016-09-21 02:43:47 +00:00
Wladimir J. van der Laan 8d9e8adc05
Merge #8744: [0.13.1] qa Backports 
d6ebe13 [qa] Refactor RPCTestHandler to prevent TimeoutExpired (MarcoFalke)
ae8c7df [qa] create_cache: Delete temp dir when done (MarcoFalke)
63462c2 [qa] remove root test directory for RPC tests (whythat)
 2016-09-20 12:49:33 +02:00
MarcoFalke d6ebe1369f [qa] Refactor RPCTestHandler to prevent TimeoutExpired 
Github-Pull: #8750
Rebased-From: dddd04f979
 2016-09-19 17:11:18 +02:00
MarcoFalke ae8c7df7a5 [qa] create_cache: Delete temp dir when done 
Github-Pull: #8713
Rebased-From: fa27d990ee
 2016-09-16 11:29:35 +02:00
whythat 63462c2b4b [qa] remove root test directory for RPC tests 
Github-Pull: #8652
Rebased-From: 438e94dc33 c62cc4ec75
 2016-09-16 11:28:48 +02:00
Wladimir J. van der Laan 4731623777
Merge #8710: [0.13.1] qt Backports 
a37cec5 Persist the datadir after option reset (Andrew Chow)
d9f0d4e Fix minimize and close bugs (adlawren)
41fd852 fix op order to append first alert (rodasmith)
 2016-09-13 17:23:17 +02:00
Andrew Chow a37cec537b Persist the datadir after option reset 
Github-Pull: #8487
Rebased-From: 15df3c196b 57acb82e70
 2016-09-13 11:39:08 +02:00
adlawren d9f0d4e073 Fix minimize and close bugs 
refs #8225

To ensure the GUI closes when the "Minimize on close" window option is disabled, and the "Minimize to the tray instead of the taskbar" window option is enbaled, remove a check made against the "Minimize to the tray instead of the taskbar" value, made during GUI closure.

To ensure the GUI minimizes to the taskbar when the "Minimize on close" window option is enabled, and the "Minimize to the tray instead of the taskbar" window option is disabled, minimize the GUI and ignore the closure event.

Github-Pull: #8481
Rebased-From: 05242e937d
 2016-09-13 11:36:55 +02:00
rodasmith 41fd852d3f fix op order to append first alert 
Github-Pull: #8697
Rebased-From: 1d635ae61b
 2016-09-13 11:35:52 +02:00