UdjinM6
054abdbfa4
Merge pull request #1867 from codablock/pr_backport_bitcoin_0.14-10
...
Backport missing PRs from Bitcoin 0.14 - Part 10
2018-01-26 14:55:56 +03:00
UdjinM6
88646bd0d0
Rename fMasterNode
to fMasternodeMode
to clarify its meaning and to avoid confusion with CNode::fMasternode
( #1874 )
2018-01-26 04:11:01 +03:00
MarcoFalke
25074aeb43
Merge #9644 : [refactor] Remove using namespace <xxx> from src/
...
b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)
2018-01-23 09:24:03 +01:00
Wladimir J. van der Laan
40dff103de
Merge #9380 : Separate different uses of minimum fees
...
eb30d1a Introduce -dustrelayfee (Alex Morcos)
7b1add3 Introduce -incrementalrelayfee (Alex Morcos)
daec955 Introduce -blockmintxfee (Alex Morcos)
2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
88b9aa45de
Merge #7871 : Manual block file pruning.
...
afffeea fixup! Add pruneblockchain RPC to enable manual block file pruning. (Russell Yanofsky)
1fc4ec7 Add pruneblockchain RPC to enable manual block file pruning. (mrbandrews)
2018-01-21 12:48:32 +01:00
Alexander Block
4f39a090bd
Fix remaining direct uses of mapArgs
2018-01-18 07:38:58 +01:00
Pieter Wuille
17e51db71f
Merge #9408 : Allow shutdown during LoadMempool, dump only when necessary
...
325e400 [Qt] Do proper shutdown (Jonas Schnelli)
9479f8d Allow shutdown during LoadMempool, dump only when necessary (Jonas Schnelli)
2018-01-18 07:38:23 +01:00
Pieter Wuille
de21f92613
Merge #9319 : Break addnode out from the outbound connection limits.
...
032ba3f RPC help documentation for addnode peerinfo. (Gregory Maxwell)
90f13e1 Add release notes for addnode changes. (Gregory Maxwell)
50bd12c Break addnode out from the outbound connection limits. (Gregory Maxwell)
2018-01-18 07:38:22 +01:00
MarcoFalke
125adda41a
Merge #9401 : Make rpcauth help message clearer, add example in example .conf
...
0513c70 Make rpcauth help message clearer, add example in example .conf (Gregory Sanders)
2018-01-18 07:33:43 +01:00
Pieter Wuille
aff4b6d2c5
Merge #9243 : Clean up mapArgs and mapMultiArgs Usage
...
c2f61be Add a ForceSetArg method for testing (Matt Corallo)
4e04814 Lock mapArgs/mapMultiArgs access in util (Matt Corallo)
4cd373a Un-expose mapArgs from utils.h (Matt Corallo)
71fde55 Get rid of mapArgs direct access in ZMQ construction (Matt Corallo)
0cf86a6 Introduce (and use) an IsArgSet accessor method (Matt Corallo)
2b5f085 Fix non-const mapMultiArgs[] access after init. (Matt Corallo)
c8042a4 Remove arguments to ParseConfigFile (Matt Corallo)
2018-01-18 07:31:23 +01:00
Wladimir J. van der Laan
dcc9dffae9
Merge #9236 : Fix races for strMiscWarning and fLargeWork*Found, make QT runawayException use GetWarnings
...
749be01 Move GetWarnings() into its own file. (Gregory Maxwell)
e3ba0ef Eliminate data races for strMiscWarning and fLargeWork*Found. (Gregory Maxwell)
c63198f Make QT runawayException call GetWarnings instead of directly access strMiscWarning. (Gregory Maxwell)
2018-01-18 07:31:22 +01:00
Pieter Wuille
c1811e5661
Merge #8895 : Better SigCache Implementation
...
67dac4e Add unit tests for the CuckooCache (Jeremy Rubin)
c9e69fb Add CuckooCache implementation and replace the sigcache map_type with it (Jeremy Rubin)
2018-01-18 07:31:22 +01:00
MarcoFalke
cb61441e2e
Merge #9251 : Improvement of documentation of command line parameter 'whitelist'
...
8a70a9d Improvement of documentation of command line parameter 'whitelist' (wodry)
2018-01-17 17:30:38 +01:00
Pieter Wuille
180e379e2d
Merge #9253 : Fix calculation of number of bound sockets to use
...
9e1f468 Fix calculation of number of bound sockets to use (Matt Corallo)
2018-01-17 17:30:38 +01:00
Pieter Wuille
b07393709e
Merge #9010 : Split up AppInit2 into multiple phases, daemonize after datadir lock errors
...
deec83f init: Get rid of fServer flag (Wladimir J. van der Laan)
16ca0bf init: Try to aquire datadir lock before and after daemonization (Wladimir J. van der Laan)
0cc8b6b init: Split up AppInit2 into multiple phases (Wladimir J. van der Laan)
2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
4e1c1923b7
Merge #9142 : Move -salvagewallet, -zap(wtx) to where they belong
...
2e44893 Move -salvagewallet, -zap(wtx) to where they belong (Jonas Schnelli)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
9b9d3d1da8
Merge #9133 : Unset fImporting for loading mempool
...
79f755d Unset fImporting for loading mempool (Alex Morcos)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
9b9f86a59b
Merge #8977 : [Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread)
...
cab1da7 [Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread) (Jonas Schnelli)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
2999d097f6
Merge #9013 : Trivial: Explicitly pass const CChainParams& to LoadBlockIndexDB()
...
d0b01f3 Explicitly pass const CChainParams& to LoadBlockIndexDB() (Geoffrey Tsui)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
0a0e60c1fb
Merge #8448 : Store mempool and prioritization data to disk
...
582068a Add mempool.dat to doc/files.md (Pieter Wuille)
3f78562 Add DumpMempool and LoadMempool (Pieter Wuille)
ced7c94 Add AcceptToMemoryPoolWithTime function (Pieter Wuille)
c3efb58 Add feedelta to TxMempoolInfo (Pieter Wuille)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
00f4d887a2
Merge #9002 : Make connect=0 disable automatic outbound connections.
...
515e264 Make connect=0 disable automatic outbound connections. (Gregory Maxwell)
2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
239ce534c2
Merge #8914 : Kill insecure_random and associated global state
...
5eaaa83 Kill insecure_random and associated global state (Wladimir J. van der Laan)
2018-01-12 09:58:14 +01:00
Wladimir J. van der Laan
14483e46f9
Merge #8856 : Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
...
3450c18 Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs (Jorge Timón)
2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
210242e5c0
Merge #8813 : bitcoind: Daemonize using daemon(3)
...
a92bf4a bitcoind: Daemonize using daemon(3) (Matthew King)
2018-01-12 09:57:55 +01:00
Wladimir J. van der Laan
8b8362ff15
Merge #8814 : [wallet, policy] ParameterInteraction: Don't allow 0 fee
...
fa4bfb4 [wallet, policy] ParameterInteraction: Don't allow 0 fee (MarcoFalke)
2018-01-12 08:02:45 +01:00
Alexander Block
9b1d1c61b2
Move AutoBackup initialization into CWallet::InitAutoBackup
2018-01-11 18:39:50 +01:00
Wladimir J. van der Laan
d87c156f19
Merge #8486 : [wallet] Add high transaction fee warnings
...
faef293 [wallet] Add high transaction fee warnings (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
06f41f3586
Merge #8768 : init: Get rid of fDisableWallet
...
fa58edb [wallet] Introduce DEFAULT_DISABLE_WALLET (MarcoFalke)
fab9107 init: Get rid of fDisableWallet (MarcoFalke)
2018-01-11 13:22:17 +01:00
Wladimir J. van der Laan
fbbddf8107
Merge #8760 : [init] Get rid of some ENABLE_WALLET
...
faddd62 init: Get rid of some ENABLE_WALLET (MarcoFalke)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
b04e32c43d
Merge #8688 : Move static global randomizer seeds into CConnman
...
d9ff591 Move static global randomizer seeds into CConnman (Pieter Wuille)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
af5d18ad5c
Merge #8707 : net: fix maxuploadtarget setting
...
f3552da net: fix maxuploadtarget setting (Cory Fields)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
9432e1904f
Merge #8494 : [init, wallet] ParameterInteraction() iff wallet enabled
...
fa5d276 [init] ParameterInteraction() iff wallet enabled (MarcoFalke)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
fdd0638161
Merge #8928 : Fix init segfault where InitLoadWallet() calls ATMP before genesis
...
37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
2018-01-09 17:23:39 +01:00
Wladimir J. van der Laan
c2a601f507
Merge #8680 : Address Travis spurious failures
...
d6a5dc4 add waitfornewblock/waitforblock/waitforblockheight rpcs and use them for tests (Cory Fields)
2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
414272af93
Merge #8629 : C++11: s/boost::scoped_ptr/std::unique_ptr/
...
cdd79eb C++11: s/boost::scoped_ptr/std::unique_ptr/ (Jorge Timón)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
22604cbbcc
Merge #8607 : [doc] Fix doxygen off-by-one comments, fix typos
...
fafe7b3 contrib: Make fix-copyright-headers.py more portable (MarcoFalke)
fa27c0a [doc] Fix typos in comments, doxygen: Fix comment syntax (MarcoFalke)
fabfd5d [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke)
67a5502 init: Fix typo in help message for -whitelistforcerelay (Wladimir J. van der Laan)
2018-01-09 14:04:21 +01:00
Wladimir J. van der Laan
95c61637d5
Merge #8590 : Remove unused variables
...
fa6dc9f Remove unused variables (MarcoFalke)
2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
d97fa0402f
Merge #8445 : Move CWallet::setKeyPool to private section of CWallet.
...
8680d3a Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet (Patrick Strateman)
e86eb71 Move CWallet::setKeyPool to private section of CWallet (Patrick Strateman)
2018-01-09 14:04:19 +01:00
Wladimir J. van der Laan
10aaf04b73
Merge #8505 : Trivial: Fix typos in various files
...
1aacfc2 various typos (leijurv)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
599df51726
Merge #8516 : [trivial] remove no-longer-used InitError logic
...
edb6cf1 remove no-longer-used InitError logic (instagibbs)
2018-01-08 18:04:55 +01:00
Jonas Schnelli
a377499c10
Merge #8192 : [trivial] Remove URLs from About dialog translations
...
208d37f [trivial] Remove URLs from About dialog translations (fanquake)
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
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
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
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
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
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
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
b71ee087ad
Merge #8015 : CCoinsViewErrorCatcher raison-d-etre
...
a4d5855 CCoinsViewErrorCatcher raison-d-etre (21E14)
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