Wladimir J. van der Laan
3f7273d009
Merge #8256 : BUG: bitcoin-qt crash
...
d7828ab
check that transactionView->selectionModel()->selectedRows(0) exists (fsb4000)
2017-12-28 11:44:59 +01:00
MarcoFalke
5a844dcc49
Merge #8254 : [doc] Add OSX ZMQ requirement to QA readme
...
d241487
[doc] Add OS X ZMQ requirement to QA readme (fanquake)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
b7b5d6ea7b
Merge #8246 : trivial: capitalize BIP32 in option help
...
a1c92c2
trivial: capitalize BIP32 in option help (Wladimir J. van der Laan)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
e51f505449
Merge #8222 : Enable mempool consistency checks in unit tests
...
3775ff9
Enable mempool consistency checks in unit tests (Pieter Wuille)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
381629c757
Merge #8229 : [Doc] Update OS X build notes for 10.11 SDK
...
e5a680d
[Doc] Update OS X build notes for 10.11 SDK (fanquake)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
e2bcf8ae0c
Merge #8216 : [qa] assert 'changePosition out of bounds'
...
fa58f94
[qa] pull-tester: Start longest test first (MarcoFalke)
fa3b379
[qa] pull-tester: Fix assertion and check for run_parallel (MarcoFalke)
fa32465
[qa] fundrawtransaction: Create get_unspent() (MarcoFalke)
fa8ce3b
[qa] assert 'changePosition out of bounds' (MarcoFalke)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
c2dabf8bd8
Merge #8220 : Stop trimming when mapTx is empty
...
ad0752e
Stop trimming when mapTx is empty (Pieter Wuille)
2017-12-28 11:44:59 +01:00
Alexander Block
36aa554584
Temporarily fix build error cased by out-of-order backporting
...
Can be removed when we catch up with backporting. You'll notice it's time
for this when you get conflicts while merging the affected backported PR.
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
808936cc30
Merge #8179 : Evict orphans which are included or precluded by accepted blocks.
...
54326a6
Increase maximum orphan size to 100,000 bytes. (Gregory Maxwell)
8c99d1b
Treat orphans as implicit inv for parents, discard when parents rejected. (Gregory Maxwell)
11cc143
Adds an expiration time for orphan tx. (Gregory Maxwell)
db0ffe8
This eliminates the primary leak that causes the orphan map to always grow to its maximum size. (Gregory Maxwell)
1b0bcc5
Track orphan by prev COutPoint rather than prev hash (Pieter Wuille)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
573d9314e8
Merge #7713 : Fixes for verify-commits script
...
1e9aab0
Remove sipa's old revoked key from verify-commits (Peter Todd)
966151e
Add README for verify-commits (Peter Todd)
11164ec
Remove keys that are no longer used for merging (Peter Todd)
22421fa
Remove pointless warning (Peter Todd)
9523e8a
Make verify-commits path-independent (Matt Corallo)
f7d4a25
Make verify-commits POSIX-compliant (Matt Corallo)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
d2c3b7efef
Merge #7687 : Stop treating importaddress'ed scripts as change
...
595b22e
Stop treating importaddress'ed scripts as change (Pieter Wuille)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
782745b05b
Merge #8066 : [qa] test_framework: Use different rpc_auth_pair for each node
...
fad1845
[qa] test_framework: Use different rpc_auth_pair for each node (MarcoFalke)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
68757db683
Merge #8210 : [Qt] Bump to Qt5.6.1
...
2759597
Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli)
59d063d
Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli)
6194d9a
Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli)
f6eb4e2
[depends] OpenSSL 1.0.1k - update config_opts (fanquake)
f25209a
depends: bump OSX toolchain (Cory Fields)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
05684db6e3
Merge #8203 : Clarify documentation for running a tor node
...
9e3ec74
Clarify documentation for running a tor node (Nathaniel Mahieu)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
b6d8206c20
Merge #8224 : readme: Omit phrasing; 'new'
...
7734479
readme: Omit phrasing; 'new' (Will Binns)
2017-12-28 11:44:59 +01:00
MarcoFalke
46473757ee
Merge #8215 : [wallet] tests: Don't use floating point
...
faa91b1
[wallet] tests: Don't use floating point (MarcoFalke)
2017-12-28 11:44:59 +01:00
MarcoFalke
6227cfdad5
Merge #8214 : [qa] mininode: fail on send_message instead of silent return
...
facb6c0
[qa] mininode: fail on send_message instead of silent return (MarcoFalke)
2017-12-28 11:44:59 +01:00
Pieter Wuille
f362c610e4
Merge #7600 : Mining: Select transactions using feerate-with-ancestors
...
29fac19
Add unit tests for ancestor feerate mining (Suhas Daftuar)
c82a4e9
Use ancestor-feerate based transaction selection for mining (Suhas Daftuar)
2017-12-28 11:44:59 +01:00
Alexander Block
79ad5f7682
Bump univalue version
...
This was probably missed while backporting Bitcoin PR #7892
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
c783b39ce7
Merge #8171 : [RPC] Fix createrawtx sequence number unsigned int parsing
...
6fa950a
[RPC] Fix createrawtx sequence number unsigned int parsing (Jonas Schnelli)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
402eb55732
Merge #8208 : Do not set extra flags for unfiltered DNS seed results
...
bc0a895
Do not set extra flags for unfiltered DNS seed results (Pieter Wuille)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
9875ab5353
Merge #8207 : [trivial] Add a link to the Bitcoin-Core repository and website to the About Dialog
...
fa58e5e
[doc] Add website links to about dialog (MarcoFalke)
2017-12-28 11:44:59 +01:00
Jonas Schnelli
96180a1896
Merge #7636 : Add bitcoin address label to request payment QR code
...
1c2a1ba
Add address label to request payment QR Code (QT) (Francesco 'makevoid' Canessa)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
62852538e1
Merge #8198 : [trivial] Sync ax_pthread with upstream draft4
...
0e209f9
[trivial] Sync ax_pthread with upstream draft (fanquake)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
61a667fc49
Merge #8194 : [gitian] set correct PATH for wrappers
...
fa61756
[gitian] set correct PATH for wrappers (MarcoFalke)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
2b4e896f60
Merge #8197 : [trivial] Ignore split-debug.sh
...
01a9904
[trivial] Ignore split-debug.sh (fanquake)
2017-12-28 11:44:59 +01:00
Alexander Block
fa25499868
Swap iterations and fUseInstantSend parameters in ApproximateBestSubset ( #1819 )
...
#1695 introduced a fix for a instant send related edge case. Somehow the
parameters got mixed up and fUseInstantSend was passed as "iterations".
2017-12-28 03:49:05 +03:00
Alexander Block
d9058aa04d
Increase travis timeout for "wine src/test/test_dash.exe" call ( #1820 )
...
There are timeouts happening on Travis now. Increasing travis_wait to 60
minutes.
2017-12-28 03:47:23 +03:00
Alexander Block
10786fe8e8
Use travis_wait for "wine test_dash.exe" call to fix timeouts ( #1812 )
...
* Revert "Adjust tests to avoid Travis timeouts (#1745 )"
This reverts commit 32f21698e8
.
* Revert "Show test progress for tests running in wine to avoid Travis timeout (#1740 )"
This reverts commit 31bc9d4ee8
.
* Use travis_wait when calling "wine test_dash.exe"
2017-12-27 20:41:24 +03:00
Alexander Block
4bce3bf8b2
Fix crash on exit when -createwalletbackups=0 ( #1810 )
2017-12-27 20:41:04 +03:00
UdjinM6
c49480445e
Merge pull request #1811 from codablock/pr_backport_bitcoin_0.13-5
...
Backport missing PRs from Bitcoin 0.13 - Part 5
2017-12-27 19:34:49 +03:00
Alexander Block
0c61226347
Also revert BLOCK_DOWNLOAD_TIMEOUT_PER_PEER to 500000
...
Same reason as for reverting BLOCK_DOWNLOAD_TIMEOUT_BASE
2017-12-27 14:07:52 +01:00
Alexander Block
c7937c202e
Remove unnecessary call to AddInventoryKnown in INV message handling
...
This should have been part of Bitcoin #7960 but was missed in merge
conflict resolution.
2017-12-27 14:07:19 +01:00
Alexander Block
e3ca41b1cb
Dashify build-osx.md
2017-12-27 14:00:45 +01:00
Alexander Block
49f9d613b0
Revert to BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000
...
This value is in "millionths of the block interval" and in Bitcoin it's set
to exactly 1000000, meaning one full block interval. It still has to be
1000000 for Dash, even though the block intervall is less.
This fixes test failures in p2p-fullblocktest.py when large reorgs are
tested. These take quite some time and did timeout.
2017-12-22 19:35:34 +01:00
Alexander Block
f00aeb87c8
Fix failing test in p2p-fullblocktest.py
2017-12-22 19:35:34 +01:00
Alexander Block
05c8f2ee2c
Dashify new tests in bitcoin-util-test.json
2017-12-22 19:35:34 +01:00
Wladimir J. van der Laan
2e51d82735
Merge #8201 : [qa] fundrawtransaction: Fix race, assert amounts
...
fae1d06
[qa] fundrawtransaction: Fix race, assert amounts (MarcoFalke)
fa26c42
[qa] util: Move check_fee_amount out of wallet.py (MarcoFalke)
2017-12-22 17:20:43 +01:00
Wladimir J. van der Laan
e7e3a80712
Merge #8141 : Continuing port of java comparison tool
...
ff2dcf2
Tests: Edit bloated varint test and add option for 'barely expensive' tests (mrbandrews)
12c5a16
Catch exceptions from non-canonical encoding and print only to log (mrbandrews)
291f8aa
Continuing port of java comptool (mrbandrews)
8c9e681
Tests: Rework blockstore to avoid re-serialization. (mrbandrews)
2017-12-22 17:20:43 +01:00
Wladimir J. van der Laan
6a698300ab
Merge #7598 : Refactor CreateNewBlock to be a method of the BlockAssembler class
...
c2dd5a3
FIX: correctly measure size of priority block (Alex Morcos)
a278764
FIX: Account for txs already added to block in addPriorityTxs (Alex Morcos)
4dc94d1
Refactor CreateNewBlock to be a method of the BlockAssembler class (Alex Morcos)
2017-12-22 17:20:43 +01:00
Wladimir J. van der Laan
6ef8aae768
Merge #8193 : [trivial][doc] Use Debian 8.5 in the gitian-build guide
...
b0938a0
[trivial][doc] Use Debian 8.5 in the gitian-build guide (fanquake)
2017-12-22 17:20:43 +01:00
Wladimir J. van der Laan
06a73ad7c4
Merge #8188 : Add armhf/aarch64 gitian builds
...
9d25362
build: add armhf/aarch64 gitian builds (Cory Fields)
980e7eb
depends: only build qt on linux for x86_64/x86 (Cory Fields)
2017-12-22 17:20:42 +01:00
Wladimir J. van der Laan
acbda5d16d
Merge #8177 : developer notes: updates for C++11
...
654a211
developer notes: updates for C++11 (Kaz Wesley)
2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
b95a338b30
Merge #8133 : build: Finish up out-of-tree changes
...
d1a3d57
bulid: fix "make translate" when out-of-tree (Cory Fields)
340012d
build: add temporary fix for "bad magic number" error in out-of-tree builds (Cory Fields)
142ffc7
travis: use out-of-tree build (Cory Fields)
92e37a3
build: fix out-of-tree 'make deploy' for osx (Cory Fields)
ab95d5d
build: a few ugly hacks to get the rpc tests working out-of-tree (Cory Fields)
fc4ad0c
build: more out-of-tree fixups (Cory Fields)
0cb0f26
build: out-of-tree fixups (Cory Fields)
2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
79db88bbb1
Merge #8181 : build: Get rid of CLIENT_DATE
...
d096d22
build: Get rid of `CLIENT_DATE` (Wladimir J. van der Laan)
2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
209a4d63bd
Merge #8178 : Add git and github tips and tricks to developer notes
...
3144449
Add git and github tips and tricks to developer notes (Pieter Wuille)
2017-12-22 17:20:31 +01:00
Pieter Wuille
b9a00f6294
Merge #7292 : [RPC] Expose ancestor/descendant information over RPC
...
176e19b
Mention new RPC's in release notes (Suhas Daftuar)
7f6eda8
Add ancestor statistics to mempool entry RPC output (Suhas Daftuar)
a9b8390
Add test coverage for new RPC calls (Suhas Daftuar)
b09b813
Add getmempoolentry RPC call (Suhas Daftuar)
0dfd869
Add getmempooldescendants RPC call (Suhas Daftuar)
8f7b5dc
Add getmempoolancestors RPC call (Suhas Daftuar)
5ec0cde
Refactor logic for converting mempool entries to JSON (Suhas Daftuar)
2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
856e546785
Merge #7283 : [gitian] Default reference_datetime to commit author date
...
fa42a67
[gitian] hardcode datetime for depends (MarcoFalke)
fa58c76
[gitian] Default reference_datetime to commit author date (MarcoFalke)
2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
2e3aacf43f
Merge #8166 : src/test: Do not shadow local variables
...
c2715d3
Do not shadow local variables (Pavel Janík)
2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
aa6cb48bfa
Merge #8154 : drop vAddrToSend after sending big addr message
...
d3d02d5
drop vAddrToSend after sending big addr message (Kaz Wesley)
2017-12-22 17:20:31 +01:00