Pieter Wuille
d54ef6d7e3
Merge #9226 : Remove fNetworkNode and pnodeLocalHost.
...
bdb922b Remove pnodeLocalHost. (Gregory Maxwell)
083f203 Remove fNetworkNode. (Gregory Maxwell)
2018-01-17 17:30:36 +01:00
Pieter Wuille
a78e0e36c6
Merge #9244 : Trivial refactor: Remove extern keyword from function declarations
...
446a8f9 Trivial refactor: Remove extern keyword from function declarations, as they are extern by default. (Karl-Johan Alm)
2018-01-17 17:27:25 +01:00
Pieter Wuille
b07393709e
Merge #9010 : Split up AppInit2 into multiple phases, daemonize after datadir lock errors
...
deec83f init: Get rid of fServer flag (Wladimir J. van der Laan)
16ca0bf init: Try to aquire datadir lock before and after daemonization (Wladimir J. van der Laan)
0cc8b6b init: Split up AppInit2 into multiple phases (Wladimir J. van der Laan)
2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
27fcec08f8
Merge #9202 : bench: Add support for measuring CPU cycles
...
3532818 bench: Add support for measuring CPU cycles (Wladimir J. van der Laan)
2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
ab9bce2c3a
Merge #9225 : Fix some benign races
...
dfed983 Fix unlocked access to vNodes.size() (Matt Corallo)
3033522 Remove double brackets in addrman (Matt Corallo)
dbfaade Fix AddrMan locking (Matt Corallo)
047ea10 Make fImporting an std::atomic (Matt Corallo)
42071ca Make fDisconnect an std::atomic (Matt Corallo)
2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
b27c4b8e96
Merge #9224 : Prevent FD_SETSIZE error building on OpenBSD
...
498a1d7 Include select.h when WIN32 is not defined (Ivo van der Sangen)
2018-01-17 17:27:24 +01:00
MarcoFalke
df24dfd4bc
Merge #9233 : Fix some typos
...
15fa95d Fix some typos (fsb4000)
2018-01-17 17:27:24 +01:00
Alexander Block
dadfc45b15
Add size() method to CVectorWriter
...
Needed by CMasternodePing
2018-01-17 17:27:24 +01:00
Pieter Wuille
5c0b55a7c0
Merge #9128 : net: Decouple CConnman and message serialization
...
c7be56d net: push only raw data into CConnman (Cory Fields)
2ec935d net: add CVectorWriter and CNetMsgMaker (Cory Fields)
b7695c2 net: No need to check individually for disconnection anymore (Cory Fields)
fedea8a net: don't send any messages before handshake or after requested disconnect (Cory Fields)
d74e352 net: Set feelers to disconnect at the end of the version message (Cory Fields)
2018-01-17 17:27:22 +01:00
MarcoFalke
c87c151426
Merge #9220 : Refactor: Stop using namespace std (bitcoin-cli/-tx).
...
2f2625a Removed using namespace std from bitcoin-cli/-tx and added std:: in appropriate places. (Karl-Johan Alm)
2018-01-17 17:25:36 +01:00
MarcoFalke
2c8fe46868
Merge #9100 : tx_valid: re-order inputs to how they are encoded
...
5262a15 tx_valid: re-order inputs to how they are encoded (Daniel Cousens)
2018-01-17 17:25:36 +01:00
MarcoFalke
d5f2f07961
Merge #9216 : Doc: Fix copypasted comment
...
f26da35 Fix copypasted comment. (Pavel Janík)
2018-01-17 17:25:36 +01:00
MarcoFalke
a71702e3e2
Merge #9144 : [Trivial] Correct waitforblockheight example help text
...
e3c4f7e Correct help output for waitfor RPC commands (fanquake)
2018-01-17 17:25:36 +01:00
Pieter Wuille
3a48d2b832
Merge #8930 : Move orphan processing to ActivateBestChain
...
d2b88f9 Move orphan-conflict removal from main logic into a callback (Matt Corallo)
97e2802 Erase orphans per-transaction instead of per-block (Matt Corallo)
ec4525c Move orphan processing to ActivateBestChain (Matt Corallo)
2018-01-17 17:25:36 +01:00
Alexander Block
532b9fa3db
Use OpenNetworkConnection instead of calling ConnectNode directly in Dash code ( #1857 )
...
ConnectNode is meant to be private and should not be leaked outside of
CConnman. This leaking resulted in multiple problems with AddRef/Release
behaviour. We use OpenNetworkConnectio/OpenMasternodeConnection from now on
and use appropriate ForNode calls to access the CNode* instance.
This commit also changes the behaviour for already connected nodes which
are afterwards requested for a masternode connection. We don't set
fMasternode=true anymore on such nodes, which means it won't be auto
disconnected anymore from ProcessMasternodeConnections.
2018-01-17 18:09:08 +03:00
Alexander Block
86d33b2762
Remove double registration of "privatesend" RPC ( #1853 )
2018-01-16 16:14:28 +03:00
Alexander Block
b6ea01e071
Remove namespace alert_tests when including alert test data
2018-01-16 08:36:16 +01:00
Alexander Block
7939a23e3b
Use std::move when calling MakeTransactionRef
2018-01-16 08:30:52 +01:00
Alexander Block
07cd44c0e2
Use MakeTransactionRef in CreateDevNetGenesisBlock
2018-01-15 07:03:20 +01:00
Alexander Block
e02f313471
Mogrify and optimize network_disabled.png and copy it to all themes
...
Bitcoin #9145 made the icon 50% opaque, copy that to all themes.
2018-01-15 06:51:53 +01:00
Wladimir J. van der Laan
898bd4395d
Merge #9204 : Clarify CreateTransaction error messages
...
918b126 fix CreateTransaction error messages (instagibbs)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
2d87a0fdd7
Merge #8690 : Do not fully sort all nodes for addr relay
...
a33b169 Do not fully sort all nodes for addr relay (Pieter Wuille)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
d757c895b9
Merge #9141 : Remove unnecessary calls to CheckFinalTx
...
4512550 Remove unnecessary calls to CheckFinalTx (Jonas Schnelli)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
4e1c1923b7
Merge #9142 : Move -salvagewallet, -zap(wtx) to where they belong
...
2e44893 Move -salvagewallet, -zap(wtx) to where they belong (Jonas Schnelli)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
ce3f38d6ca
Merge #9025 : getrawtransaction should take a bool for verbose
...
240189b add testcases for getrawtransaction (John Newbery)
ce2bb23 getrawtransaction should take a bool for verbose (jnewbery)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
481bab7456
Merge #9200 : bench: Fix subtle counting issue when rescaling iteration count
...
e0a9cb2 bench: Fix subtle counting issue when rescaling iteration count (Wladimir J. van der Laan)
2018-01-15 06:14:16 +01:00
Jonas Schnelli
507c4e5246
Merge #9185 : [Qt] fix coincontrol sort issue
...
4231032 [Qt] Clean up and fix coincontrol tree widget handling (Wladimir J. van der Laan)
76af4eb [Qt] fix coincontrol sort issue (Jonas Schnelli)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
e5cc7d0eb4
Merge #8872 : Remove block-request logic from INV message processing
...
037159c Remove block-request logic from INV message processing (Matt Corallo)
3451203 [qa] Respond to getheaders and do not assume a getdata on inv (Matt Corallo)
d768f15 [qa] Make comptool push blocks instead of relying on inv-fetch (mrbandrews)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
726dd1f8a3
Merge #9179 : Set DEFAULT_LIMITFREERELAY = 0 kB/minute
...
fa7cc5a Set DEFAULT_LIMITFREERELAY = 0 kB/minute (MarcoFalke)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
afa99c41fc
Merge #9117 : net: don't send feefilter messages before the version handshake is complete
...
4662553 net: don't send feefilter messages before the version handshake is complete (Cory Fields)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
f12610c030
Merge #9125 : Make CBlock a vector of shared_ptr of CTransactions
...
b4e4ba4 Introduce convenience type CTransactionRef (Pieter Wuille)
1662b43 Make CBlock::vtx a vector of shared_ptr<CTransaction> (Pieter Wuille)
da60506 Add deserializing constructors to CTransaction and CMutableTransaction (Pieter Wuille)
0e85204 Add serialization for unique_ptr and shared_ptr (Pieter Wuille)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
c937a0bfb1
Merge #9186 : test: Fix use-after-free in scheduler tests
...
12519bf test: Fix use-after-free in scheduler tests (Wladimir J. van der Laan)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
9b9d3d1da8
Merge #9133 : Unset fImporting for loading mempool
...
79f755d Unset fImporting for loading mempool (Alex Morcos)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
0932079ea6
Merge #9131 : fNetworkActive is not protected by a lock, use an atomic
...
079142b fNetworkActive is not protected by a lock, use an atomic (Jonas Schnelli)
2018-01-15 06:14:16 +01:00
Pieter Wuille
dc4fdd9ffc
Merge #9164 : [trivial] credit values are CAmount
...
20c3215 credit values are CAmount (Gregory Sanders)
2018-01-15 06:14:16 +01:00
Alexander Block
c12eb7f312
Put namespace{} around alertTests.raw.h include
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
a9c354472e
Merge #9140 : Bugfix: Correctly replace generated headers and fail cleanly
...
b74ff5c Bugfix: Correctly replace generated headers and fail cleanly (Luke Dashjr)
2018-01-15 06:14:16 +01:00
Jonas Schnelli
2b99a4b4e8
Merge #9145 : [qt] Make network disabled icon 50% opaque
...
fa42e4a [qt] Make network disabled icon 50% opaque (MarcoFalke)
2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
db516cfb8e
Merge #9124 : Use better name for local variable to prevent -Wshadow compiler warning
...
bf49f10 Use better name for local variable to prevent -Wshadow compiler warning (Pavel Janík)
2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
a9aa477daf
Merge #9049 : Remove duplicatable duplicate-input check from CheckTransaction
...
e2b3fb3 Optimize vInOutPoints insertion a bit (Matt Corallo)
eecffe5 Remove redundant duplicate-input check from CheckTransaction (Matt Corallo)
b2e178a Add deserialize + CheckBlock benchmarks, and a full block hex (Matt Corallo)
2018-01-15 06:14:15 +01:00
MarcoFalke
ec08f5b750
Merge #9122 : fix getnettotals RPC description about timemillis.
...
a79f864 fix getnettotals RPC description about timemillis. (Masahiko Hyuga)
2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
5f6908619e
Merge #9121 : Initialize variable to prevent compiler warning
...
bdcba6d Initialize variable to prevent compiler warning (Pavel Janík)
2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
161fa919c2
Merge #9111 : Remove unused variable UNLIKELY_PCT from fees.h
...
d8edf03 Remove unused var UNLIKELY_PCT from fees.h (fanquake)
2018-01-15 06:14:15 +01:00
Alexander Block
7765c87e79
Remove nType and nVersion from Dash related serialization code
...
Also remove bogus "nVersion = this->nVersion" assignments. These were
leftovers from old times.
2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
19a2d668cf
Merge #9039 : Various serialization simplifcations and optimizations
...
d59a518 Use fixed preallocation instead of costly GetSerializeSize (Pieter Wuille)
25a211a Add optimized CSizeComputer serializers (Pieter Wuille)
a2929a2 Make CSerAction's ForRead() constexpr (Pieter Wuille)
a603925 Avoid -Wshadow errors (Pieter Wuille)
5284721 Get rid of nType and nVersion (Pieter Wuille)
657e05a Make GetSerializeSize a wrapper on top of CSizeComputer (Pieter Wuille)
fad9b66 Make nType and nVersion private and sometimes const (Pieter Wuille)
c2c5d42 Make streams' read and write return void (Pieter Wuille)
50e8a9c Remove unused ReadVersion and WriteVersion (Pieter Wuille)
2018-01-15 06:14:15 +01:00
Jonas Schnelli
705057f0d6
Merge #9095 : test: Fix test_random includes
...
fa8278e test: Fix test_random includes (MarcoFalke)
2018-01-15 06:14:12 +01:00
Pieter Wuille
9b8cc0b1ce
Merge #9045 : Hash P2P messages as they are received instead of at process-time
...
fe1dc62 Hash P2P messages as they are received instead of at process-time (Matt Corallo)
2018-01-15 06:14:12 +01:00
Jonas Schnelli
2342b2ac00
Merge #9094 : qt: Use correct conversion function for boost::path datadir
...
e760b30 qt: Use correct conversion function for boost::path datadir (Wladimir J. van der Laan)
2018-01-15 06:13:44 +01:00
Wladimir J. van der Laan
293333481e
Merge #8981 : Wshadow: Do not shadow argument with a local variable
...
ff6639b Do not shadow local variable (Pavel Janík)
2018-01-15 06:13:44 +01:00
Alexander Block
4a19af7bd1
Use correct version for fee estimates db
2018-01-14 14:13:39 +01:00