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
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
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
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
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
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