Wladimir J. van der Laan
397c27ff9d
Merge #9875 : tests: Fix dangling pwalletMain pointer in wallet tests
...
75a1093 tests: Fix dangling pwalletMain pointer in wallet tests (Wladimir J. van der Laan)
Tree-SHA512: 7fb6e8385fe7d542f9ecb113a08d675ca9e84907a1939b3a6ad41318fda55bc999b9bc8ffc3f56cd8610ca49d0db982d3c793df7bbcb7eb9638f4483030db6a8
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
af006a36ef
Merge #9789 : build: add --enable-werror and warn on vla's
...
205830a build: add --enable-werror option (Cory Fields)
b602fe0 build: warn about variable length arrays (Cory Fields)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
0e8be439c2
Merge #9711 : [Trivial] Remove incorrect help message from gettxoutproof()
...
9949ebf [Trivial] Remove incorrect help message from gettxoutproof() (John Newbery)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
ac981ec3cc
Merge #9773 : Return errors from importmulti if complete rescans are not successful
...
e2e2f4c Return errors from importmulti if complete rescans are not successful (Russell Yanofsky)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
0a6f63bb24
Merge #9817 : Fix segfault crash when shutdown the GUI in disablewallet mode
...
312c4f1 Fix segfault crash when shutdown the GUI in disablewallet mode (Jonas Schnelli)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
15a035b9c0
Merge #9798 : Fix Issue #9775 (Check returned value of fopen)
...
40f11f8 Fix for issue #9775 . Added check for open() returning a NULL pointer. (kirit93)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
8d2edc4698
Merge #9813 : Read/write mempool.dat as a binary.
...
171fc91 Read/write mempool.dat as a binary. (Pavel Janík)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
199b07a892
Merge #9760 : [wallet] Remove importmulti always-true check
...
ec1267f [wallet] Remove importmulti always-true check (Russell Yanofsky)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
3ab5fab7fb
Merge #9786 : boost: remove iostreams includes
...
3301587 boost: remove iostreams includes (Cory Fields)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
5e596423a4
Merge #9785 : Avoid variable length arrays
...
c801c82 Move BIP70_MAX_PAYMENTREQUEST_SIZE to header (Pieter Wuille)
914fad1 Make KEY_SIZE a compile-time constant (Pieter Wuille)
2018-01-26 12:59:29 +01:00
UdjinM6
054abdbfa4
Merge pull request #1867 from codablock/pr_backport_bitcoin_0.14-10
...
Backport missing PRs from Bitcoin 0.14 - Part 10
2018-01-26 14:55:56 +03:00
UdjinM6
1ca270ed89
No need for msgMakerInitProto for sporks because we loop by fully connected nodes only now ( #1877 )
2018-01-26 04:11:30 +03:00
UdjinM6
b1817dd936
Introduce CDarksendAccept class (for DSACCEPT messages) ( #1875 )
2018-01-26 04:11:15 +03:00
UdjinM6
88646bd0d0
Rename fMasterNode
to fMasternodeMode
to clarify its meaning and to avoid confusion with CNode::fMasternode
( #1874 )
2018-01-26 04:11:01 +03:00
UdjinM6
f6d98422ca
Silence ratecheck_test ( #1873 )
2018-01-26 04:10:45 +03:00
UdjinM6
9cee4193b8
Separate .h generation from .json/.raw for different modules ( #1870 )
2018-01-24 16:29:24 +01:00
UdjinM6
83957f2d3b
Fix alertTests.raw.h (again) ( #1869 )
2018-01-24 14:27:08 +03:00
UdjinM6
c13afaad8b
Fix alertTests.raw.h generation ( #1868 )
2018-01-24 11:11:22 +03:00
Alexander Block
6c2fe3d055
Remove onlyMaybeDeadlock condition around printing of deadlock info
2018-01-23 12:27:28 +01:00
Wladimir J. van der Laan
0080fde36a
Merge #9778 : Add two hour buffer to manual pruning
...
91fb506 Add two hour buffer to manual pruning (Alex Morcos)
2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
86fd57b8cd
Merge #9777 : Handle unusual maxsigcachesize gracefully
...
55c403b Ensure `-maxsigcachesize` is in valid range (John Newbery)
2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
52819ca9b9
Merge #9763 : [Trivial] Update comments referencing main.cpp
...
00e623d [Trivial] Update comments referencing main.cpp (CryptAxe)
2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
bb2c1624c9
Merge #9771 : Add missing cs_wallet lock that triggers new lock held assertion
...
07afcd6 Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
da8808fba0
Merge #9756 : Return error when importmulti called with invalid address.
...
9acf25c Return error when importmulti called with invalid address. (Russell Yanofsky)
2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
136d8606c8
Merge #9758 : Selectively suppress deprecation warnings
...
4b6cccc Selectively suppress deprecation warnings (Jonas Schnelli)
2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
f2b5560083
Merge #9553 : Use z = std::max(x - y, 0) instead of z = x - y; if (z < 0) z = 0;
...
a47da4b Use z = std::max(x - y, 0); instead of z = x - y; if (z < 0) z = 0; (practicalswift)
2018-01-23 09:24:29 +01:00
Jonas Schnelli
132edbda8c
Merge #9755 : Bugfix: Qt/Options: Restore persistent "restart required" notice
...
0b4f273 Bugfix: Qt/Options: Restore persistent "restart required" notice (Luke Dashjr)
2018-01-23 09:24:28 +01:00
Wladimir J. van der Laan
fe0ef87cd3
Merge #9720 : net: fix banning and disallow sending messages before receiving verack
...
d943491 qa: add a test to detect leaky p2p messages (Cory Fields)
8650bbb qa: Expose on-connection to mininode listeners (Matt Corallo)
5b5e4f8 qa: mininode learns when a socket connects, not its first action (Matt Corallo)
cbfc5a6 net: require a verack before responding to anything else (Cory Fields)
8502e7a net: parse reject earlier (Cory Fields)
c45b9fb net: correctly ban before the handshake is complete (Cory Fields)
2018-01-23 09:24:28 +01:00
Wladimir J. van der Laan
588b8e5caf
Merge #9715 : Disconnect peers which we do not receive VERACKs from within 60 sec
...
66f861a Add a test for P2P inactivity timeouts (Matt Corallo)
b436f92 qa: Expose on-connection to mininode listeners (Matt Corallo)
8aaba7a qa: mininode learns when a socket connects, not its first action (Matt Corallo)
2cbd119 Disconnect peers which we do not receive VERACKs from within 60 sec (Matt Corallo)
2018-01-23 09:24:28 +01:00
Pieter Wuille
b50b8196fa
Merge #9708 : Clean up all known races/platform-specific UB at the time PR was opened
...
db2dc7a Move CNode::addrLocal access behind locked accessors (Matt Corallo)
036073b Move CNode::addrName accesses behind locked accessors (Matt Corallo)
d8f2b8a Make nTimeBestReceived atomic (Matt Corallo)
22b4966 Move [clean|str]SubVer writes/copyStats into a lock (Matt Corallo)
0f31872 Make nServices atomic (Matt Corallo)
96f42d8 Make nStartingHeight atomic (Matt Corallo)
512731b Access fRelayTxes with cs_filter lock in copyStats (Matt Corallo)
ae683c1 Avoid copying CNodeStats to make helgrind OK with buggy std::string (Matt Corallo)
644f123 Make nTimeConnected const in CNode (Matt Corallo)
321d0fc net: fix a few races. Credit @TheBlueMatt (Cory Fields)
2018-01-23 09:24:28 +01:00
Wladimir J. van der Laan
3b543952d4
Merge #9698 : net: fix socket close race
...
9a0b784 net: add a lock around hSocket (Cory Fields)
45e2e08 net: rearrange so that socket accesses can be grouped together (Cory Fields)
2018-01-23 09:24:28 +01:00
Wladimir J. van der Laan
f1f4e25d60
Merge #9718 : Qt/Intro: Various fixes
...
a9baa6d Bugfix: Qt/Intro: Pruned nodes never require *more* space (Luke Dashjr)
93ffba7 Bugfix: Qt/Intro: Chain state needs to be stored even with the full blockchain (Luke Dashjr)
c8cee26 Qt/Intro: Update block chain size (Luke Dashjr)
2018-01-23 09:24:28 +01:00
Wladimir J. van der Laan
7d4e34029c
Merge #9674 : Always enforce strict lock ordering (try or not)
...
618ee92 Further-enforce lockordering by enforcing directly after TRY_LOCKs (Matt Corallo)
2a962d4 Fixup style a bit by moving { to the same line as if statements (Matt Corallo)
8465631 Always enforce lock strict lock ordering (try or not) (Matt Corallo)
fd13eca Lock cs_vSend and cs_inventory in a consistent order even in TRY (Matt Corallo)
2018-01-23 09:24:28 +01:00
MarcoFalke
f1cbc40b3e
Merge #9712 : bench: Fix initialization order in registration
...
29c5328 bench: Fix initialization order in registration (Wladimir J. van der Laan)
2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
767f5e436b
Merge #9532 : Remove unused variables
...
90fd29b Remove unused int64_t nSinceLastSeen (practicalswift)
ac4a095 Remove unused Python variables (practicalswift)
2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
eb4c5bac6d
Merge #9227 : Make nWalletDBUpdated atomic to avoid a potential race.
...
d63ff62 Make nWalletDBUpdated atomic to avoid a potential race. (Patrick Strateman)
2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
72a0d05d6b
Merge #9378 : [trivial] Add documentation for CWalletTx::fFromMe member.
...
39c77b0 Add documentation for CWalletTx::fFromMe member. (Russell Yanofsky)
2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
3f1929fb0d
Merge #9659 : Net: Turn some methods and params/variables const
...
0729102 Net: pass interruptMsgProc as const where possible (Jorge Timón)
fc7f2ff Net: Make CNetMsgMaker more const (Jorge Timón)
d45955f Net: CConnman: Make some methods const (Jorge Timón)
2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
81eeb0dee7
Merge #9651 : Fix typos
...
5f62e3e Fix typos (practicalswift)
2018-01-23 09:24:27 +01:00
Pieter Wuille
ea414f3077
Merge #9578 : Add missing mempool lock for CalculateMemPoolAncestors
...
003cd60 Add missing mempool lock for CalculateMemPoolAncestors (Matt Corallo)
2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
e86c52f690
Merge #9556 : Remove redundant semicolons
...
8fc6989 Remove redundant semicolons (practicalswift)
2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
dcc251e2b7
Merge #9663 : [RPC] clarify listunspent amount description
...
3eba88d clarify listunspent amount description (Gregory Sanders)
2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
d45a7ae731
Merge #9647 : Skip RAII event tests if libevent is built without event_set_mem_functions
...
95f97f4 Skip RAII event tests if libevent is built without event_set_mem_functions (Luke Dashjr)
2018-01-23 09:24:26 +01:00
MarcoFalke
e24b8ae50e
Merge #9649 : [doc] Remove unused clang format dev script
...
fa5137c [doc] Remove unused clang format dev script (MarcoFalke)
2018-01-23 09:24:26 +01:00
Alexander Block
8ad57c31fd
Remove "using namespace std" from wallet.cpp
2018-01-23 09:24:25 +01:00
MarcoFalke
25074aeb43
Merge #9644 : [refactor] Remove using namespace <xxx> from src/
...
b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)
2018-01-23 09:24:03 +01:00
Wladimir J. van der Laan
daa8582b18
Merge #9615 : Wallet incremental fee
...
4b189c1 Change bumpfee result value from 'oldfee' to 'origfee'. (Alex Morcos)
0c0c63f Introduce WALLET_INCREMENTAL_RELAY_FEE (Alex Morcos)
e8021ec Use CWallet::GetMinimumFee in bumpfee (Alex Morcos)
ae9719a Refactor GetMinimumFee to give option of providing targetFee (Alex Morcos)
fe8e8ef [rpc] Add incremental relay fee to getnetworkinfo (Alex Morcos)
6b331e6 Fix to have miner test aware of new separate block min tx fee (Alex Morcos)
de6400d Fix missing use of dustRelayFee (Alex Morcos)
5b15870 Use incrementalRelayFee for BIP 125 replacement (Alex Morcos)
2018-01-23 09:24:03 +01:00
Alexander Block
b84afb2512
Allow to filter for fully connected nodes when calling CopyNodeVector ( #1864 )
...
And use this where needed. This avoids warnings about unset version fields
and is also generally a good thing (we really should only communicate with
nodes we know are good)
2018-01-22 16:17:11 +03:00
Alexander Block
b97eecc058
Fix review nits
2018-01-22 08:05:44 +01:00
Alexander Block
ec81769605
Remove segwit related dash-tx tests
2018-01-21 22:50:55 +01:00