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
Wladimir J. van der Laan
ca228f09ff
Merge #8168 : util: Add ParseUInt32 and ParseUInt64
...
e012f3c
util: Add ParseUInt32 and ParseUInt64 (Wladimir J. van der Laan)
2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
cfc76bab9a
Merge #8172 : Fix two warnings for comparison between signed and unsigned
...
77f63a4
Fix two warnings for comparison between signed and unsigned (Pieter Wuille)
2017-12-22 17:20:31 +01:00
Alexander Block
a60d4d64c6
Remove 'LDFLAGS=-static-libstdc++' from CONFIGFLAGS in gitian-linux.yml
...
This seems to have been re-added by accident in older out-of-order backports.
2017-12-22 17:20:28 +01:00
Alexander Block
80d02d8f5e
Use nRelevantServices for requiredServiceBits
...
Missed due to out of order backporting of network changes
2017-12-22 16:33:56 +01:00
Pieter Wuille
b3e26cc757
Merge #8083 : Add support for dnsseeds with option to filter by servicebits
...
2d83013d
Add support for dnsseeds with option to filter by servicebits (Jonas Schnelli)
2017-12-22 16:33:56 +01:00
Pieter Wuille
361d26037b
Merge #8173 : Use SipHash for node eviction (cont'd)
...
eebc232
test: Add more test vectors for siphash (Wladimir J. van der Laan)
8884830
Use C++11 thread-safe static initializers (Pieter Wuille)
c31b24f
Use 64-bit SipHash of netgroups in eviction (Pieter Wuille)
9bf156b
Support SipHash with arbitrary byte writes (Pieter Wuille)
053930f
Avoid recalculating vchKeyedNetGroup in eviction logic. (Patrick Strateman)
2017-12-22 16:33:56 +01:00
Wladimir J. van der Laan
fc7b5778f1
Merge #7993 : [depends] Bump Freetype, ccache, ZeroMQ, miniupnpc, expat
...
6a4cf16
[depends] expat 2.1.1 (fanquake)
3e0587b
[depends] miniupnpc 2.0 (fanquake)
87b8175
[depends] Latest config.guess & config.sub (fanquake)
bd3cbd5
[depends] ZeroMQ 4.1.4 (fanquake)
0385202
[depends] ccache 3.2.5 (fanquake)
2b2d52e
[depends] Freetype 2.6.3 (fanquake)
2017-12-22 16:33:56 +01:00
Wladimir J. van der Laan
05419aba3c
Merge #8153 : [rpc] fundrawtransaction feeRate: Use BTC/kB
...
fa7f4f5
[rpc] fundrawtransaction feeRate: Use BTC/kB (MarcoFalke)
faf82e8
[rpc] fundrawtransaction: Fix help text and interface (MarcoFalke)
2017-12-22 16:33:56 +01:00
Wladimir J. van der Laan
ca699cebaa
Merge #8126 : std::shared_ptr based CTransaction storage in mempool
...
288d85d
Get rid of CTxMempool::lookup() entirely (Pieter Wuille)
c2a4724
Optimization: use usec in expiration and reuse nNow (Pieter Wuille)
e9b4780
Optimization: don't check the mempool at all if no mempool req ever (Pieter Wuille)
dbfb426
Optimize the relay map to use shared_ptr's (Pieter Wuille)
8d39d7a
Switch CTransaction storage in mempool to std::shared_ptr (Pieter Wuille)
1b9e6d3
Add support for unique_ptr and shared_ptr to memusage (Pieter Wuille)
2017-12-22 16:33:56 +01:00
Pieter Wuille
51fa05ac33
Merge #8082 : Defer inserting into maprelay until just before relaying.
...
4d8993b
Defer inserting into maprelay until just before relaying. (Gregory Maxwell)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
881d8329ca
Merge #7703 : tor: Change auth order to only use password auth if -torpassword
...
2e49448
tor: Change auth order to only use HASHEDPASSWORD if -torpassword (Wladimir J. van der Laan)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
00c84ca53e
Merge #8065 : Addrman offline attempts
...
6182d10
Do not increment nAttempts by more than one for every Good connection. (Gregory Maxwell)
c769c4a
Avoid counting failed connect attempts when probably offline. (Gregory Maxwell)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
2ee817fb0d
Merge #8078 : Disable the mempool P2P command when bloom filters disabled
...
3d3602f
Add RPC test for the p2p mempool command in conjunction with disabled bloomfilters (Jonas Schnelli)
beceac9
Disable the mempool P2P command when bloom filters disabled (Peter Todd)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
0b8169d498
Merge #8164 : [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue
...
86efa30
[Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue (Jonas Schnelli)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
9af87c8269
Merge #7957 : [RPC][Bitcoin-TX] Add support for sequence number
...
ae357d5
[Bitcoin-Tx] Add tests for sequence number support (Jonas Schnelli)
e59336f
[bitcoin-tx] allow to set nSequence number over the in= command (Jonas Schnelli)
a946bb6
[RPC] createrawtransaction: add option to set the sequence number per input (Jonas Schnelli)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
d5d25564cf
Merge #8136 : Log/report in 10% steps during VerifyDB
...
8b78486
Log/report in 10% steps during VerifyDB (Jonas Schnelli)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
7f0213ac3e
Merge #8118 : Reduce unnecessary hashing in signrawtransaction
...
bd0f413
Reduce unnecessary hashing in signrawtransaction (Jonas Nick)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
49c2e9702b
Merge #8151 : [init] Make feefilter option debug option
...
fa51a1d
[init] Make feefilter option debug option (MarcoFalke)
2017-12-22 16:33:55 +01:00