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
Alexander Block
475dbd49be
Pass sys.stdout to Popen instead of subprocess.STDOUT
...
For some reason, subprocess.STDOUT is completely ignored when run on
Travis. Using sys.stdout however works as expected.
2017-12-22 08:51:30 +01:00
Wladimir J. van der Laan
a0481f1ed0
Merge #8750 : [qa] Refactor RPCTestHandler to prevent TimeoutExpired
...
dddd04f [qa] Refactor RPCTestHandler to prevent TimeoutExpired (MarcoFalke)
2017-12-22 06:33:01 +01:00
Alexander Block
5496e468a6
Dashify a few docs and the use of an address
2017-12-22 06:09:04 +01:00
Alexander Block
5ba21d4e33
Revert "ReprocessBlocks"->"ResetBlockFailureFlags" in debug message
2017-12-22 06:08:29 +01:00
Alexander Block
b1df5e9e87
Align sorting in OverviewPage::SetupTransactionList with transaction view
2017-12-22 06:03:27 +01:00
Alexander Block
abe84cb9ec
Use GetStrongRandBytes in CMnemonic::Generate
2017-12-22 06:00:51 +01:00
Alexander Block
249167ab86
Python 3 in .travis.yml
2017-12-22 05:40:36 +01:00
Alexander Block
a1111cdf65
Dashify addresses/keys in signmessages.py RPC test
2017-12-21 20:37:17 +01:00
Alexander Block
21aaf92896
Introduce redirect_stderr argument to start_node
...
Also call it with redirect_stderr=True in all cases were non-critical
warnings are expected.
2017-12-21 20:36:54 +01:00
Alexander Block
fbe36d3db6
Pass -createwalletbackups=0 to dashd when running rpc tests
...
It was always complaining about failed backups due to dashd restarting too
fast. Additionally, since the recent RPC test framework backports, all
tests are expected to print NOTHING to stderr, otherwise they fail.
2017-12-21 20:35:32 +01:00
Alexander Block
69dd8f4a64
Python 3 fixes/porting in rpc tests
2017-12-21 20:34:07 +01:00
Alexander Block
2924b34401
Cast command to str when calling show_debug_msg
...
Throws exception otherwise.
2017-12-21 19:17:59 +01:00
Wladimir J. van der Laan
6dc4a13851
Merge #8110 : [Doc] Add benchmarking notes
...
1a8c4d5 [Doc] Add benchmarking notes (fanquake)
2017-12-21 18:50:14 +01:00
Wladimir J. van der Laan
a3c63033d1
Merge #8115 : Avoid integer division in the benchmark inner-most loop.
...
63ff57d Avoid integer division in the benchmark inner-most loop. (Gregory Maxwell)
2017-12-21 18:50:14 +01:00
Pieter Wuille
43cbeb7fa5
Merge #7891 : Always require OS randomness when generating secret keys
...
628cf14 Don't use assert for catching randomness failures (Pieter Wuille)
fa2637a Always require OS randomness when generating secret keys (Pieter Wuille)
2017-12-21 18:50:14 +01:00
Wladimir J. van der Laan
cee571bda4
Merge #8107 : bench: Added base58 encoding/decoding benchmarks
...
5fac1f3 bench: Added base58 encoding/decoding benchmarks (Yuri Zhykin)
2017-12-21 18:50:14 +01:00
Wladimir J. van der Laan
a39b1f7b8d
Merge #7896 : fix typo in help text
...
fc95f6e fix typo in help text (Chris Moore)
2017-12-21 18:50:14 +01:00
Wladimir J. van der Laan
6c962f5e69
Merge #8111 : Benchmark SipHash
...
619d569 Benchmark SipHash (Pieter Wuille)
2017-12-21 18:50:14 +01:00
MarcoFalke
0027292ac6
Merge #8104 : Tests: add timeout to sync_blocks() and sync_mempools()
...
e871f83 Tests: add timeout to sync_blocks() and sync_mempools() (Suhas Daftuar)
2017-12-21 18:50:14 +01:00
MarcoFalke
8d47ecb232
Merge #8108 : Trivial: Remove unused local variable shadowing upper local
...
13c4558 Remove unused local variable shadowing upper local (Pavel Janík)
2017-12-21 18:50:14 +01:00
MarcoFalke
7db5be442a
Merge #8098 : [qa] test_framework: Append portseed to tmpdir
...
fa57b0c [qa] test_framework: Append portseed to tmpdir (MarcoFalke)
2017-12-21 18:50:14 +01:00
Wladimir J. van der Laan
b71ee087ad
Merge #8015 : CCoinsViewErrorCatcher raison-d-etre
...
a4d5855 CCoinsViewErrorCatcher raison-d-etre (21E14)
2017-12-21 18:50:14 +01:00
Wladimir J. van der Laan
9bf6987933
Merge #8034 : [doc][trivial] Add basic git squash workflow [skip ci]
...
90963e5 [doc] Add basic git squash example (fanquake)
2017-12-21 18:50:14 +01:00
Pieter Wuille
640bee1814
Merge #7795 : UpdateTip: log only one line at most per block
...
f20d42e UpdateTip: log only one line at most per block (Wladimir J. van der Laan)
2017-12-21 18:50:14 +01:00
Alexander Block
51d17dcde3
Move AutoBackupWallet into wallet.cpp
2017-12-21 18:50:14 +01:00
Pieter Wuille
8723f99569
Merge #8061 : [Wallet] Improve Wallet encapsulation
...
380498a Move BackupWallet to CWallet::BackupWallet (Patrick Strateman)
ecb9741 Move GetAccountBalance from rpcwallet.cpp into CWallet::GetAccountBalance (Patrick Strateman)
2017-12-21 18:50:14 +01:00
Pieter Wuille
c571a94906
Merge #8076 : VerifyDB: don't check blocks that have been pruned
...
bd477f4 VerifyDB: don't check blocks that have been pruned (Suhas Daftuar)
2017-12-21 18:50:14 +01:00
Pieter Wuille
42a3e0d2d7
Merge #8063 : Acquire lock to check for genesis block.
...
46b0c3b Acquire lock to check for genesis block. (Patrick Strateman)
2017-12-21 18:50:14 +01:00
Pieter Wuille
00bf61885c
Merge #8092 : Correct small typo in extract_strings_qt.py
...
678513c Correct small typo in extract_strings_qt.py (Mitchell Cash)
2017-12-21 18:50:14 +01:00
MarcoFalke
f50b8bf669
Merge #8095 : Test framework: only cleanup on successful test runs
...
1ad9339 Test framework: only cleanup on successful test runs (Suhas Daftuar)
2017-12-21 18:50:14 +01:00
Jonas Schnelli
3f5be563f4
Merge #8014 : Qt: Sort transactions by date
...
2d5603c Qt: Sort transactions by date (Tyler Hardin)
2017-12-21 18:50:13 +01:00
MarcoFalke
62aaaaeac0
Merge #8047 : [qa] test_framework: Set wait-timeout for bitcoind procs
...
fab5233 [qa] test_framework: Set wait-timeout for bitcoind procs (MarcoFalke)
2017-12-21 18:50:13 +01:00
MarcoFalke
bcecdcd8e9
Merge #8056 : [qa] Remove hardcoded "4 nodes" from test_framework
...
fad68f7 [qa] Reduce node count for some tests (MarcoFalke)
fac9349 [qa] Remove hardcoded "4 nodes" from test_framework (MarcoFalke)
2017-12-21 18:50:13 +01:00
Ethan Heilman
8eeaa4f212
Fix typo adddrman to addrman as requested in #8070
2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
1897ccc646
Merge #8033 : Fix Socks5() connect failures to be less noisy and less unnecessarily scary
...
bf9266e Use Socks5ErrorString() to decode error responses from socks proxy. (Warren Togami)
94fd1d8 Make Socks5() InterruptibleRecv() timeout/failures informative. (Warren Togami)
0d9af79 SOCKS5 connecting and connected messages with -debug=net. (Warren Togami)
00678bd Make failures to connect via Socks5() more informative and less unnecessarily scary. (Warren Togami)
2017-12-21 18:50:13 +01:00