Skip to content

Commit 3688ac9

Browse files
Merge pull request #5308 from PastaPastaPasta/v19.x-bp-final
[v19.x] backport: final version release backports
2 parents 68b6677 + 4266edf commit 3688ac9

39 files changed

+2668
-2770
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ before_script:
176176
- python3 -c 'import os,sys,fcntl; flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);'
177177
# Build docker image only for develop branch of the main repo
178178
- if [ "$TRAVIS_REPO_SLUG" != "dashpay/dash" -o "$TRAVIS_BRANCH" != "develop" -o "$TRAVIS_PULL_REQUEST" != "false" ]; then export DOCKER_BUILD="false"; echo DOCKER_BUILD=$DOCKER_BUILD; fi
179-
# TODO: Check keys and signed commits
179+
# TODO(ignore if don't use travis): Check keys and signed commits
180180
#- if [ "$TRAVIS_REPO_SLUG" = "dashpay/dash" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi
181181
#- if [ "$TRAVIS_REPO_SLUG" = "dashpay/dash" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then travis_wait 30 contrib/verify-commits/verify-commits.py; fi
182182
after_script:

ci/dash/test_unittests.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ if [ "$RUN_UNIT_TESTS" != "true" ]; then
1616
exit 0
1717
fi
1818

19-
# TODO this is not Travis agnostic
20-
export BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID
19+
export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1}
2120
export LD_LIBRARY_PATH=$BASE_BUILD_DIR/depends/$HOST/lib
2221

2322
export WINEDEBUG=fixme-all

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 19)
33
define(_CLIENT_VERSION_MINOR, 0)
44
define(_CLIENT_VERSION_BUILD, 0)
5-
define(_CLIENT_VERSION_RC, 10)
6-
define(_CLIENT_VERSION_IS_RELEASE, false)
5+
define(_CLIENT_VERSION_RC, 0)
6+
define(_CLIENT_VERSION_IS_RELEASE, true)
77
define(_COPYRIGHT_YEAR, 2023)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])
99
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]])

doc/man/dash-cli.1

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH DASH-CLI "1" "December 2022" "dash-cli v18.2.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2+
.TH DASH-CLI "1" "April 2023" "dash-cli v19.0.0" "User Commands"
33
.SH NAME
4-
dash-cli \- manual page for dash-cli v18.2.0
4+
dash-cli \- manual page for dash-cli v19.0.0
55
.SH SYNOPSIS
66
.B dash-cli
77
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Dash Core\/\fR
@@ -15,7 +15,7 @@ dash-cli \- manual page for dash-cli v18.2.0
1515
.B dash-cli
1616
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
1717
.SH DESCRIPTION
18-
Dash Core RPC client version v18.2.0
18+
Dash Core RPC client version v19.0.0
1919
.SH OPTIONS
2020
.HP
2121
\-?
@@ -142,6 +142,11 @@ devnet\-only)
142142
Override the default LLMQ type used for InstantSendDIP0024. (default:
143143
llmq_60_75, devnet\-only)
144144
.HP
145+
\fB\-llmqplatform=\fR<quorum name>
146+
.IP
147+
Override the default LLMQ type used for Platform. (default: llmq_100_67,
148+
devnet\-only)
149+
.HP
145150
\fB\-minimumdifficultyblocks=\fR<n>
146151
.IP
147152
The number of blocks that can be mined with the minimum difficulty at
@@ -156,8 +161,8 @@ minutes, devnet\-only)
156161
.IP
157162
Use the test chain
158163
.SH COPYRIGHT
159-
Copyright (C) 2014-2022 The Dash Core developers
160-
Copyright (C) 2009-2022 The Bitcoin Core developers
164+
Copyright (C) 2014-2023 The Dash Core developers
165+
Copyright (C) 2009-2023 The Bitcoin Core developers
161166

162167
Please contribute if you find Dash Core useful. Visit <https://dash.org> for
163168
further information about the software.

doc/man/dash-qt.1

+24-23
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH DASH-QT "1" "December 2022" "dash-qt v18.2.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2+
.TH DASH-QT "1" "April 2023" "dash-qt v19.0.0" "User Commands"
33
.SH NAME
4-
dash-qt \- manual page for dash-qt v18.2.0
4+
dash-qt \- manual page for dash-qt v19.0.0
55
.SH SYNOPSIS
66
.B dash-qt
77
[\fI\,command-line options\/\fR]
88
.SH DESCRIPTION
9-
Dash Core version v18.2.0
9+
Dash Core version v19.0.0
1010
.SH OPTIONS
1111
.HP
1212
\-?
@@ -23,9 +23,9 @@ message)
2323
If this block is in the chain assume that it and its ancestors are valid
2424
and potentially skip their script verification (0 to verify all,
2525
default:
26-
000000000000001d531f36005159f19351bd49ca676398a561e55dcccb84eacd,
26+
00000000000000261bdbe99c01fcba992e577efa6cc41aae564b8ca9f112b2a3,
2727
testnet:
28-
00000104cb60a2b5e00a8a4259582756e5bf0dca201c0993c63f0e54971ea91a)
28+
0000005c35514190ef3c38d322f69412553dc7e1107ed5f92adc2935b90acc51)
2929
.HP
3030
\fB\-blockfilterindex=\fR<type>
3131
.IP
@@ -52,9 +52,8 @@ Specify directory to hold blocks subdirectory for *.dat files (default:
5252
.IP
5353
Whether to reject transactions from network peers. Automatic broadcast
5454
and rebroadcast of any transactions from inbound peers is
55-
disabled, unless '\-whitelistforcerelay' is '1', in which case
56-
whitelisted peers' transactions will be relayed. RPC transactions
57-
are not affected. (default: 0)
55+
disabled, unless the peer has the 'forcerelay' permission. RPC
56+
transactions are not affected. (default: 0)
5857
.HP
5958
\fB\-conf=\fR<file>
6059
.IP
@@ -109,7 +108,7 @@ Do not keep transactions in the mempool longer than <n> hours (default:
109108
.HP
110109
\fB\-par=\fR<n>
111110
.IP
112-
Set the number of script verification threads (\fB\-4\fR to 15, 0 = auto, <0 =
111+
Set the number of script verification threads (\fB\-24\fR to 15, 0 = auto, <0 =
113112
leave that many cores free, default: 0)
114113
.HP
115114
\fB\-persistmempool\fR
@@ -468,18 +467,15 @@ start from wallet creation time, 2 = start from genesis block)
468467
.IP
469468
Spend unconfirmed change when sending transactions (default: 1)
470469
.HP
471-
\fB\-upgradewallet\fR
472-
.IP
473-
Upgrade wallet to latest format on startup
474-
.HP
475470
\fB\-wallet=\fR<path>
476471
.IP
477-
Specify wallet database path. Can be specified multiple times to load
478-
multiple wallets. Path is interpreted relative to <walletdir> if
479-
it is not absolute, and will be created if it does not exist (as
480-
a directory containing a wallet.dat file and log files). For
481-
backwards compatibility this will also accept names of existing
482-
data files in <walletdir>.)
472+
Specify wallet path to load at startup. Can be used multiple times to
473+
load multiple wallets. Path is to a directory containing wallet
474+
data and log files. If the path is not absolute, it is
475+
interpreted relative to <walletdir>. This only loads existing
476+
wallets and does not create new ones. For backwards compatibility
477+
this also accepts names of existing top\-level data files in
478+
<walletdir>.
483479
.HP
484480
\fB\-walletbackupsdir=\fR<dir>
485481
.IP
@@ -868,6 +864,11 @@ devnet\-only)
868864
Override the default LLMQ type used for InstantSendDIP0024. (default:
869865
llmq_60_75, devnet\-only)
870866
.HP
867+
\fB\-llmqplatform=\fR<quorum name>
868+
.IP
869+
Override the default LLMQ type used for Platform. (default: llmq_100_67,
870+
devnet\-only)
871+
.HP
871872
\fB\-minimumdifficultyblocks=\fR<n>
872873
.IP
873874
The number of blocks that can be mined with the minimum difficulty at
@@ -1028,7 +1029,7 @@ Set the font weight for bold texts. Possible range 0 to 8 (default: 4)
10281029
.HP
10291030
\fB\-font\-weight\-normal\fR
10301031
.IP
1031-
Set the font weight for normal texts. Possible range 0 to 8 (default: 1)
1032+
Set the font weight for normal texts. Possible range 0 to 8 (default: 2)
10321033
.HP
10331034
\fB\-lang=\fR<lang>
10341035
.IP
@@ -1050,8 +1051,8 @@ Show splash screen on startup (default: 1)
10501051
.IP
10511052
Sets a window title which is appended to "Dash Core \- "
10521053
.SH COPYRIGHT
1053-
Copyright (C) 2014-2022 The Dash Core developers
1054-
Copyright (C) 2009-2022 The Bitcoin Core developers
1054+
Copyright (C) 2014-2023 The Dash Core developers
1055+
Copyright (C) 2009-2023 The Bitcoin Core developers
10551056

10561057
Please contribute if you find Dash Core useful. Visit <https://dash.org> for
10571058
further information about the software.

doc/man/dash-tx.1

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH DASH-TX "1" "December 2022" "dash-tx v18.2.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2+
.TH DASH-TX "1" "April 2023" "dash-tx v19.0.0" "User Commands"
33
.SH NAME
4-
dash-tx \- manual page for dash-tx v18.2.0
4+
dash-tx \- manual page for dash-tx v19.0.0
55
.SH SYNOPSIS
66
.B dash-tx
77
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded dash transaction\/\fR
88
.br
99
.B dash-tx
1010
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded dash transaction\/\fR
1111
.SH DESCRIPTION
12-
Dash Core dash\-tx utility version v18.2.0
12+
Dash Core dash\-tx utility version v19.0.0
1313
.SH OPTIONS
1414
.HP
1515
\-?
@@ -65,6 +65,11 @@ devnet\-only)
6565
Override the default LLMQ type used for InstantSendDIP0024. (default:
6666
llmq_60_75, devnet\-only)
6767
.HP
68+
\fB\-llmqplatform=\fR<quorum name>
69+
.IP
70+
Override the default LLMQ type used for Platform. (default: llmq_100_67,
71+
devnet\-only)
72+
.HP
6873
\fB\-minimumdifficultyblocks=\fR<n>
6974
.IP
7075
The number of blocks that can be mined with the minimum difficulty at
@@ -142,8 +147,8 @@ set=NAME:JSON\-STRING
142147
.IP
143148
Set register NAME to given JSON\-STRING
144149
.SH COPYRIGHT
145-
Copyright (C) 2014-2022 The Dash Core developers
146-
Copyright (C) 2009-2022 The Bitcoin Core developers
150+
Copyright (C) 2014-2023 The Dash Core developers
151+
Copyright (C) 2009-2023 The Bitcoin Core developers
147152

148153
Please contribute if you find Dash Core useful. Visit <https://dash.org> for
149154
further information about the software.

doc/man/dash-wallet.1

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH DASH-WALLET "1" "December 2022" "dash-wallet v18.2.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2+
.TH DASH-WALLET "1" "April 2023" "dash-wallet v19.0.0" "User Commands"
33
.SH NAME
4-
dash-wallet \- manual page for dash-wallet v18.2.0
4+
dash-wallet \- manual page for dash-wallet v19.0.0
55
.SH DESCRIPTION
6-
Dash Core dash\-wallet version v18.2.0
6+
Dash Core dash\-wallet version v19.0.0
77
.PP
88
dash\-wallet is an offline tool for creating and interacting with Dash Core wallet files.
99
By default dash\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
@@ -73,6 +73,11 @@ devnet\-only)
7373
Override the default LLMQ type used for InstantSendDIP0024. (default:
7474
llmq_60_75, devnet\-only)
7575
.HP
76+
\fB\-llmqplatform=\fR<quorum name>
77+
.IP
78+
Override the default LLMQ type used for Platform. (default: llmq_100_67,
79+
devnet\-only)
80+
.HP
7681
\fB\-minimumdifficultyblocks=\fR<n>
7782
.IP
7883
The number of blocks that can be mined with the minimum difficulty at
@@ -101,8 +106,8 @@ salvage
101106
.IP
102107
Attempt to recover private keys from a corrupt wallet
103108
.SH COPYRIGHT
104-
Copyright (C) 2014-2022 The Dash Core developers
105-
Copyright (C) 2009-2022 The Bitcoin Core developers
109+
Copyright (C) 2014-2023 The Dash Core developers
110+
Copyright (C) 2009-2023 The Bitcoin Core developers
106111

107112
Please contribute if you find Dash Core useful. Visit <https://dash.org> for
108113
further information about the software.

doc/man/dashd.1

+23-22
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH DASHD "1" "December 2022" "dashd v18.2.0" "User Commands"
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
2+
.TH DASHD "1" "April 2023" "dashd v19.0.0" "User Commands"
33
.SH NAME
4-
dashd \- manual page for dashd v18.2.0
4+
dashd \- manual page for dashd v19.0.0
55
.SH SYNOPSIS
66
.B dashd
77
[\fI\,options\/\fR] \fI\,Start Dash Core Daemon\/\fR
88
.SH DESCRIPTION
9-
Dash Core Daemon version v18.2.0
9+
Dash Core Daemon version v19.0.0
1010
.SH OPTIONS
1111
.HP
1212
\-?
@@ -23,9 +23,9 @@ message)
2323
If this block is in the chain assume that it and its ancestors are valid
2424
and potentially skip their script verification (0 to verify all,
2525
default:
26-
000000000000001d531f36005159f19351bd49ca676398a561e55dcccb84eacd,
26+
00000000000000261bdbe99c01fcba992e577efa6cc41aae564b8ca9f112b2a3,
2727
testnet:
28-
00000104cb60a2b5e00a8a4259582756e5bf0dca201c0993c63f0e54971ea91a)
28+
0000005c35514190ef3c38d322f69412553dc7e1107ed5f92adc2935b90acc51)
2929
.HP
3030
\fB\-blockfilterindex=\fR<type>
3131
.IP
@@ -52,9 +52,8 @@ Specify directory to hold blocks subdirectory for *.dat files (default:
5252
.IP
5353
Whether to reject transactions from network peers. Automatic broadcast
5454
and rebroadcast of any transactions from inbound peers is
55-
disabled, unless '\-whitelistforcerelay' is '1', in which case
56-
whitelisted peers' transactions will be relayed. RPC transactions
57-
are not affected. (default: 0)
55+
disabled, unless the peer has the 'forcerelay' permission. RPC
56+
transactions are not affected. (default: 0)
5857
.HP
5958
\fB\-conf=\fR<file>
6059
.IP
@@ -109,7 +108,7 @@ Do not keep transactions in the mempool longer than <n> hours (default:
109108
.HP
110109
\fB\-par=\fR<n>
111110
.IP
112-
Set the number of script verification threads (\fB\-4\fR to 15, 0 = auto, <0 =
111+
Set the number of script verification threads (\fB\-24\fR to 15, 0 = auto, <0 =
113112
leave that many cores free, default: 0)
114113
.HP
115114
\fB\-persistmempool\fR
@@ -468,18 +467,15 @@ start from wallet creation time, 2 = start from genesis block)
468467
.IP
469468
Spend unconfirmed change when sending transactions (default: 1)
470469
.HP
471-
\fB\-upgradewallet\fR
472-
.IP
473-
Upgrade wallet to latest format on startup
474-
.HP
475470
\fB\-wallet=\fR<path>
476471
.IP
477-
Specify wallet database path. Can be specified multiple times to load
478-
multiple wallets. Path is interpreted relative to <walletdir> if
479-
it is not absolute, and will be created if it does not exist (as
480-
a directory containing a wallet.dat file and log files). For
481-
backwards compatibility this will also accept names of existing
482-
data files in <walletdir>.)
472+
Specify wallet path to load at startup. Can be used multiple times to
473+
load multiple wallets. Path is to a directory containing wallet
474+
data and log files. If the path is not absolute, it is
475+
interpreted relative to <walletdir>. This only loads existing
476+
wallets and does not create new ones. For backwards compatibility
477+
this also accepts names of existing top\-level data files in
478+
<walletdir>.
483479
.HP
484480
\fB\-walletbackupsdir=\fR<dir>
485481
.IP
@@ -868,6 +864,11 @@ devnet\-only)
868864
Override the default LLMQ type used for InstantSendDIP0024. (default:
869865
llmq_60_75, devnet\-only)
870866
.HP
867+
\fB\-llmqplatform=\fR<quorum name>
868+
.IP
869+
Override the default LLMQ type used for Platform. (default: llmq_100_67,
870+
devnet\-only)
871+
.HP
871872
\fB\-minimumdifficultyblocks=\fR<n>
872873
.IP
873874
The number of blocks that can be mined with the minimum difficulty at
@@ -1001,8 +1002,8 @@ subject to empty whitelists.
10011002
.IP
10021003
Accept command line and JSON\-RPC commands
10031004
.SH COPYRIGHT
1004-
Copyright (C) 2014-2022 The Dash Core developers
1005-
Copyright (C) 2009-2022 The Bitcoin Core developers
1005+
Copyright (C) 2014-2023 The Dash Core developers
1006+
Copyright (C) 2009-2023 The Bitcoin Core developers
10061007

10071008
Please contribute if you find Dash Core useful. Visit <https://dash.org> for
10081009
further information about the software.

doc/release-notes-15427.md

-8
This file was deleted.

doc/release-notes-15454.md

-6
This file was deleted.

0 commit comments

Comments
 (0)