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
3dcbfc744a
Merge #9580 : Fix various minor linearization script issues
...
b9d95bd
Fix various minor linearization script issues (Douglas Roark)
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
UdjinM6
4052401865
Merge pull request #1859 from codablock/pr_backport_bitcoin_0.14-9
...
Backport missing PRs from Bitcoin 0.14 - Part 9
2018-01-22 16:15:51 +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
Alexander Block
4d651621ef
Update mainnet chainparams to use correct heights for BIP34/BIP65/BIP66
2018-01-21 14:29:06 +01:00
Alexander Block
3824192e42
Update testnet chainparams to use correct heights for BIP34/BIP65/BIP66
2018-01-21 14:29:06 +01:00
Alexander Block
715be73c6f
Fix listsinceblock.py
2018-01-21 14:14:34 +01:00
Alexander Block
9bc404a8cc
Add "setbip69enabled" RPC usable by tests only
...
Needed by fundrawtransaction tests which rely on the ordering not being
changed.
2018-01-21 14:14:34 +01:00
Russell Yanofsky
6bee150e8e
Require timestamps for importmulti keys
...
Additionally, accept a "now" timestamp, to allow avoiding rescans for keys
which are known never to have been used.
Note that the behavior when "now" is specified is slightly different than the
previous behavior when no timestamp was specified at all. Previously, when no
timestamp was specified, it would avoid rescanning during the importmulti call,
but set the key's nCreateTime value to 1, which would not prevent future block
reads in later ScanForWalletTransactions calls. With this change, passing a
"now" timestamp will set the key's nCreateTime to the current block time
instead of 1.
Fixes #9491
2018-01-21 14:14:34 +01:00
Alexander Block
611cb6f275
Fix new dash-tx tests
2018-01-21 14:14:34 +01:00
Alexander Block
86753a890d
Add spaces around + in updateGlobalFeeVariables
2018-01-21 14:14:34 +01:00
Alexander Block
228d774a64
Fix use of distdir and docker build dir
2018-01-21 14:14:34 +01:00
Alexander Block
771c56a79b
Fix new bitcoin-util-tests
2018-01-21 14:14:33 +01:00
Alexander Block
9e13bb393d
Fix transaction_tests.cpp
2018-01-21 14:14:33 +01:00
Alexander Block
cd0c910a88
Use new data structures for devnet checkpointData/chainTxData
2018-01-21 14:14:33 +01:00
Wladimir J. van der Laan
2cdafa0ca2
Merge #9671 : Fix super-unlikely race introduced in 236618061a
...
885cfdd
Fix super-unlikely race introduced in 236618061a
(Matt Corallo)
2018-01-21 14:14:33 +01:00
MarcoFalke
4f6de16976
Merge #9525 : test: Include tx data in EXTRA_DIST
...
fa29736
test: Include tx data in EXTRA_DIST (MarcoFalke)
2018-01-21 14:14:33 +01:00
MarcoFalke
dd5ccf1cba
Merge #9406 : Re-enable a blank v1 Tx JSON test
...
b371732
Re-enable a blank v1 Tx JSON test (Douglas Roark)
2018-01-21 14:14:33 +01:00
Wladimir J. van der Laan
a757261e89
Merge #9646 : depends: Fix cross build for qt5.7
...
b5f374f
qt: fix build with zlib for target (Cory Fields)
8efa34f
depends: add a zlib build (Cory Fields)
342eb96
build: find qt's renamed helper libs from 5.7 (Cory Fields)
2018-01-21 12:48:34 +01:00
MarcoFalke
660c027cd5
Merge #9510 : [trivial] Fix typos in comments
...
cc16d99
[trivial] Fix typos in comments (practicalswift)
2018-01-21 12:48:34 +01:00
Wladimir J. van der Laan
edf3a00a29
Merge #9638 : qa: Actually test assertions in pruning.py
...
fab035f
qa: Actually test assertions in pruning.py (MarcoFalke)
2018-01-21 12:48:34 +01:00
Wladimir J. van der Laan
007dc59762
Merge #9637 : [Qt] fix transaction details output-index to reflect vout index
...
04b8773
[Qt] fix transaction details output-index to reflect vout index (Jonas Schnelli)
2018-01-21 12:48:34 +01:00
Wladimir J. van der Laan
6070cf111b
Merge #9519 : Exclude RBF replacement txs from fee estimation
...
de1ae32
Exclude RBF txs from fee estimation (Alex Morcos)
2018-01-21 12:48:34 +01:00
Wladimir J. van der Laan
e09d5db455
Merge #9574 : [depends] Fix QT build on OSX
...
c36ec71
depends: qt: disable printer for all platforms, not just osx (Cory Fields)
2018-01-21 12:48:34 +01:00
MarcoFalke
5a84b27dc1
Merge #9628 : qa: Increase a sync_blocks timeout in pruning.py
...
2f10f06
qa: Increase a sync_blocks timeout in pruning.py (Suhas Daftuar)
2018-01-21 12:48:34 +01:00
Jonas Schnelli
ccd81a00fc
Merge #9624 : [Trivial] fix logging typo in FlushStateToDisk()
...
ac9a846
[Trivial] fix logging typo in FlushStateToDisk() (John Newbery)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
ef6297cdd6
Merge #9617 : [Trivial] Update license year range to 2017
...
be31a2b
[Trivial] Update license year range to 2017 (Lauda)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
dc523a1649
Merge #9371 : Notify on removal
...
094e4b3
Better document usage of SyncTransaction (Alex Morcos)
4afbde6
Introduce MemPoolConflictRemovalTracker (Alex Morcos)
ff25c32
mempool: add notification for added/removed entries (Wladimir J. van der Laan)
2018-01-21 12:48:33 +01:00
Pieter Wuille
3b2a26c4e7
Merge #9596 : [bugfix] save feeDelta instead of priorityDelta in DumpMempool
...
bd92f24
[bugfix] save feeDelta instead of priorityDelta in DumpMempool (Alex Morcos)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
119c3fe62f
Merge #9516 : Bug-fix: listsinceblock: use fork point as reference for blocks in reorg'd chains
...
7ba0a00
Testing: listsinceblock should not use orphan block height. (Karl-Johan Alm)
ee5c1ce
Bug-fix: listsinceblock: use closest common ancestor when a block hash was provided for a chain that was not the main chain. (Karl-Johan Alm)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
96b4910fbe
Merge #9607 : Remove redundant semicolons in Python code
...
5cdf106
Remove redundant semicolons in Python code (practicalswift)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
9ba8a31d03
Merge #9583 : Move wallet callbacks into cs_main (this effectively reverts #7946 )
...
9899893
Move wallet callbacks into cs_main (this effectively reverts #7946 ) (Matt Corallo)
2018-01-21 12:48:33 +01:00
MarcoFalke
6bc16a66fb
Merge #9610 : [Trivial] Grammar and typo correction (laudaa)
...
5c66d41
[Trivial] Grammar and typo correction (Lauda)
2018-01-21 12:48:33 +01:00
MarcoFalke
cd04ccd2d9
Merge #9554 : [test] Avoid potential NULL pointer dereference in addrman_tests.cpp
...
afab9f4
[test] Avoid potential NULL pointer dereference in addrman_tests.cpp (practicalswift)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
c431a7f07a
trivial: squash missing field 'argNames' initializer warning in qt tests
...
The additional initializer is for the named arguments, which are unused
in the test (and unfilled global fields will be initialized to 0
anyhow), so this is a no-op apart from the warning.
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
36109e0580
Merge #9377 : fundrawtransaction: Keep change-output keys by default, make it optional
...
c9f3062
Add fundrawtransactions new reserveChangeKey option to the release notes (Jonas Schnelli)
9eb325d
[QA] Add test for fundrawtransactions new reserveChangeKey option (Jonas Schnelli)
9aa4e6a
[Wallet] Add an option to keep the change address key, true by default (Jonas Schnelli)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
f8b880f4d8
Merge #9535 : Split CNode::cs_vSend: message processing and message sending
...
376b3c2
Make the cs_sendProcessing a LOCK instead of a TRY_LOCK (Matt Corallo)
d7c58ad
Split CNode::cs_vSend: message processing and message sending (Matt Corallo)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
a84f8da136
Merge #9498 : Basic CCheckQueue Benchmarks
...
aad4cb5
Address ryanofsky feedback on CCheckQueue benchmarks. Eliminated magic numbers, fixed scoping of vectors (and memory movement component of benchmark). (Jeremy Rubin)
9f03110
Add Basic CheckQueue Benchmark (Jeremy Rubin)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
3f360d3e24
Merge #9542 : Docs: Update CONTRIBUTING.md
...
c70622e
Docs: Update CONTRIBUTING.md (John Newbery)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
78a7a9f30b
Merge #9552 : Add IPv6 support to qos.sh
...
fc089ae
Add IPv6 support to qos.sh (James White)
2018-01-21 12:48:33 +01:00