MarcoFalke
54703891e1
Merge #8790 : [test] Remove redundant debug print in addrman_tests
...
3333bd2 [test] Remove redundant print in addrman_tests (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
39d2131142
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)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
c7a0b91d31
Merge #8793 : Do not shadow in src/qt
...
f839350 Do not shadow in src/qt (Pavel Janík)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
17e110f47e
Merge #8785 : Comment on CNode::nLocalServices meaning
...
b5ccded Comment on CConnman::nLocalServices meaning (instagibbs)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
97b63420dd
Merge #8656 : Trivial: Do not shadow global variable fileout
...
7c069a7 Do not shadow global variable (Pavel Janík)
2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
bfa539a1dd
Merge #8777 : [qt] WalletModel: Expose disablewallet
...
6666ca6 [qt] WalletModel: Expose disablewallet (MarcoFalke)
2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
06f41f3586
Merge #8768 : init: Get rid of fDisableWallet
...
fa58edb [wallet] Introduce DEFAULT_DISABLE_WALLET (MarcoFalke)
fab9107 init: Get rid of fDisableWallet (MarcoFalke)
2018-01-11 13:22:17 +01:00
Wladimir J. van der Laan
e02b48cad0
Merge #8765 : [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds
...
c6f5ca8 [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds (Jonas Schnelli)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
387201712a
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)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
630c699f00
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)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
fbbddf8107
Merge #8760 : [init] Get rid of some ENABLE_WALLET
...
faddd62 init: Get rid of some ENABLE_WALLET (MarcoFalke)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
a5a9e46042
Merge #8700 : [copyright] add MIT license headers to .sh scripts where missing
...
0766d1c [copyright] add MIT license headers to .sh scripts where missing (isle2983)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
b04e32c43d
Merge #8688 : Move static global randomizer seeds into CConnman
...
d9ff591 Move static global randomizer seeds into CConnman (Pieter Wuille)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
412f79083c
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)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
af5d18ad5c
Merge #8707 : net: fix maxuploadtarget setting
...
f3552da net: fix maxuploadtarget setting (Cory Fields)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
2a13321ffc
Merge #8742 : Specify Protobuf version 2 in paymentrequest.proto
...
c4084c2 Specify Protobuf version 2 in paymentrequest.proto (fanquake)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
9432e1904f
Merge #8494 : [init, wallet] ParameterInteraction() iff wallet enabled
...
fa5d276 [init] ParameterInteraction() iff wallet enabled (MarcoFalke)
2018-01-11 13:19:32 +01:00
Jonas Schnelli
eae44bd3d7
Merge #8712 : Remove maxuploadtargets recommended minimum
...
1b6bcdd Remove maxuploadtargets recommended minimum (Jonas Schnelli)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
85ce0ef287
Merge #8697 : fix op order to append first alert
...
1d635ae fix op order to append first alert (rodasmith)
2018-01-11 13:19:32 +01:00
Alexander Block
3aad9d9085
Fix logging in PushInventory ( #1847 )
...
Merge conflict resolution went wrong here. It showed filtered in case it
was pushed and nothing in case it was filtered.
2018-01-11 04:59:25 +03:00
UdjinM6
94e891c020
Merge pull request #1842 from codablock/pr_backport_bitcoin_0.14-2
...
Backport missing PRs from Bitcoin 0.14 - Part 2
2018-01-11 04:58:52 +03:00
Alexander Block
c2de362b98
Actually honor fMiningRequiresPeers in getblocktemplate ( #1844 )
...
MiningRequiresPeers() was not used at all. I checked the Bitcoin
code and even there it is set but then ignored. Updated getblocktemplate
to actually honor the value.
The check also removes the need for IsInitialBlockDownload() to be false.
As regtest nodes start with an empty chain they won't be able to use
getblocktemplate for mining otherwise.
2018-01-10 15:22:00 +03:00
Alexander Block
81fb931fb8
Don't delay GETHEADERS when no blocks have arrived yet in devnet ( #1807 )
...
When the first mined block arrives from another node on devnet, we have to
send GETHEADERS immediately as we otherwise will never leave the IBD mode.
2018-01-10 15:20:08 +03:00
Wladimir J. van der Laan
fdd0638161
Merge #8928 : Fix init segfault where InitLoadWallet() calls ATMP before genesis
...
37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
2018-01-09 17:23:39 +01:00
Pieter Wuille
3baee7ba24
Merge #8681 : Performance Regression Fix: Pre-Allocate txChanged vector
...
ec81881 Performance Regression Fix: Pre-Allocate txChanged vector (Jeremy Rubin)
2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
0324fa0121
Merge #8677 : Do not shadow upper local variable 'send', prevent -Wshadow compiler warning.
...
125b946 Do not shadow upper local variable 'send', prevent -Wshadow compiler warning. (Pavel Janík)
2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
c2a601f507
Merge #8680 : Address Travis spurious failures
...
d6a5dc4 add waitfornewblock/waitforblock/waitforblockheight rpcs and use them for tests (Cory Fields)
2018-01-09 14:16:39 +01:00
MarcoFalke
3d26438bec
Merge #8673 : Trivial: Fix obvious assignment/equality error in test
...
426e7bc Fix obvious assignment/equality error in test (Jeremy Rubin)
2018-01-09 14:16:39 +01:00
Pieter Wuille
f7e9bc613a
Merge #8606 : Fix some locks
...
144ed76 Fix some locks (Pieter Wuille)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
75f920e897
Merge #8663 : trivial: remove unnecessary variable fDaemon
...
ff2ed7a trivial: remove unnecessary variable fDaemon (mruddy)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
313cfb09da
Merge #8466 : [Trivial] Do not shadow variables in networking code
...
b7c349d Do not shadow variables in networking code (Pavel Janík)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
414272af93
Merge #8629 : C++11: s/boost::scoped_ptr/std::unique_ptr/
...
cdd79eb C++11: s/boost::scoped_ptr/std::unique_ptr/ (Jorge Timón)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
4d0be42c6e
Merge #8272 : Make the dummy argument to getaddednodeinfo optional
...
854f1af Make the dummy argument to getaddednodeinfo optional (Pieter Wuille)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
bc91f34da6
Merge #8638 : rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HTTP_BAD_REQUEST
...
f012a85 rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HTTP_BAD_REQUEST (djpnewton)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
88fcf3fbd2
Merge #8191 : Do not shadow variables in src/wallet
...
b175cb7 Do not shadow variables. (Pavel Janík)
2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
5ce7ba6115
Merge #8291 : [util] CopyrightHolders: Check for untranslated substitution
...
33336e1 [util] CopyrightHolders: Check for untranslated substitution (MarcoFalke)
2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
9d061a2730
Merge #8163 : Do not shadow global RPC table variable (tableRPC)
...
de1bbe3 Do not shadow global RPC table variable (tableRPC) (Pavel Janík)
2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
3b45caeeb7
Merge #8626 : Berkeley DB v6 compatibility fix
...
323a5fe Berkeley DB v6 compatibility fix (Alexey Vesnin)
2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
f6658c07f3
Merge #8611 : Reduce default number of blocks to check at startup
...
203f212 Reduce default number of blocks to check at startup (Pieter Wuille)
2018-01-09 14:16:37 +01:00
Pieter Wuille
707e2945a4
Merge #8564 : [Wallet] remove unused code/conditions in ReadAtCursor
...
beef966 [Wallet] remove unused code/conditions in ReadAtCursor (Jonas Schnelli)
2018-01-09 14:04:21 +01:00
Wladimir J. van der Laan
22604cbbcc
Merge #8607 : [doc] Fix doxygen off-by-one comments, fix typos
...
fafe7b3 contrib: Make fix-copyright-headers.py more portable (MarcoFalke)
fa27c0a [doc] Fix typos in comments, doxygen: Fix comment syntax (MarcoFalke)
fabfd5d [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke)
67a5502 init: Fix typo in help message for -whitelistforcerelay (Wladimir J. van der Laan)
2018-01-09 14:04:21 +01:00
Pieter Wuille
30066a6004
Merge #8109 : Do not shadow member variables
...
ff8d279 Do not shadow member variables (Pavel Janík)
2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
95c61637d5
Merge #8590 : Remove unused variables
...
fa6dc9f Remove unused variables (MarcoFalke)
2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
15b9e43abe
Merge #8581 : [wallet] rpc: Drop misleading option
...
fab5ecb [wallet] rpc: Drop misleading option (MarcoFalke)
2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
b00f025dd8
Merge #8583 : Show XTHIN in GUI
...
4c3e2cb Show XTHIN in GUI (R E Broadley)
2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
df07a31743
Merge #8561 : Show "end" instead of many zeros when getheaders request received with a hashStop of Null
...
259ee09 Show "end" instead of many zeros when getheaders request received with a hashStop of Null. (R E Broadley)
2018-01-09 14:04:20 +01:00
Pieter Wuille
3a497a6b5c
Merge #8462 : Move AdvertiseLocal debug output to net category
...
f13c1ba Move AdvertiseLocal debug output to net category (Michael Rotarius)
2018-01-09 14:04:20 +01:00
Jonas Schnelli
3fca7e2044
Merge #7579 : [Qt] show network/chain errors in the GUI
...
2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)
2018-01-09 14:04:20 +01:00
MarcoFalke
249e720254
Merge #8578 : [test] Remove unused code
...
fa1cf9e [test] Remove unused code (MarcoFalke)
2018-01-09 14:04:19 +01:00
Wladimir J. van der Laan
e61556e20e
Merge #8450 : [Test] Replace rpc_wallet_tests.cpp with python RPC unit tests
...
9578333 Remove rpc_wallet_tests.cpp (Patrick Strateman)
25400c4 Account wallet feature RPC tests. (Patrick Strateman)
2018-01-09 14:04:19 +01:00