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
Wladimir J. van der Laan
197fbea84b
Merge #9512 : Fix various things -fsanitize complains about
...
82e8baa
Avoid boost dynamic_bitset in rest_getutxos (Pieter Wuille)
99f001e
Fix memory leak in multiUserAuthorized (Pieter Wuille)
5a0b7e4
Fix memory leak in net_tests (Pieter Wuille)
6b03bfb
Fix memory leak in wallet tests (Pieter Wuille)
f94f3e0
Avoid integer overflows in scriptnum tests (Pieter Wuille)
843c560
Avoid unaligned access in crypto i/o (Pieter Wuille)
2018-01-21 12:48:33 +01:00
MarcoFalke
be63fb7953
Merge #9508 : Remove unused Python imports
...
95bab82
Remove unused Python imports (practicalswift)
2018-01-21 12:48:33 +01:00
Pieter Wuille
3bd155bd5c
Merge #9561 : Wake message handling thread when we receive a new block
...
241d893
Wake message handling thread when we receive a new block (Matt Corallo)
f13914a
Make WakeMessageHandler public (Matt Corallo)
2018-01-21 12:48:33 +01:00
Alexander Block
2adb35533f
Add assumevalid testcase
...
Missed in original backport of assumevalid
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
40dff103de
Merge #9380 : Separate different uses of minimum fees
...
eb30d1a
Introduce -dustrelayfee (Alex Morcos)
7b1add3
Introduce -incrementalrelayfee (Alex Morcos)
daec955
Introduce -blockmintxfee (Alex Morcos)
2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
87229e06c2
Merge #9469 : [depends] Qt 5.7.1
...
bb077fa
[depends] Remove OBJCXX define from config.site.in (fanquake)
c37ea4d
depends: fix qt translations build (Cory Fields)
2b32dea
depends: use new variable layout for qt sdk (Cory Fields)
02fcb29
[depends] Qt 5.7.1 (fanquake)
2018-01-21 12:48:32 +01:00
Pieter Wuille
ad9b9251ac
Merge #9490 : Replace FindLatestBefore used by importmuti with FindEarliestAtLeast.
...
4b06e41
Add unit test for FindEarliestAtLeast (Suhas Daftuar)
997a98a
Replace FindLatestBefore used by importmuti with FindEarliestAtLeast. (Gregory Maxwell)
2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
4408b2d147
Merge #9222 : Add 'subtractFeeFromAmount' option to 'fundrawtransaction'.
...
453bda6
Add 'subtractFeeFromOutputs' option to 'fundrawtransaction'. (Chris Moore)
2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
5b763faba3
Merge #9468 : [Depends] Dependency updates for 0.14.0
...
7f1fa99
[depends] native_ds_store 1.1.0 (fanquake)
c6347ae
[depends] dbus 1.10.14 (fanquake)
a4c6da0
[depends] ccache 3.3.3 (fanquake)
6019d21
[depends] FreeType 2.7.1 (fanquake)
4ed6faf
[depends] Boost 1.63.0 (fanquake)
8ac1830
[depends] Latest config.guess and config.sub (fanquake)
2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
74bfe0b223
Merge #9261 : Add unstored orphans with rejected parents to recentRejects
...
dfbe0d5
Add unstored orphans with rejected parents to recentRejects (Alex Morcos)
2018-01-21 12:48:32 +01:00
Alexander Block
53820de3ef
Remove SegWit related code in dash-tx
2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
a0d089eda1
Merge #8883 : Add all standard TXO types to bitcoin-tx
...
0c50909
testcases: explicitly specify transaction version 1 (John Newbery)
b7e144b
Add test cases to test new bitcoin-tx functionality (jnewbery)
61a1534
Add all transaction output types to bitcoin-tx. (jnewbery)
1814b08
add p2sh and segwit options to bitcoin-tx outscript command (Stanislas Marion)
2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
658479355e
Merge #9472 : Disentangle progress estimation from checkpoints and update it
...
df36371
Update estimated transaction count data (Pieter Wuille)
e356d9a
Shorten variable names and switch to tx/s (Pieter Wuille)
6dd8116
Remove SIGCHECK_VERIFICATION_FACTOR (Pieter Wuille)
3641141
Move tx estimation data out of CCheckPointData (Pieter Wuille)
a4bac66
[MOVEONLY] Move progress estimation out of checkpoints (Pieter Wuille)
2018-01-21 12:48:32 +01:00
MarcoFalke
cee8cf1be6
Merge #9518 : Return height of last block pruned by pruneblockchain RPC
...
918d1fb
Return height of last block pruned by pruneblockchain RPC (Russell Yanofsky)
2018-01-21 12:48:32 +01:00
MarcoFalke
294b8f70e2
Merge #9520 : Deprecate non-txindex getrawtransaction and better warning
...
db904db
Deprecate non-txindex getrawtransaction and better warning (Pieter Wuille)
2018-01-21 12:48:32 +01:00
MarcoFalke
7dfcb15e64
Merge #9416 : travis: make distdir before make
...
faaf3ca
travis: make distdir before make (MarcoFalke)
2018-01-21 12:48:32 +01:00
MarcoFalke
a0438d5347
Merge #9297 : Various RPC help outputs updated
...
54ee3fc
RPC help updated (Michael Rotarius)
2018-01-21 12:48:32 +01:00
Pieter Wuille
819ea7484e
Merge #9507 : Fix use-after-free in CTxMemPool::removeConflicts()
...
fe7e593
Fix use-after-free in CTxMemPool::removeConflicts() (Suhas Daftuar)
2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
88b9aa45de
Merge #7871 : Manual block file pruning.
...
afffeea
fixup! Add pruneblockchain RPC to enable manual block file pruning. (Russell Yanofsky)
1fc4ec7
Add pruneblockchain RPC to enable manual block file pruning. (mrbandrews)
2018-01-21 12:48:32 +01:00
Alexander Block
6132bfbe23
Use version 2 blocks for miner_tests
...
This is needed because Dashs chainparams start BIP34 on block 1 and
the removal of IsSuperMajority results in the checks to trigger
immediately in tests.
Also update miner_tests nonces
2018-01-21 12:48:31 +01:00
Alexander Block
56ff71fcec
Update devnet to activate BIP34/BIP65/BIP66 immediately
2018-01-21 12:48:31 +01:00
Wladimir J. van der Laan
7321bfdd6b
Merge #8391 : Consensus: Remove ISM
...
122786d
Consensus: Remove ISM (NicolasDorier)
2018-01-20 09:22:40 +01:00
MarcoFalke
17d375e712
Merge #9436 : test: Include tx data in EXTRA_DIST
...
fa558be
test: Include tx data in EXTRA_DIST (MarcoFalke)
2018-01-20 09:22:39 +01:00
Wladimir J. van der Laan
b72f9249d9
Merge #9376 : Remove unused test files and references
...
9cb6624
Fix testfile reference (BtcDrak)
23208ac
Remove unused test files and references (BtcDrak)
2018-01-20 09:22:39 +01:00
Wladimir J. van der Laan
0fc37e8c56
Merge #7562 : Bump transaction version default to 2
...
c5c92c4
Update python tests for default tx version=2 (BtcDrak)
dab207e
Preserve tx version=1 for certain tests (BtcDrak)
c5d746a
tiny test fix for mempool_tests (Alex Morcos)
1f0ca1a
Bump default transaction version to 2 (BtcDrak)
2018-01-20 09:22:38 +01:00
Wladimir J. van der Laan
71e3e37d91
Merge #8837 : allow bitcoin-tx to parse partial transactions
...
7451cf5
Allow bitcoin-tx to parse partial transactions (jnewbery)
2018-01-20 09:21:41 +01:00
Pieter Wuille
3235aad493
Implement SipHash in Python
2018-01-20 09:21:13 +01:00
UdjinM6
8e9bae9542
Merge pull request #1858 from codablock/pr_backport_bitcoin_0.14-8
...
Backport missing PRs from Bitcoin 0.14 - Part 8
2018-01-18 22:57:28 +03:00