Commit Graph

14422 Commits

Author SHA1 Message Date
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
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
Wladimir J. van der Laan
1121f2f951 Merge #9098: [qa] Handle zombies and cluttered tmpdirs
fab0f07 [qa] rpc-tests: Apply random offset to portseed (MarcoFalke)
fae19aa [qa] test_framework: Exit when tmpdir exists (MarcoFalke)
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
MarcoFalke
3d7bb9cf55 Merge #9077: [qa] Increase wallet-dump RPC timeout
e89614b [qa] Add more helpful RPC timeout message (Russell Yanofsky)
8463aaa [qa] Increase wallet-dump RPC timeout (Russell Yanofsky)
2018-01-15 06:14:11 +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
UdjinM6
a3325fc068
Merge pull request #1851 from codablock/pr_backport_bitcoin_0.14-5
Backport missing PRs from Bitcoin 0.14 - Part 5
2018-01-14 20:34:04 +03:00
Alexander Block
4a19af7bd1 Use correct version for fee estimates db 2018-01-14 14:13:39 +01:00
Alexander Block
fc95cbb49f Use nPowTargetSpacing in SendCoinsDialog::updateGlobalFeeVariables 2018-01-14 14:12:30 +01:00
Alexander Block
c5bfd21570 Fix version check in CBlockPolicyEstimator::Read 2018-01-14 14:06:46 +01:00
Alexander Block
12d8ed437c Dashify DIST_CONTRIB in Makefile.am 2018-01-14 14:04:38 +01:00
Alexander Block
d452018961 Dashify generatetoaddress help string 2018-01-13 18:34:53 +01:00
Wladimir J. van der Laan
6eaafa86b6 Merge #7730: Remove priority estimation
0bd581a add release notes for removal of priority estimation (Alex Morcos)
b2322e0 Remove priority estimation (Alex Morcos)
2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
9be592806d Merge #8709: Allow filterclear messages for enabling TX relay only.
1f951c6 Allow filterclear messages for enabling TX relay only. (R E Broadley)
2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
84559c0569 Merge #9052: Use RelevantServices instead of node_network in AttemptToEvict.
d32036a Use RelevantServices instead of node_network in AttemptToEvict. (Gregory Maxwell)
2018-01-13 13:44:40 +01:00
Alexander Block
29a59e518f Remove NodeEvictionCandidate constructor and revert to struct initializion
Matches Bitcoins style and makes upcoming backports easier
2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
05b34f49b4 Merge #8568: new var DIST_CONTRIB adds useful things for packagers from contrib
1ee6f91 new var DIST_CONTRIB adds useful things for packagers from contrib/ to EXTRA_DIST (nomnombtc)
2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
1188dd28ac Merge #9093: [doc] release-process: Mention GitHub release and archived release notes
faead5e [doc] release-process: Mention GitHub release and archived release notes (MarcoFalke)
2018-01-13 13:44:40 +01:00
MarcoFalke
47a7ec79fe Merge #9083: Enforcing consistency, 'gitian' to 'Gitian'
66ca6cd Enforcing consistency, 'gitian' to 'Gitian' (S. Matthew English)
2018-01-13 13:44:39 +01:00