neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
14,071 Commits 1 Branch 1 Tag 185 MiB
15b9e43abe
Commit Graph

10033 Commits

Author SHA1 Message Date
Wladimir J. van der Laan
8cfc25739a Merge #11847: Make boost::multi_index comparators const 
1ec0c0a Make boost::multi_index comparators const (Suhas Daftuar)

Pull request description:

  This fixes compatibility with boost 1.66.

  Fixes #11837

Tree-SHA512: 3181336fcc159aa7ee70c843d76f2a063e4a401f427c218d7f856a3548ca70eaf8eee9d20abb73be259a5656273d3a65aa748e946e09cf656de5f50e6d4eb880
 2018-01-07 02:30:15 +09:00
UdjinM6
38e505842a
Vote on IS only if it was accepted to mempool (#1826) 2018-01-06 13:06:43 +03:00
UdjinM6
287d367c3c
Fix -liquidityprovider option (#1829) 
revert to pre-1248 logic for liquidity providers
 2018-01-06 13:06:22 +03:00
thephez
e23861c0e4 [Trivial] RPC Typos / markdown formatting (#1830) 
* RPC typo cleanup

* Update protocol doc formatting for consistent doxygen parsing
 2018-01-06 13:05:55 +03:00
UdjinM6
1d620d1f9b
Fix calls to AcceptToMemoryPool in PS submodules (#1823) 2017-12-30 01:05:33 +03:00
UdjinM6
1448506570
Switch KeePassHttp integration to new AES lib, add tests and a note about KeePassHttp security (#1818) 
* Add a note about KeePassHttp security

* Use new AES lib instead of OpenSSL for KeePassHttp encryption/decryption

* Add tests to make sure new AES lib works corrctly for KeePassHttp encryption/decryption and produces the same results as OpenSSL did
 2017-12-29 01:10:34 +03:00
Alexander Block
f61a754020 Disable free transactions in TestPackageSelection 
Dash allows free transactions by default, mixing up the expected ordering
of transactions in TestPackageSelection
 2017-12-28 11:44:59 +01:00
Alexander Block
f8a7a2c88d Move bitcoin.ico/png and bitcoin_testnet.ico/png one dir up 
This also overwrites/dashifies icons/bitcoin_testnet.ico which was
introduced in Bitcoin #8285.

The icons were previously located in the drkblue theme directory while the
path used in dash.qrc was poining to the non-theme icons directory. Also,
the icons were never ported to the other themes. This commit moves them one
level up until someone actually ports these to the other themes (if ever
needed).
 2017-12-28 11:44:59 +01:00
Alexander Block
6a993236be Remove SegWit related checks added by backporting of Bitcoin #8295 
Also remove nBlockMinSize check from addPackageTxs. Removed by SegWit
related commits in Bitcoin.
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
f9f3b8d938 Merge #8295: Mining-related fixups for 0.13.0 
c1d61fb Add warning if -blockminsize is used. (Suhas Daftuar)
27362dd Remove -blockminsize option (Suhas Daftuar)
d2e46e1 Remove addScoreTxs() (Suhas Daftuar)
6dd4bc2 Exclude witness transactions in addPackageTxs() pre-segwit activation (Suhas Daftuar)
f15c2cd CreateNewBlock: add support for size-accounting to addPackageTxs (Suhas Daftuar)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
bc257c1a08 Merge #8305: Improve handling of unconnecting headers 
e91cf4b Add test for handling of unconnecting headers (Suhas Daftuar)
96fa953 Improve handling of unconnecting headers (Suhas Daftuar)
 2017-12-28 11:44:59 +01:00
Jonas Schnelli
25627e31dd Merge #8288: qt: Network-specific example address 
4f44cb6 qt: Network-specific example address (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
355f3724d2 Merge #8298: wallet: Revert input selection post-pruning 
20f3cd7 wallet: Revert input selection post-pruning (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
dcf36df675 Merge #8285: windows: Add testnet link to installer 
975a41d windows: Add testnet icon for testnet link (Wladimir J. van der Laan)
0ce8e99 windows: Add testnet link to installer (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Jonas Schnelli
ba6b369781 Merge #8281: qt: Remove client name from debug window 
a7897c0 qt: Remove client name from debug window (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
17aa23c884 Merge #8261: The bit field is shown only when status is "started" 
2129fce The bit field is shown only when status is "started" (Pavel Janík)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
7f5b8f1e1d Merge #8258: RPC: Hide softfork if timeout is 0 
409f833 RPC: Hide softfork if timeout is 0 (jl2012)
 2017-12-28 11:44:59 +01:00
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
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
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
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
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
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
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
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
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
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
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
05c8f2ee2c Dashify new tests in bitcoin-util-test.json 2017-12-22 19:35:34 +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
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
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
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
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
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
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
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
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