Merge pull request #3293 from codablock/pr_v15_backports

[v0.15.x] Backport pending PRs from develop

Author: UdjinM6

COPYING

@@ -1,8 +1,8 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2019 The Bitcoin Core developers
-Copyright (c) 2009-2019 Bitcoin Developers
-Copyright (c) 2014-2019 The Dash Core developers
+Copyright (c) 2009-2020 The Bitcoin Core developers
+Copyright (c) 2009-2020 Bitcoin Developers
+Copyright (c) 2014-2020 The Dash Core developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

configure.ac

@@ -5,7 +5,7 @@ define(_CLIENT_VERSION_MINOR, 15)
 define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, false)
-define(_COPYRIGHT_YEAR, 2019)
+define(_COPYRIGHT_YEAR, 2020)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]])
 AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/dashpay/dash/issues],[dashcore],[https://dash.org/])

doc/man/dash-cli.1

@@ -82,8 +82,8 @@ Send RPC for non\-default wallet on RPC server (argument is wallet
 filename in dashd directory, required if dashd/\-Qt runs
 with multiple wallets)
 .SH COPYRIGHT
-Copyright (C) 2014-2019 The Dash Core developers
-Copyright (C) 2009-2019 The Bitcoin Core developers
+Copyright (C) 2014-2020 The Dash Core developers
+Copyright (C) 2009-2020 The Bitcoin Core developers
 
 Please contribute if you find Dash Core useful. Visit <https://dash.org> for
 further information about the software.

doc/man/dash-qt.1

@@ -69,6 +69,10 @@ Do not keep transactions in the mempool longer than <n> hours (default:
 .IP
 Whether to save the mempool on shutdown and load on restart (default: 1)
 .HP
+\fB\-syncmempool\fR
+.IP
+Sync mempool from other nodes on start (default: 1)
+.HP
 \fB\-blockreconstructionextratxn=\fR<n>
 .IP
 Extra transactions to keep in memory for compact block reconstructions
@@ -561,7 +565,7 @@ Use N separate masternodes for each denominated input to mix funds
 .HP
 \fB\-privatesendamount=\fR<n>
 .IP
-Keep N DASH mixed (2\-21000000, default: 1000)
+Target PrivateSend balance (2\-21000000, default: 1000)
 .HP
 \fB\-privatesenddenoms=\fR<n>
 .IP
@@ -698,8 +702,8 @@ Show splash screen on startup (default: 1)
 .IP
 Reset all settings changed in the GUI
 .SH COPYRIGHT
-Copyright (C) 2014-2019 The Dash Core developers
-Copyright (C) 2009-2019 The Bitcoin Core developers
+Copyright (C) 2014-2020 The Dash Core developers
+Copyright (C) 2009-2020 The Bitcoin Core developers
 
 Please contribute if you find Dash Core useful. Visit <https://dash.org> for
 further information about the software.

doc/man/dash-tx.1

@@ -108,8 +108,8 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
-Copyright (C) 2014-2019 The Dash Core developers
-Copyright (C) 2009-2019 The Bitcoin Core developers
+Copyright (C) 2014-2020 The Dash Core developers
+Copyright (C) 2009-2020 The Bitcoin Core developers
 
 Please contribute if you find Dash Core useful. Visit <https://dash.org> for
 further information about the software.

doc/man/dashd.1

@@ -74,6 +74,10 @@ Do not keep transactions in the mempool longer than <n> hours (default:
 .IP
 Whether to save the mempool on shutdown and load on restart (default: 1)
 .HP
+\fB\-syncmempool\fR
+.IP
+Sync mempool from other nodes on start (default: 1)
+.HP
 \fB\-blockreconstructionextratxn=\fR<n>
 .IP
 Extra transactions to keep in memory for compact block reconstructions
@@ -562,7 +566,7 @@ Use N separate masternodes for each denominated input to mix funds
 .HP
 \fB\-privatesendamount=\fR<n>
 .IP
-Keep N DASH mixed (2\-21000000, default: 1000)
+Target PrivateSend balance (2\-21000000, default: 1000)
 .HP
 \fB\-privatesenddenoms=\fR<n>
 .IP
@@ -673,8 +677,8 @@ option can be specified multiple times
 .IP
 Set the number of threads to service RPC calls (default: 4)
 .SH COPYRIGHT
-Copyright (C) 2014-2019 The Dash Core developers
-Copyright (C) 2009-2019 The Bitcoin Core developers
+Copyright (C) 2014-2020 The Dash Core developers
+Copyright (C) 2009-2020 The Bitcoin Core developers
 
 Please contribute if you find Dash Core useful. Visit <https://dash.org> for
 further information about the software.

doc/release-notes.md

@@ -221,8 +221,17 @@ modules were reorganized in separate folders to make navigation through code a b
 0.15 Change log
 ===============
 
-See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.14.0.x...dashpay:v0.15).
-
+See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.14.0.5...dashpay:v0.15.0.0).
+
+- [`1d9adbe63`](https://github.com/dashpay/dash/commit/1d9adbe63) Replace generic CScopedDBTransaction with specialized CEvoDBScopedCommitter (#3292)
+- [`8fd486c6b`](https://github.com/dashpay/dash/commit/8fd486c6b) Translations 2020-01 (#3192)
+- [`3c54f6527`](https://github.com/dashpay/dash/commit/3c54f6527) Bump copyright year to 2020 (#3290)
+- [`35d28c748`](https://github.com/dashpay/dash/commit/35d28c748) Update man pages (#3291)
+- [`203cc9077`](https://github.com/dashpay/dash/commit/203cc9077)  trivial: adding SVG and high contrast icons  (#3209)
+- [`e875d4925`](https://github.com/dashpay/dash/commit/e875d4925) Define defaultTheme and darkThemePrefix as constants and use them instead of plain strings (#3288)
+- [`1d203b422`](https://github.com/dashpay/dash/commit/1d203b422) Bump PROTOCOL_VERSION to 70216 (#3287)
+- [`b84482ac5`](https://github.com/dashpay/dash/commit/b84482ac5) Let regtest have its own qt settings (#3286)
+- [`1c885bbed`](https://github.com/dashpay/dash/commit/1c885bbed) Only load valid themes, fallback to "Light" theme otherwise (#3285)
 - [`ce924278d`](https://github.com/dashpay/dash/commit/ce924278d) Don't load caches when blocks/chainstate was deleted and also delete old caches (#3280)
 - [`ebf529e8a`](https://github.com/dashpay/dash/commit/ebf529e8a) Drop new connection instead of old one when duplicate MNAUTH is received (#3272)
 - [`817cd9a17`](https://github.com/dashpay/dash/commit/817cd9a17) AppInitMain should quit early and return `false` if shutdown was requested at some point (#3267)
@@ -434,6 +443,7 @@ Thanks to everyone who directly contributed to this release:
 - PastaPastaPasta
 - Riku (rikublock)
 - strophy
+- taw00
 - thephez
 - UdjinM6