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

11682 Commits

Author SHA1 Message Date
Wladimir J. van der Laan 42f6aed731 tests: Add exception error message for JSONRPCException 
This improves error reporting if `JSONRPCException` is not specifically caught
and ends up in Python's default backtrace handler.

Before:
```
Traceback (most recent call last):
  File "/.../projects/bitcoin/bitcoin/qa/rpc-tests/test_framework/authproxy.py", line 153, in __call__
    raise JSONRPCException(response['error'])
test_framework.authproxy.JSONRPCException
```

After:
```
Traceback (most recent call last):
  File "/.../projects/bitcoin/bitcoin/qa/rpc-tests/test_framework/authproxy.py", line 152, in __call__
    raise JSONRPCException(response['error'])
test_framework.authproxy.JSONRPCException: Unknown named parameter random (-8)
```
 2016-09-25 20:05:03 +02:00
Wladimir J. van der Laan 37871f216e
Merge #8807: [univalue] Pull subtree from upstream 
3650668 Squashed 'src/univalue/' changes from f32df99..daf1285 (MarcoFalke)
 2016-09-25 16:21:43 +02:00
MarcoFalke 9bf41af708 Merge commit '3650668cdbbf369dd8f30c8e8eb5bb883325942d' into HEAD 2016-09-25 15:19:23 +02:00
MarcoFalke 3650668cdb Squashed 'src/univalue/' changes from f32df99..daf1285 
daf1285 Merge pull request #2 from jgarzik/master
d9e62d3 Merge pull request #24 from MarcoFalke/Mf1608-cleanup
faf260f Rem unused vars and prefer prefix operator for non-primitive type
09a2693 Merge pull request #22 from laanwj/2016_04_unicode
c74a04c Merge pull request #23 from paveljanik/20160527_Wshadow
fceb4f8 Do not shadow variables

git-subtree-dir: src/univalue
git-subtree-split: daf1285af60c2c73801c0f41469c9802c849343d
 2016-09-25 15:19:23 +02:00
Wladimir J. van der Laan bae178f3ca
Merge #8743: Remove old manpages from contrib/debian in favour of doc/man 
b194872 Remove old manpages from contrib/debian (fanquake)
 2016-09-25 13:35:24 +02:00
fanquake b1948723c9 Remove old manpages from contrib/debian 2016-09-25 13:33:57 +02:00
Wladimir J. van der Laan b694b0d5a5
Merge #8791: [travis] cross-mac: explicitly enable gui 
fa16991 [travis] cross-mac: explicitly enable gui (MarcoFalke)
 2016-09-25 13:16:55 +02:00
Wladimir J. van der Laan b8d10fd4ef
Merge #8802: Fix future copyright year 
edeaf24 Fix future copyright year (Mitchell Cash)
 2016-09-25 13:12:01 +02:00
Wladimir J. van der Laan bc9e3ab29f
Merge #8771: CONTRIBUTING: Mention not to open several pulls 
faa91bc CONTRIBUTING: Mention not to open several pulls (MarcoFalke)
 2016-09-25 13:10:11 +02:00
Wladimir J. van der Laan 279bbadc8b
Merge #8787: [Doc] Add missing autogen to example builds 
3f58a28 [Doc] Add missing autogen to example builds (Amir Abrams)
 2016-09-25 11:51:26 +02:00
Wladimir J. van der Laan 9da7366be1
Merge #8786: Mandatory copyright agreement 
4b67402 Mandatory copyright agreement (Andrew Chow)
 2016-09-25 09:22:40 +02:00
MarcoFalke 08cc5fd666
Merge #8790: [test] Remove redundant debug print in addrman_tests 
3333bd2 [test] Remove redundant print in addrman_tests (MarcoFalke)
 2016-09-24 15:38:38 +02:00
MarcoFalke e31a43c725
Merge #8789: [qa] pull-tester: Only print output when failed 
fa427ce [qa] pull-tester: Only print output when failed (MarcoFalke)
 2016-09-24 15:35:35 +02:00
Mitchell Cash edeaf24e4c Fix future copyright year 2016-09-24 13:46:08 +10:00
Jonas Schnelli 24f72e9f3f
Merge #8371: [Qt] Add out-of-sync modal info layer 
08827df [Qt] modalinfolayer: removed unused comments, renamed signal, code style overhaul (Jonas Schnelli)
d8b062e [Qt] only update "amount of blocks left" when the header chain is in-sync (Jonas Schnelli)
e3245b4 [Qt] add out-of-sync modal info layer (Jonas Schnelli)
e47052f [Qt] ClientModel add method to get the height of the header chain (Jonas Schnelli)
a001f18 [Qt] Always pass the numBlocksChanged signal for headers tip changed (Jonas Schnelli)
bd44a04 [Qt] make Out-Of-Sync warning icon clickable (Jonas Schnelli)
0904c3c [Refactor] refactor function that forms human readable text out of a timeoffset (Jonas Schnelli)
 2016-09-23 18:22:48 +02:00
Jonas Schnelli 08827df3ec
[Qt] modalinfolayer: removed unused comments, renamed signal, code style overhaul 2016-09-23 16:07:21 +02:00
Wladimir J. van der Laan d2e46558ba
Merge #8661: Do not set an addr time penalty when a peer advertises itself. 
6d0ced1 Do not set an addr time penalty when a peer advertises itself. (Gregory Maxwell)
 2016-09-23 13:56:01 +02:00
Wladimir J. van der Laan 5d0219d983
Merge #8793: Do not shadow in src/qt 
f839350 Do not shadow in src/qt (Pavel Janík)
 2016-09-23 12:44:35 +02:00
Pavel Janík f839350420 Do not shadow in src/qt 2016-09-23 12:42:00 +02:00
Amir Abrams 3f58a283ee [Doc] Add missing autogen to example builds 2016-09-22 22:35:13 -05:00
MarcoFalke faa91bc335 CONTRIBUTING: Mention not to open several pulls 2016-09-23 00:42:35 +02:00
Wladimir J. van der Laan 2b514aa2ea
Merge #8785: Comment on CNode::nLocalServices meaning 
b5ccded Comment on CConnman::nLocalServices meaning (instagibbs)
 2016-09-22 16:41:02 +02:00
Andrew Chow 4b6740204d Mandatory copyright agreement 
All contributions to the repository will agree to use the MIT license
 2016-09-22 08:28:14 -04:00
instagibbs b5ccded57f Comment on CConnman::nLocalServices meaning 2016-09-22 08:19:44 -04:00
MarcoFalke fa16991e7b [travis] cross-mac: explicitly enable gui 2016-09-22 13:00:56 +02:00
MarcoFalke 3333bd2d15 [test] Remove redundant print in addrman_tests 2016-09-22 12:50:39 +02:00
MarcoFalke fa427cef13 [qa] pull-tester: Only print output when failed 2016-09-22 12:39:39 +02:00
Wladimir J. van der Laan 26b370a937
Merge #8636: Implement NULLDUMMY softfork (BIP147) 
482f852 Implement NULLDUMMY softfork (Johnson Lau)
 2016-09-22 10:58:00 +02:00
Wladimir J. van der Laan 7008e28136
Merge #8779: [contrib] Delete spendfrom 
fa81d09 [contrib] Delete spendfrom (MarcoFalke)
 2016-09-22 07:56:31 +02:00
Wladimir J. van der Laan 3166dff48f
Merge #8423: [depends] expat 2.2.0, ccache 3.3.1, fontconfig 2.12.1 
86d410d [depends] fontconfig 2.12.1 (fanquake)
9616ac8 [depends] ccache 3.3.1 (fanquake)
6b6cbdd [depends] expat 2.2.0 (fanquake)
 2016-09-22 07:54:43 +02:00
Wladimir J. van der Laan 64dc645745
Merge #8783: [share] remove qt/protobuf.pri 
fa13c5c [share] remove qt/protobuf.pri (MarcoFalke)
 2016-09-22 07:44:49 +02:00
Wladimir J. van der Laan ca69ef4880
Merge #8781: [contrib] delete qt_translations.py 
faf87af [contrib] delete qt_translations.py (MarcoFalke)
 2016-09-22 07:44:10 +02:00
MarcoFalke fa13c5ce4f [share] remove qt/protobuf.pri 
follow up of 35b8af9226 (#2943)
 2016-09-22 00:43:41 +02:00
MarcoFalke faf87aff16 [contrib] delete qt_translations.py 
follow-up of 1a97b22 #4185
 2016-09-21 21:45:11 +02:00
MarcoFalke fa81d09e8d [contrib] Delete spendfrom 2016-09-21 19:57:20 +02:00
Wladimir J. van der Laan cf5ebaa921
Merge #8656: Trivial: Do not shadow global variable fileout 
7c069a7 Do not shadow global variable (Pavel Janík)
 2016-09-21 14:13:44 +02:00
Wladimir J. van der Laan fec6af7440
Merge #8777: [qt] WalletModel: Expose disablewallet 
6666ca6 [qt] WalletModel: Expose disablewallet (MarcoFalke)
 2016-09-21 13:45:20 +02:00
MarcoFalke 6666ca6379 [qt] WalletModel: Expose disablewallet 2016-09-21 13:11:15 +02:00
MarcoFalke 52b5a8785d
Merge #8773: Trivial Bugfix: doc/gitian-building.md: Link to release-process needs to be updated 
6f933c6 Trivial Bugfix: doc/gitian-building.md: Link to release-process needs to be updated (Luke Dashjr)
 2016-09-21 12:31:09 +02:00
Wladimir J. van der Laan 886e8c9b72
Merge #8768: init: Get rid of fDisableWallet 
fa58edb [wallet] Introduce DEFAULT_DISABLE_WALLET (MarcoFalke)
fab9107 init: Get rid of fDisableWallet (MarcoFalke)
 2016-09-21 12:27:56 +02:00
MarcoFalke fa58edbffe [wallet] Introduce DEFAULT_DISABLE_WALLET 2016-09-21 12:06:58 +02:00
Luke Dashjr 6f933c6bb6 Trivial Bugfix: doc/gitian-building.md: Link to release-process needs to be updated 
Section was renamed in c907f4d56b
 2016-09-21 09:48:12 +00:00
Wladimir J. van der Laan 84c9a04855
Merge #8769: Trivial: Fix ISO URL, capitalization 
04d91f4 Trivial: Fix ISO URL, capitalization (unsystemizer)
 2016-09-21 11:32:22 +02:00
unsystemizer 04d91f4a8c Trivial: Fix ISO URL, capitalization 
- Changed Debian 8.5.0 ISO CD ROM URL by redirecting from current (which now has only 8.6.0) to a persistent archive link which should not change anytime soon.
- Added a link to official Debian checksum verification procedure (which is more verbose and also acts as a backup source of SHA256sum's)
- Fix capitalization (iso)
 2016-09-21 11:25:32 +02:00
Wladimir J. van der Laan b4f53641a9
Merge #8765: [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds 
c6f5ca8 [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds (Jonas Schnelli)
 2016-09-21 08:15:33 +02:00
MarcoFalke fab91070d3 init: Get rid of fDisableWallet 2016-09-20 17:32:05 +02:00
Wladimir J. van der Laan 1c24d5f637
Merge #8739: [qa] Fix broken sendcmpct test in p2p-compactblocks.py 
157254a Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
 2016-09-20 16:22:21 +02:00
Jonas Schnelli c6f5ca822f
[Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds 2016-09-20 16:18:24 +02:00
Wladimir J. van der Laan aff6927806
Merge #8762: Trivial: Fix typo 
12a721b Trivial: Fix typo (Marty Jones)
 2016-09-20 15:44:58 +02:00
Jonas Schnelli 6052d50910
Merge #8672: Qt: Show transaction size in transaction details window 
c015634 qt: Adding transaction size to transaction details window (Hampus Sjöberg)
 \-- merge fix for s/size/total size/
fdf82fb Adding method GetTotalSize() to CTransaction (Hampus Sjöberg)
 2016-09-20 15:34:33 +02:00