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
Wladimir J. van der Laan
b2bd69a7a9
Merge #8142 : Improve CWallet API with new GetAccountPubkey function.
...
152ab23 Improve CWallet API with new GetAccountPubkey function. (Patrick Strateman)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
463a68d4a5
Merge #8007 : Minor locking improvements
...
f0fdda0 IsInitialBlockDownload: usually avoid locking (Kaz Wesley)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
d7d5d577f4
Merge #8137 : Improve CWallet API with new AccountMove function.
...
9dfaa1c Improve CWallet API with new AccountMove function. (Patrick Strateman)
2017-12-22 16:33:55 +01:00
Jonas Schnelli
7538795b1f
Merge #8143 : comment nit: miners don't vote
...
e39dc69 comment nit: miners don't vote (instagibbs)
2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
c69df9b82c
Merge #7967 : [RPC] add feerate option to fundrawtransaction
...
04eaa90 Add more clear interface for CoinControl.h regarding individual feerate (Jonas Schnelli)
3b35e48 [RPC] add feerate option to fundrawtransaction (Jonas Schnelli)
2017-12-22 16:33:55 +01:00
MarcoFalke
af51e591b4
Merge #8139 : Fix interrupted HTTP RPC connection workaround for Python 3.5+
...
f45f51e Fix interrupted HTTP RPC connection workaround for Python 3.5+ (Pieter Wuille)
2017-12-22 16:33:55 +01:00
Pieter Wuille
fb88e9b607
Merge #7997 : replace mapNextTx with slimmer setSpends
...
9805f4a mapNextTx: use pointer as key, simplify value (Kaz Wesley)
2017-12-22 16:33:55 +01:00
Pieter Wuille
df14a7f009
Merge #7825 : Prevent multiple calls to ExtractDestination
...
0bf6f30 Prevent multiple calls to ExtractDestination (Pedro Branco)
2017-12-22 16:33:52 +01:00
Jonas Schnelli
dbf4dc4de6
Merge #8029 : [Doc] Simplify OS X build notes
...
2692e1b [Doc] Simplify OS X build notes (fanquake)
2017-12-22 16:33:04 +01:00
Pieter Wuille
fefd0ace3e
Merge #8077 : Consensus: Decouple from chainparams.o and timedata.o
...
ee9f4a5 Consensus: Decouple from chainparams.o and timedata.o (Jorge Timón)
2017-12-22 16:33:04 +01:00
Pieter Wuille
bf069fb1bd
Merge #8123 : Use std::atomic for fRequestShutdown and fReopenDebugLog
...
a886dbf Use std::atomic for fRequestShutdown and fReopenDebugLog (Pieter Wuille)
16cf85f Revert "Include signal.h for sig_atomic_t in WIN32" (Pieter Wuille)
2017-12-22 16:33:04 +01:00
Pieter Wuille
09eda9783a
Merge #8112 : Include signal.h for sig_atomic_t in WIN32
...
88f14b9 Include signal.h for sig_atomic_t in WIN32 (Pieter Wuille)
2017-12-22 16:33:04 +01:00
Pieter Wuille
bad08eadf8
Merge #7960 : Only use AddInventoryKnown for transactions
...
383fc10 Only use AddInventoryKnown for transactions (Suhas Daftuar)
2017-12-22 16:33:04 +01:00
Alexander Block
433a026a15
Fix OpenSSL build error
2017-12-22 16:33:04 +01:00
Pieter Wuille
91752ab7ed
Merge #7689 : Replace OpenSSL AES with ctaes-based version
...
723779c build: Enumerate ctaes rather than globbing (Cory Fields)
34ed64a crypter: add tests for crypter (Cory Fields)
0a36b9a crypter: shuffle Makefile so that crypto can be used by the wallet (Cory Fields)
976f9ec crypter: add a BytesToKey clone to replace the use of openssl (Cory Fields)
9049cde crypter: hook up the new aes cbc classes (Cory Fields)
fb96831 crypter: constify encrypt/decrypt (Cory Fields)
1c391a5 crypter: fix the stored initialization vector size (Cory Fields)
daa3841 crypto: add aes cbc tests (Cory Fields)
27a212d crypto: add AES 128/256 CBC classes (Cory Fields)
6bec172 Add ctaes-based constant time AES implementation (Pieter Wuille)
a545127 Squashed 'src/crypto/ctaes/' content from commit cd3c3ac (Pieter Wuille)
2017-12-22 16:33:04 +01:00
Alexander Block
83dc1dc99c
Directly push messages instead of using CDataStream first
2017-12-22 16:33:04 +01:00
Pieter Wuille
e65bf228b0
Merge #8121 : [Doc] Update implemented BIPs list
...
e4f73c7 [Doc] Update implemented BIPs list (fanquake)
2017-12-22 16:33:03 +01:00
Wladimir J. van der Laan
dfa0bd2341
Merge #8080 : Do not use mempool for GETDATA for tx accepted after the last mempool req.
...
7e908c7 Do not use mempool for GETDATA for tx accepted after the last mempool req. (Gregory Maxwell)
2017-12-22 16:33:03 +01:00
Alexander Block
b2a27c0624
Only serve normal transactions from mapRelay
...
Bitcoin #7877 changed mapRelay to be indexed by hash instead of inv. This
means that we may end up with a false-positive match here and send out an
instant transaction as normal transaction.
2017-12-22 16:33:03 +01:00
Wladimir J. van der Laan
bef036125f
Merge #7877 : Change mapRelay to store CTransactions
...
38c3102 Change mapRelay to store CTransactions (Pieter Wuille)
2017-12-22 16:33:03 +01:00
Alexander Block
2dc71e8e08
Revert deadlock fix in ProcessGetData
...
Fix was introdeced in:
https://github.com/dashpay/dash/pull/1169
A fix was later applied to fix a race condition:
https://github.com/dashpay/dash/pull/1178
This has to be reverted to be able to backport multiple changes from Bitcoin.
Later backported PRs from Bitcoin will remove cs_mapRelay and thus also
remove the deadlock that was initially fixed with the above PRs.
2017-12-22 16:33:03 +01:00
Wladimir J. van der Laan
d8c5a59005
Merge #8090 : Adding P2SH(p2pkh) script test case
...
b682960 Adding P2SH(p2pkh) script test case (Chris Stewart)
2017-12-22 16:33:03 +01:00
UdjinM6
af1233cb48
Merge pull request #1804 from codablock/pr_backport_bitcoin_0.13-4
...
Backport missing PRs from Bitcoin 0.13 - Part 4
2017-12-22 17:21:33 +03:00
Alexander Block
34b7fdddee
Dashify benchmarking.md binary name
2017-12-22 14:32:53 +01:00