Commit Graph

14342 Commits

Author SHA1 Message Date
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
MarcoFalke
f831710f46 Merge #9139: Change sync_blocks to pick smarter maxheight (on top of #9196)
1126c85 [qa] Change sync_blocks to pick smarter maxheight (Russell Yanofsky)
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
UdjinM6
18cd14887f
Merge pull request #1852 from codablock/pr_backport_bitcoin_0.14-6
Backport missing PRs from Bitcoin 0.14 - Part 6
2018-01-16 16:13:49 +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
d0a39fbcf7 Use "Dash Core" instead of "dash-core" in some places and Dashify 2018-01-16 08:30:14 +01:00
Alexander Block
9170c0e9c3 Fix rpc tests
1. Missing TX fees in some tests. No-fee transactions stopped working because
   the free TX relay was set to 0
2. rawtransaction tests used "hash" instead of "txid". "hash" is only valid
   if SegWit changes are included.
2018-01-15 08:26:15 +01:00
Alexander Block
76d7730a59 Dashify ISSUE_TEMPLATE.md 2018-01-15 07:41:13 +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
796bed1247 Merge #9207: [Doc] Move comments above bash command in build-unix
69bc8e7 [Doc] Move comments above bash command (Amir Abrams)
2018-01-15 06:14:16 +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
2f95284863 Merge #9156: Add compile and link options echo to configure
d8274bc Add compile and link options echo to configure (Jonas Schnelli)
2018-01-15 06:14:16 +01:00
MarcoFalke
a9a2db9a53 Merge #9168: [qa] add assert_raises_message to check specific error message
307acdd [qa] add assert_raises_message to check specific error message (mrbandrews)
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
Wladimir J. van der Laan
e711f4ae23 Merge #9151: [qa] proxy_test: Calculate hardcoded port numbers
fa80ef8 [qa] proxy_test: Calculate hardcoded port numbers instead (MarcoFalke)
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
MarcoFalke
12883cfe4d Merge #9136: sync_blocks cleanup
7943b13 [qa] Avoid 2 list comprehensions in sync_blocks (Russell Yanofsky)
05e57cc [qa] Fix sync_blocks timeout argument (Russell Yanofsky)
fd6bb70 [qa] Improve sync_blocks error messages. (Russell Yanofsky)
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
8b7eeb610b Merge #9115: Mention reporting security issues responsibly
7d1de30 Mention reporting security issues responsibly (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
3a388d9c01 Merge #9097: [qa] Rework sync_* and preciousblock.py
fa97ccb [qa] util: Rework sync_*() (MarcoFalke)
fac1141 [qa] preciousblock: Use assert_equal and BitcoinTestFramework.__init__ (MarcoFalke)
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
56ed800843 Merge #8894: [Testing] Include fRelay in mininode version messages
e5d682f Fix mininode version message format (jnewbery)
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
Wladimir J. van der Laan
b64452a7a3 Revert "Check and enable -Wshadow by default."
This reverts commit fd5654cab1.

This is still causing too many warnings for some compiler combinations,
forget it for now.
2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
5917290514 Merge #8794: Enable -Wshadow by default
359bac7 Add notes about variable names and shadowing (Pavel Janík)
fd5654c Check and enable -Wshadow by default. (Pavel Janík)
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