Wladimir J. van der Laan
7b784cc2bb
Merge #8852 : Mention Gitian building script in doc (Laudaa)
...
203e2dd
Mention Gitian building script in doc. (Lauda)
2016-09-30 20:50:44 +02:00
Lauda
203e2ddad8
Mention Gitian building script in doc.
2016-09-30 20:32:10 +02:00
MarcoFalke
e757115164
Merge commit '2ca7faab4205822b06dc2ab2bbda0a9a70fce7e0' into HEAD
2016-09-30 19:58:11 +02:00
MarcoFalke
2ca7faab42
Squashed 'src/univalue/' changes from daf1285..16a1f7f
...
16a1f7f Merge #3 : Pull upstream
3f03bfd Merge pull request #27 from laanwj/2016_09_const_refs
5668ca3 Return const references from getKeys, getValues, get_str
cedda14 Merge pull request #28 from MarcoFalke/patch-1
9f0b997 [travis] Work around osx libtool issue
git-subtree-dir: src/univalue
git-subtree-split: 16a1f7f6e9ed932bec7c7855003affea1e165fb5
2016-09-30 19:58:11 +02:00
Wladimir J. van der Laan
940748b4b0
Merge #8851 : [wallet] Move key derivation logic from GenerateNewKey to DeriveNewChildKey (pstratem)
...
e198c52
Move key derivation logic from GenerateNewKey to DeriveNewChildKey (Patrick Strateman)
2016-09-30 19:56:03 +02:00
Patrick Strateman
e198c521d3
Move key derivation logic from GenerateNewKey to DeriveNewChildKey
2016-09-30 19:11:00 +02:00
Wladimir J. van der Laan
fb24d7eeb4
Merge #8813 : bitcoind: Daemonize using daemon(3)
...
a92bf4a
bitcoind: Daemonize using daemon(3) (Matthew King)
2016-09-30 18:19:31 +02:00
Wladimir J. van der Laan
47314e6daa
prevector: add C++11-like data() method
...
This returns a pointer to the beginning of the vector's data.
2016-09-30 17:19:51 +02:00
Wladimir J. van der Laan
9bc6a6bd7b
Merge #8822 : net: Consistent checksum handling
...
305087b
net: Hardcode protocol sizes and use fixed-size types (Wladimir J. van der Laan)
41e58fa
net: Consistent checksum handling (Wladimir J. van der Laan)
2016-09-30 17:10:58 +02:00
Johnson Lau
2fa0063c26
Add NULLDUMMY verify flag in bitcoinconsensus.h
2016-09-30 23:09:19 +08:00
Wladimir J. van der Laan
ef0801bd13
Merge #8830 : [test] Add option to run bitcoin-util-test.py manually
...
b82f493
Add option to run bitcoin-util-test.py manually (jnewbery)
2016-09-30 17:03:21 +02:00
Wladimir J. van der Laan
90adfabd5d
Merge #8836 : bitcoin-util-test.py should fail if the output file is empty
...
da94697
bitcoin-util-test.py should fail if the output file is empty (jnewbery)
2016-09-30 12:36:02 +02:00
Wladimir J. van der Laan
0572acd63b
Merge #8839 : test: Avoid ConnectionResetErrors during RPC tests
...
1d28faf
test: Avoid ConnectionResetErrors during RPC tests (Wladimir J. van der Laan)
2016-09-30 12:35:21 +02:00
Wladimir J. van der Laan
929860106f
Merge #8840 : test: Explicitly set encoding to utf8 when opening text files
...
30930e8
test: Explicitly set encoding to utf8 when opening text files (Wladimir J. van der Laan)
2016-09-30 12:34:40 +02:00
Wladimir J. van der Laan
83998b52d0
Merge #8841 : [qa] fix nulldummy test
...
46a4774
Fix nulldummy.py test (Johnson Lau)
2016-09-30 12:34:19 +02:00
Johnson Lau
46a4774d2b
Fix nulldummy.py test
2016-09-30 02:48:09 +08:00
Wladimir J. van der Laan
30930e847e
test: Explicitly set encoding to utf8 when opening text files
...
These are text files but their encoding does not depend on the locale.
Not all of them require utf8 but it is better to fix it at something
to remove potential unpredictability.
This is necessary on FreeBSD where no locale is set by default,
and apparently Python defaults not only the terminal encoding to the locale
but that of every text file. So without LOCALE environment it defaults text
file encoding to ASCII. This causes problems with e.g. `bitcoin.conf`.
Luckily the locale doesn't affect the default encoding for str.encode() and
bytes.decode() on Python 3, so this is the only change necessary.
2016-09-29 17:50:05 +02:00
Wladimir J. van der Laan
f560d9564f
Merge #8826 : Do not include env_win.cc on non-Windows systems
...
7e5fd71
Do not include env_win.cc on non-Windows systems (Pavel Janík)
2016-09-29 17:27:28 +02:00
Wladimir J. van der Laan
c9d7b0de2f
Merge #8834 : [qa] blockstore: Switch to dumb dbm
...
fa9cd25
[qa] blockstore: Switch to dumb dbm (MarcoFalke)
2016-09-29 17:23:27 +02:00
Wladimir J. van der Laan
c84181665f
Merge #8819 : [depends] Boost 1.61.0
...
16f8823
[depends] Boost 1.61.0 (fanquake)
2016-09-29 17:08:10 +02:00
Wladimir J. van der Laan
1d28faf9e9
test: Avoid ConnectionResetErrors during RPC tests
...
This is necessary on FreeBSD and MacOSX, at least.
See https://github.com/bitcoin/bitcoin/pull/8834#issuecomment-250450213
2016-09-29 15:02:08 +00:00
Wladimir J. van der Laan
2dd57e4f9f
Merge #8835 : [qa] nulldummy.py: Don't run unused code
...
fa156c6
[qa] nulldummy: Don't run unused code (MarcoFalke)
2016-09-29 16:45:54 +02:00
jnewbery
da94697708
bitcoin-util-test.py should fail if the output file is empty
2016-09-29 10:16:56 -04:00
MarcoFalke
fa156c604e
[qa] nulldummy: Don't run unused code
2016-09-29 15:32:16 +02:00
Wladimir J. van der Laan
9b94cca41f
Merge #8658 : Remove unused statements in serialization
...
64d9507
[WIP] Remove unused statement in serialization (Pavel Janík)
2016-09-29 15:00:22 +02:00
jnewbery
b82f493938
Add option to run bitcoin-util-test.py manually
2016-09-29 08:54:56 -04:00
MarcoFalke
fa85e860a9
[qt] sync-overlay: Don't show estimated number of headers left
2016-09-29 13:24:29 +02:00
MarcoFalke
cc9e8aca5f
Merge #8827 : [qa] Split up slow RPC calls to avoid pruning test timeouts
...
a0f8482
[qa] Split up slow RPC calls to avoid pruning test timeouts (Suhas Daftuar)
2016-09-29 13:09:38 +02:00
MarcoFalke
fa9cd25ed0
[qa] blockstore: Switch to dumb dbm
2016-09-29 11:18:31 +02:00
MarcoFalke
8ca69a2a88
Merge #8829 : Add bitcoin-tx JSON tests
...
54e5d7c
Add bitcoin-tx JSON tests (jnewbery)
2016-09-29 10:50:05 +02:00
Wladimir J. van der Laan
489a6ab507
Merge #8730 : depends: Add libevent compatibility patch for windows
...
64047f8
depends: Add libevent compatibility patch for windows (Wladimir J. van der Laan)
2016-09-29 09:19:27 +02:00
Wladimir J. van der Laan
7d563cc16d
Merge #8832 : [rpc] throw JSONRPCError when utxo set can not be read
...
fa05cfd
[rpc] throw JSONRPCError when utxo set can not be read (MarcoFalke)
2016-09-29 08:12:55 +02:00
Wladimir J. van der Laan
d675984fdf
Merge #8784 : Copyright headers for build scripts
...
0c4e6ce
Add MIT license to build-aux/m4 scripts (Luke Dashjr)
3f8a5d8
Trivial: build-aux/m4/l_atomic: Fix typo (Luke Dashjr)
3b4b6dc
Add MIT license to autogen.sh and share/genbuild.sh (Luke Dashjr)
f4dffdd
Add MIT license to Makefiles (Luke Dashjr)
2016-09-29 07:58:08 +02:00
MarcoFalke
fa05cfdf25
[rpc] throw JSONRPCError when utxo set can not be read
2016-09-28 21:00:58 +02:00
jnewbery
54e5d7c1b8
Add bitcoin-tx JSON tests
2016-09-28 13:38:42 -04:00
Suhas Daftuar
a0f8482f3e
[qa] Split up slow RPC calls to avoid pruning test timeouts
2016-09-28 11:08:08 -04:00
Wladimir J. van der Laan
dc641415e7
Merge #8820 : [depends] Fix Qt compilation with Xcode 8
...
5776e8a
[depends] Fix Qt compilation with Xcode 8 (fanquake)
2016-09-28 16:42:21 +02:00
Pavel Janík
7e5fd7198e
Do not include env_win.cc on non-Windows systems
2016-09-28 16:40:20 +02:00
Wladimir J. van der Laan
7b05af634b
Merge #8823 : doc: Add privacy recommendation when running hidden service
...
ac01ff2
doc: Add privacy recommendation when running hidden service (Wladimir J. van der Laan)
2016-09-28 16:06:08 +02:00
Wladimir J. van der Laan
305087bdf6
net: Hardcode protocol sizes and use fixed-size types
...
The P2P network uses a fixed protocol, these sizes shouldn't change
based on what happens to be the architecture.
2016-09-28 15:33:45 +02:00
Wladimir J. van der Laan
41e58faf04
net: Consistent checksum handling
...
In principle, the checksums of P2P packets are simply 4-byte blobs which
are the first four bytes of SHA256(SHA256(payload)).
Currently they are handled as little-endian 32-bit integers half of the
time, as blobs the other half, sometimes copying the one to the other,
resulting in somewhat confused code.
This PR changes the handling to be consistent both at packet creation
and receiving, making it (I think) easier to understand.
2016-09-28 12:44:13 +02:00
Wladimir J. van der Laan
14b7b3fb9f
Merge #8814 : [wallet, policy] ParameterInteraction: Don't allow 0 fee
...
fa4bfb4
[wallet, policy] ParameterInteraction: Don't allow 0 fee (MarcoFalke)
2016-09-28 08:09:42 +02:00
Wladimir J. van der Laan
fc4f4547b7
Merge #8634 : Add policy: null signature for failed CHECK(MULTI)SIG
...
e41bd44
Add policy: null signature for failed CHECK(MULTI)SIG (Johnson Lau)
2016-09-27 17:54:05 +02:00
Johnson Lau
e41bd449ab
Add policy: null signature for failed CHECK(MULTI)SIG
2016-09-27 23:40:59 +08:00
Wladimir J. van der Laan
5a4f6d72e6
Merge #8526 : Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH
...
c72c5b1
Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH (Johnson Lau)
2016-09-27 17:10:15 +02:00
Wladimir J. van der Laan
e9d5f6fec8
Merge #8357 : [mempool] Fix relaypriority calculation error
...
94a34a5
Fix relaypriority calculation error (maiiz)
2016-09-27 16:33:32 +02:00
Wladimir J. van der Laan
14e8f9916b
Merge #8810 : tests: Add exception error message for JSONRPCException
...
42f6aed
tests: Add exception error message for JSONRPCException (Wladimir J. van der Laan)
2016-09-27 15:20:30 +02:00
Wladimir J. van der Laan
ac01ff22be
doc: Add privacy recommendation when running hidden service
2016-09-27 15:04:40 +02:00
Wladimir J. van der Laan
920ca1f0bf
Merge #8655 : Do not shadow variables (trivials)
...
4731cab
Do not shadow variables (Pavel Janík)
2016-09-27 13:25:54 +02:00
Wladimir J. van der Laan
6e54c85439
Merge #8803 : Ping regularly in p2p-segwit.py to keep connection alive
...
0637b02
Ping regularly in p2p-segwit.py to keep connection alive (Johnson Lau)
2016-09-27 13:22:02 +02:00