Wladimir J. van der Laan
a7e5cbb209
Merge #8856 : Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
...
3450c18
Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs (Jorge Timón)
2016-10-03 15:25:09 +02:00
Wladimir J. van der Laan
eafc5f4fae
Merge #8863 : univalue: Pull subtree
...
2ca7faa
Squashed 'src/univalue/' changes from daf1285..16a1f7f (MarcoFalke)
2016-10-03 08:45:13 +02:00
Wladimir J. van der Laan
f00705ae7f
serialize: Deprecate begin_ptr
/ end_ptr
...
Implement `begin_ptr` and `end_ptr` in terms of C++11 code,
and add a comment that they are deprecated.
Follow-up to developer notes update in 654a211622
.
2016-10-02 09:50:25 +02:00
Cory Fields
905bc68d05
net: fix a few cases where messages were sent rather than dropped upon disconnection
...
75ead758 turned these into crashes in the event of a handshake failure, most
notably when a peer does not offer the expected services.
There are likely other cases that these assertions will find as well.
2016-10-01 19:13:10 -04:00
Wladimir J. van der Laan
1c80386bce
rpc: Generate auth cookie in hex instead of base64
...
Base64 contains '/', and the '/' character in credentials is problematic
for AuthServiceProxy which represents the RPC endpoint as an URI with
user and password embedded.
Closes #8399 .
2016-10-01 16:57:25 +02:00
Jorge Timón
3450c18a12
Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
2016-10-01 08:12:19 +02:00
MarcoFalke
e757115164
Merge commit '2ca7faab4205822b06dc2ab2bbda0a9a70fce7e0' into HEAD
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
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
jnewbery
da94697708
bitcoin-util-test.py should fail if the output file is empty
2016-09-29 10:16:56 -04: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
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
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
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
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
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
Pavel Janík
4731cab8fb
Do not shadow variables
2016-09-27 09:25:15 +02:00
MarcoFalke
faa4de2a2a
[qt] sync-overlay: Don't block during reindex
2016-09-26 22:29:45 +02:00
MarcoFalke
2f71490d21
Merge #8805 : Trivial: Grammar and capitalization
...
c9ce17b
Trivial: Grammar and capitalization (Derek Miller)
2016-09-26 22:27:45 +02:00
Wladimir J. van der Laan
8f1fbf36a7
Merge #8796 : [trivial] fix mempool comment (outdated by BIP125)
...
c14ffd5
[trivial] fix mempool comment (outdated by BIP125) (jonnynewbs)
2016-09-26 15:11:02 +02:00
Wladimir J. van der Laan
dd20ed1223
Merge #8780 : [rpc] Deprecate getinfo
...
fa6e71b
[qa] Add getinfo smoke tests and rework versionbits test (MarcoFalke)
ddddaaf
[rpc] Deprecate getinfo (MarcoFalke)
2016-09-26 15:03:06 +02:00
Wladimir J. van der Laan
bb843adc8d
Merge #8722 : bitcoin-cli: More detailed error reporting
...
381826d
bitcoin-cli: More detailed error reporting (Wladimir J. van der Laan)
2016-09-26 14:53:38 +02:00
jonnynewbs
c14ffd524b
[trivial] fix mempool comment (outdated by BIP125)
2016-09-26 08:52:52 -04:00
MarcoFalke
fa4bfb4819
[wallet, policy] ParameterInteraction: Don't allow 0 fee
2016-09-26 14:44:24 +02:00
Wladimir J. van der Laan
ab0b411868
Merge #8486 : [wallet] Add high transaction fee warnings
...
faef293
[wallet] Add high transaction fee warnings (MarcoFalke)
2016-09-26 13:57:10 +02:00
Matthew King
a92bf4af66
bitcoind: Daemonize using daemon(3)
...
Simplified version of #8278 . Assumes that every OS that (a) is supported
by Bitcoin Core (b) supports daemonization has the `daemon()` function
in its C library.
- Removes the fallback path for operating systems that support
daemonization but not `daemon()`. This prevents never-exercised code from
ending up in the repository (see discussion here:
https://github.com/bitcoin/bitcoin/pull/8278#issuecomment-242704745 ).
- Removes the windows-specific path. Windows doesn't support `daemon()`,
so it don't support daemonization there, automatically.
Original code by Matthew King, adapted by Wladimir van der Laan.
2016-09-26 13:37:44 +02:00
MarcoFalke
faef293cf3
[wallet] Add high transaction fee warnings
2016-09-26 01:11:27 +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
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
Derek Miller
c9ce17beed
Trivial: Grammar and capitalization
2016-09-24 12:22:47 -05: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
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
Johnson Lau
c72c5b1e3b
Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH
2016-09-23 13:07:38 +08: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
instagibbs
b5ccded57f
Comment on CConnman::nLocalServices meaning
2016-09-22 08:19:44 -04:00
MarcoFalke
3333bd2d15
[test] Remove redundant print in addrman_tests
2016-09-22 12:50: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
Luke Dashjr
f4dffdd6bf
Add MIT license to Makefiles
2016-09-21 22:35:12 +00:00
MarcoFalke
ddddaafa4a
[rpc] Deprecate getinfo
...
This was replaced by getmininginfo, getnetworkinfo and getwalletinfo
2016-09-21 21:19: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
381826dfee
bitcoin-cli: More detailed error reporting
...
Register a evhttp error handler to get a more detailed error message
if the HTTP request fails.
2016-09-21 14:02:42 +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
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
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
Jonas Schnelli
c6f5ca822f
[Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds
2016-09-20 16:18:24 +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
Wladimir J. van der Laan
4335d5a41b
Merge #7783 : [Qt] RPC-Console: support nested commands and simple value queries
...
1586044
[Qt] RPC-Console: support nested commands and simple value queries (Jonas Schnelli)
2016-09-20 14:15:35 +02:00
Wladimir J. van der Laan
a1f8d3ed95
Merge #8696 : [Wallet] Remove last external reference to CWalletDB
...
2ca6b9d
Remove last reference to CWalletDB from accounting_tests.cpp (Patrick Strateman)
02e2a81
Remove pwalletdb parameter from CWallet::AddAccountingEntry (Patrick Strateman)
d2e678d
Add CWallet::ReorderTransactions and use in accounting_tests.cpp (Patrick Strateman)
59adc86
Add CWallet::ListAccountCreditDebit (Patrick Strateman)
2016-09-20 12:47:31 +02:00
Wladimir J. van der Laan
02ac669730
Merge #8760 : [init] Get rid of some ENABLE_WALLET
...
faddd62
init: Get rid of some ENABLE_WALLET (MarcoFalke)
2016-09-20 12:45:46 +02:00
Wladimir J. van der Laan
82eacc786d
Merge #8700 : [copyright] add MIT license headers to .sh scripts where missing
...
0766d1c
[copyright] add MIT license headers to .sh scripts where missing (isle2983)
2016-09-20 10:02:33 +02:00
maiiz
94a34a5d95
Fix relaypriority calculation error
2016-09-20 11:45:30 +08:00
Wladimir J. van der Laan
047ded0b12
Merge #8688 : Move static global randomizer seeds into CConnman
...
d9ff591
Move static global randomizer seeds into CConnman (Pieter Wuille)
2016-09-19 18:02:01 +02:00
Wladimir J. van der Laan
8bae52a9a0
Merge #8737 : Trivial: UndoReadFromDisk works on undo files (rev), not on block files.
...
b4fb512
UndoReadFromDisk works on undo files (rev), not on block files. (Pavel Janík)
2016-09-19 16:54:17 +02:00
Wladimir J. van der Laan
f07424a671
Merge #8707 : net: fix maxuploadtarget setting
...
f3552da
net: fix maxuploadtarget setting (Cory Fields)
2016-09-19 16:46:50 +02:00
MarcoFalke
faddd62518
init: Get rid of some ENABLE_WALLET
2016-09-19 16:14:18 +02:00
Pieter Wuille
d9ff591d42
Move static global randomizer seeds into CConnman
2016-09-19 15:53:47 +02:00
Wladimir J. van der Laan
2ebb8099d9
Merge #8742 : Specify Protobuf version 2 in paymentrequest.proto
...
c4084c2
Specify Protobuf version 2 in paymentrequest.proto (fanquake)
2016-09-19 15:43:51 +02:00
Wladimir J. van der Laan
a5b20edd3d
Merge #8494 : [init, wallet] ParameterInteraction() iff wallet enabled
...
fa5d276
[init] ParameterInteraction() iff wallet enabled (MarcoFalke)
2016-09-19 11:38:16 +02:00
fanquake
c4084c2085
Specify Protobuf version 2 in paymentrequest.proto
2016-09-16 11:45:08 +08:00
Wladimir J. van der Laan
d9c99c3058
net: No longer send local address in addrMe
...
After #8594 the addrFrom sent by a node is not used anymore at all,
so don't bother sending it.
Also mitigates the privacy issue in (#8616 ). It doesn't completely solve
the issue as GetLocalAddress is also called in AdvertiseLocal, but at
least when advertising addresses it stands out less as *our* address.
2016-09-15 23:42:01 +02:00
Patrick Strateman
2ca6b9df1d
Remove last reference to CWalletDB from accounting_tests.cpp
2016-09-15 13:51:04 -07:00
Patrick Strateman
02e2a81536
Remove pwalletdb parameter from CWallet::AddAccountingEntry
2016-09-15 13:50:59 -07:00
Patrick Strateman
d2e678d7d2
Add CWallet::ReorderTransactions and use in accounting_tests.cpp
2016-09-15 06:52:15 -07:00
Patrick Strateman
59adc86680
Add CWallet::ListAccountCreditDebit
...
Simple pass through for CWalletDB::ListAccountCreditDebit
2016-09-15 06:52:15 -07:00
Pavel Janík
b4fb512719
UndoReadFromDisk works on undo files (rev), not on block files.
2016-09-15 12:40:09 +02:00
Cory Fields
f3552da813
net: fix maxuploadtarget setting
...
This was broken by 63cafa6329
.
Note that while this fixes the settings, it doesn't fix the actual usage of
-maxuploadtarget completely, as there is currently a bug in the
nOptimisticBytesWritten accounting that causes a delayed response if the target
is reached. That bug will be addressed separately.
2016-09-14 13:14:04 -04:00
Wladimir J. van der Laan
881d7eaf29
Merge #8715 : net: only delete CConnman if it's been created
...
36fa01f
net: only delete CConnman if it's been created (Cory Fields)
2016-09-14 10:16:25 +02:00
Cory Fields
36fa01f217
net: only delete CConnman if it's been created
...
In the case of (for example) an already-running bitcoind, the shutdown sequence
begins before CConnman has been created, leading to a null-pointer dereference
when g_connman->Stop() is called.
Instead, Just let the CConnman dtor take care of stopping.
2016-09-13 22:43:23 -04:00
Jonas Schnelli
1b6bcdd3aa
Remove maxuploadtargets recommended minimum
2016-09-13 18:08:17 +02:00
Jonas Schnelli
d8b062ef5e
[Qt] only update "amount of blocks left" when the header chain is in-sync
2016-09-13 17:57:25 +02:00
Wladimir J. van der Laan
fa7caf6d91
Merge #8693 : add witness address to address book
...
62ffbbd
add witness address to address book (instagibbs)
2016-09-13 17:10:28 +02:00
Wladimir J. van der Laan
c9914c2094
Merge #8699 : Remove createwitnessaddress RPC command
...
86c3f8d
Remove createwitnessaddress (Johnson Lau)
2016-09-13 17:03:00 +02:00
Wladimir J. van der Laan
37ac67816a
Merge #8601 : Add option to opt into full-RBF when sending funds (rebase, original by petertodd)
...
86726d8
Rename `-optintofullrbf` option to `-walletrbf` (Wladimir J. van der Laan)
05fa823
wallet: Add BIP125 comment for MAXINT-1/-2 behavior (Wladimir J. van der Laan)
152f45b
Add option to opt into full-RBF when sending funds (Peter Todd)
2016-09-13 11:35:26 +02:00
Wladimir J. van der Laan
86726d8680
Rename -optintofullrbf
option to -walletrbf
...
This makes it clear that this is a wallet option.
2016-09-13 11:32:29 +02:00
Johnson Lau
86c3f8db0b
Remove createwitnessaddress
...
This RPC command is unsafe as it will return an address even if the script is invalid.
2016-09-13 11:35:14 +08:00