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
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
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
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
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
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
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
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
Wladimir J. van der Laan
0450dfdeb8
Merge #7932 : CAddrMan::Deserialize handle corrupt serializations better.
...
fb26bf0 CAddrMan::Deserialize handle corrupt serializations better. (Patrick Strateman)
2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
8b28f5f995
Merge #8020 : Use SipHash-2-4 for various non-cryptographic hashes
...
a68ec21 Use SipHash-2-4 for address relay selection (Pieter Wuille)
8cc9cfe Switch CTxMempool::mapTx to use a hash index for txids (Pieter Wuille)
382c871 Use SipHash-2-4 for CCoinsCache index (Pieter Wuille)
0b1295b Add SipHash-2-4 primitives to hash (Pieter Wuille)
2017-12-21 18:50:13 +01:00
MarcoFalke
a0afc3ee01
Merge #8038 : [qa, doc] Various minor fixes
...
fa83a5d [qa] wallet: Temporarily disable salvagewallet test (MarcoFalke)
fadd048 [doc] Link to clang-format in the developer notes (MarcoFalke)
fa72f7d [doc] Remove outdated line from listunspent RPC help, fix typo (MarcoFalke)
ac40ed7 Increase timeout waiting for pruned blk00000.dat (error10)
2017-12-21 18:50:13 +01:00
Pieter Wuille
7b25879463
Merge #8059 : Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool.
...
d87b198 Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool. (Gregory Maxwell)
2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
26f07f835c
Merge #8004 : signal handling: fReopenDebugLog and fRequestShutdown should be type sig_atomic_t
...
3262316 fReopenDebugLog and fRequestShutdown should be type sig_atomic_t (Chirag Davé)
2017-12-21 18:50:13 +01:00
Pieter Wuille
4ee3858426
Merge #8039 : bench: Add crypto hash benchmarks
...
32114dd bench: Add crypto hash benchmarks (Wladimir J. van der Laan)
2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
76b72a7f2b
Merge #8028 : Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk
...
0fd5997 Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk (Patrick Strateman)
2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
4750be1afb
Merge #8036 : init: Move berkeleydb version reporting to wallet
...
3e2c946 init: Move berkeleydb version reporting to wallet (Wladimir J. van der Laan)
2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
3dbae2d321
Merge #8019 : Remove state arg from ReconsiderBlock, rename to ResetBlockFailureFlags
...
657e07e Rename ReconsiderBlock func to reflect real behavior (instagibbs)
addb9d2 Remove state arg from ReconsiderBlock (instagibbs)
2017-12-21 18:50:13 +01:00
Jonas Schnelli
262e857db9
Merge #8012 : Qt: Delay user confirmation of send
...
3902a29 Qt: Delay user confirmation of send (Tyler Hardin)
2017-12-21 18:50:13 +01:00
Alexander Block
3d665aa485
Use fThread = true default argument in CAlert::Notify
...
Instead of fully backporting Bitcoin #7958 , we make true the default value
for fThread. Otherwise the AlertNotify test case will fail as it expects
the alerts to be processed synchronously.
2017-12-21 18:50:08 +01:00
UdjinM6
3110f7ebdd
Fix issues introduced in 1770 ( #1803 )
2017-12-21 19:58:38 +03:00
Wladimir J. van der Laan
5222e9377d
Merge #7976 : Remove obsolete reference to CValidationState from UpdateCoins.
...
c8b9248 Remove obsolete reference to CValidationState from UpdateCoins. (21E14)
2017-12-21 17:31:57 +01:00
Wladimir J. van der Laan
93be53e34e
Merge #7934 : Improve rolling bloom filter performance and benchmark
...
1953c40 More efficient bitsliced rolling Bloom filter (Pieter Wuille)
aa62b68 Benchmark rolling bloom filter (Pieter Wuille)
2017-12-21 17:31:57 +01:00
Wladimir J. van der Laan
c66fcf47e0
Merge #8011 : don't run ThreadMessageHandler at lowered priority
...
e53e7c5 don't run ThreadMessageHandler at lowered priority (Kaz Wesley)
2017-12-21 17:30:51 +01:00
Alexander Block
d4b8abf4ff
Send non-tx/non-block inventory items
...
Bitcoin #7840 has split the INVs to send into block and TX and completely
ignores non-tx/non-block items in PushInventory. This is fine for Bitcoin,
as they only use it for blocks and TXs, but we also have a lot of MN related
messages which also need to be relayed.
2017-12-21 17:30:51 +01:00
Wladimir J. van der Laan
5d8e94a26f
Merge #7840 : Several performance and privacy improvements to inv/mempool handling
...
b559914 Move bloom and feerate filtering to just prior to tx sending. (Gregory Maxwell)
4578215 Return mempool queries in dependency order (Pieter Wuille)
ed70683 Handle mempool requests in send loop, subject to trickle (Pieter Wuille)
dc13dcd Split up and optimize transaction and block inv queues (Pieter Wuille)
f2d3ba7 Eliminate TX trickle bypass, sort TX invs for privacy and priority. (Gregory Maxwell)
2017-12-21 17:30:51 +01:00
Wladimir J. van der Laan
33233409a9
Merge #7966 : http: Do a pending c++11 simplification handling work items
...
f0188f9 http: use std::move to move HTTPRequest into HTTPWorkItem (Wladimir J. van der Laan)
37b2137 http: Change boost::scoped_ptr to std::unique_ptr in HTTPRequest (Wladimir J. van der Laan)
f97b410 http: Add log message when work queue is full (Wladimir J. van der Laan)
091d6e0 http: Do a pending c++11 simplification (Wladimir J. van der Laan)
2017-12-21 17:30:51 +01:00
Wladimir J. van der Laan
90b00cfc66
Merge #7953 : Create signmessagewithprivkey rpc
...
7db0ecb Test for signing messages (Andrew Chow)
f90efbf Create signmessagewithprivkey rpc (Andrew)
2017-12-21 17:30:51 +01:00
UdjinM6
0c5302e815
Merge pull request #1795 from codablock/pr_backport_bitcoin_0.13-3
...
Backport missing PRs from Bitcoin 0.13 - Part 3
2017-12-21 17:32:41 +03:00
UdjinM6
ebbd26a054
Drop IsInputAssociatedWithPubkey and optimize CheckOutpoint ( #1783 )
...
* Drop IsInputAssociatedWithPubkey and optimize CheckOutpoint
* typo
2017-12-21 16:03:02 +03:00
Alexander Block
b78bd5cc76
Dashify help text of fundrawtransaction
2017-12-21 07:12:35 +01:00
Alexander Block
da2de07718
Put ps_rounds to the bottom of the result of listunspent
...
Avoids future conflicts in upcoming backports
2017-12-21 07:02:24 +01:00
Alexander Block
15fc7f2133
De-bump fees in miner_tests.cpp
...
Bumped unnecessarily 10x when backporting PRs
2017-12-21 06:57:45 +01:00
Alexander Block
2c63839f23
Dashify fundrawtransaction exception
...
Fixes test failure
2017-12-20 17:32:14 +01:00