Commit Graph

14028 Commits

Author SHA1 Message Date
Pieter Wuille
256b9b77a2 Merge #7946: Reduce cs_main locks during ConnectTip/SyncWithWallets
b3b3c2a Reduce cs_main locks during ConnectTip/SyncWithWallets (Jonas Schnelli)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
6ba688b1c6 Merge #8353: Trivial: tiny c++11 refactors
c784086 use std::map::emplace() instead of std::map::insert() (whythat)
5e187e7 use c++11 std::unique_ptr instead of boost::shared_ptr (whythat)
947913f use std::map::erase(const_iterator, const_iterator) to get non-constant iterator (whythat)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
cca05694c5 Merge #8293: Bugfix: Allow building libbitcoinconsensus without any univalue
8a270b2 Bugfix: Allow building libbitcoinconsensus without any univalue (Luke Dashjr)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
7dafb5303e Merge #8492: configure: Allow building bench_bitcoin by itself
216d796 configure: Allow building bench_bitcoin by itself (Luke Dashjr)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
82336d8184 Merge #8503: [doc] typos, text errors
e11f9a2 [doc] typos, READMEs, comments (Justin Camarena)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
d5b5aeefe3 Merge #8481: Qt: Fix minimize and close bugs
05242e9 Fix minimize and close bugs (adlawren)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
549894bac7 Merge #8444: Fix p2p-feefilter.py for changed tx relay behavior
2c517b3 Fix p2p-feefilter.py for changed tx relay behavior (Suhas Daftuar)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
5e54cf907d Merge #8392: Fix several node initialization issues
9d4eb9a Do diskspace check before import thread is started (Pieter Wuille)
aa59f2e Add extra message to avoid a long 'Loading banlist' (Pieter Wuille)
0fd2a33 Use a signal to continue init after genesis activation (Pieter Wuille)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
35202920f8 Merge #8439: [doc] Increase recommended memory in gitian build guide
7fdbce9 [doc] Increase recommended memory in gitian build guide (fanquake)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
2c3a218b34 Merge #8189: rename mapAddrCount to mapNetGroupNodes
657fc19 rename mapAddrCount to mapNetGroupNodes (instagibbs)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
7c62457e6f Merge #8428: Update README.md inside of src/test/
b8db185 Update README.md (Chris Stewart)
2018-01-08 18:04:55 +01:00
Pieter Wuille
e34e2bbcca Merge #8432: Make CWallet::fFileBacked private.
29c2d99 Make CWallet::fFileBacked private. (Patrick Strateman)
2018-01-08 18:04:55 +01:00
Pieter Wuille
9589e24485 Merge #8152: [Wallet] Remove CWalletDB* parameter from CWallet::AddToWallet
5723bb4 Remove unused pwalletdb from CWallet::AddToWallet (Patrick Strateman)
867f842 Remove CWalletDB* parameter from CWallet::AddToWallet (Patrick Strateman)
00f09c9 Split CWallet::AddToWallet into AddToWallet and LoadToWallet. (Patrick Strateman)
2018-01-08 18:04:55 +01:00
Pieter Wuille
aa6c37919b Merge #8413: Trivial: pass Consensus::Params& instead of CChainParams& in ContextualCheckBlock
c8664ee Trivial: pass Consensus::Params& instead of CChainParams& in ContextualCheckBlock (Jorge Timón)
2018-01-08 18:04:55 +01:00
Pieter Wuille
60668fb93d Merge #8346: Mempool: Use Consensus::CheckTxInputs direclty over main::CheckInputs
a6cc299 Mempool: Use Consensus::CheckTxInputs direclty over main::CheckInputs (Jorge Timón)
2018-01-08 18:04:55 +01:00
MarcoFalke
8c76eb7394 Merge #8400: [qa]: enable rpcbind_test
9bbb414 [qa]: enable rpcbind_test (whythat)
0ff4375 [qa]: add parsing for '<host>:<port>' argument form to rpc_url() (whythat)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
eb54680c35 Merge #8238: [WIP][depends] ZeroMQ 4.1.5 && ZMQ on Windows
a615386 [depends] ZeroMQ 4.1.5 (fanquake)
2018-01-08 18:04:55 +01:00
Pieter Wuille
7c1c9d0ea6 Merge #8427: net: Ignore notfound P2P messages
5c9e49d net: Ignore `notfound` P2P messages (Wladimir J. van der Laan)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
13b4e659b6 Merge #8274: util: Update tinyformat
a5072a7 util: Remove zero-argument versions of LogPrint and error (Wladimir J. van der Laan)
695041e util: Update tinyformat (Wladimir J. van der Laan)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
c03c42116b Merge #8421: httpserver: drop boost (#8023 dependency)
7e87033 httpserver: replace boost threads with std (Cory Fields)
d3773ca httpserver: explicitly detach worker threads (Cory Fields)
755aa05 httpserver: use a future rather than relying on boost's try_join_for (Cory Fields)
2018-01-08 18:04:55 +01:00
Pieter Wuille
2e4e12f4a9 Merge #8412: libconsensus: Expose a flag for BIP112
d12b732 libconsensus: Expose a flag for BIP112 (Jorge Timón)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
b673b7bf65 Merge #8321: [trivial] Switched constants to sizeof()
fbc6070 [trivial] Switched constants to sizeof() (Thomas Snider)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
e7da254c5e Merge #8407: [Qt] Add dbcache migration path
893f379 [Qt] Add dbcache migration path (Jonas Schnelli)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
150d63f096 Merge #8414: prepend license statement to indirectmap.h
d3af342 prepend license statement to indirectmap (Kaz Wesley)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
04525b435f Merge #8358: [doc] gbuild: Set memory explicitly (default is too low)
faa5931 [doc] gbuild: Set memory explicitly (default is too low) (MarcoFalke)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
47c726e1d9 Merge #8396: remove outdated legacy code from key.h
cc021ef remove outdated legacy code (lizhi)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
9a91ddb417 Merge #8347: Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ContextualCheckBlock
6f3d616 Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ContextualCheckBlock (Jorge Timón)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
0bea37d7b8 Merge #8342: Consensus: Trivial transform BOOST_FOREACH into for loop
a3e1984 Consensus: Trivial transform BOOST_FOREACH into for loop (NicolasDorier)
2018-01-08 18:04:55 +01:00
UdjinM6
0ec5efb9f9
Merge pull request #1836 from lodgepole/feature/backport-11847
[backport] Fixes compatibility with boost 1.66
2018-01-07 02:37:53 +03:00
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
UdjinM6
1274cd306f
Merge pull request #1821 from codablock/pr_backport_bitcoin_0.13-6
Backport missing PRs from Bitcoin 0.13 - Part 6
2017-12-29 01:09:54 +03:00
Alexander Block
9c2e970858 Fix review nits 2017-12-28 15:53:17 +01: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
Wladimir J. van der Laan
a9f0aedb34 Merge #8320: Fix 0.12 release notes on block relaying
d6dc1bc Fix 0.12 release notes on block relaying (Krzysztof Jurewicz)
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
Wladimir J. van der Laan
26540aa5d1 Merge #8289: bash-completion: Adapt for 0.12 and 0.13
1ba3db6 bash-completion: Adapt for 0.12 and 0.13 (Christian von Roques)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
1670472976 Merge #8314: Fix pkg-config issues for 0.13
b556bed build: fix Windows builds without pkg-config (Cory Fields)
0c928cb build: Fix Qt5PlatformSupport check without pkg-config (Cory Fields)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
e6b071ab0a Merge #8315: gitian: Don't require sudo for Linux.
099d4b0 gitian: use a wrapped gcc/g++ to avoid the need for a system change (Cory Fields)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
237ba56d9e Merge #8303: [Doc] Update bips.md for CSV softfork.
ab0c35a [Doc] Update bips.md for CSV softfork. (fanquake)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
7a6febfaae Merge #8310: build: require boost for bench
cf2ef78 build: require boost for bench (Cory Fields)
2017-12-28 11:44:59 +01:00
Jonas Schnelli
5ff5474e47 Merge #8304: [travis] Update SDK_URL
fa6ad56 [travis] Update SDK_URL (MarcoFalke)
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