Skip to content

Commit 491db4a

Browse files
UdjinM6UdjinM6
committed
Merge branch 'master' into merge_master_23.0.2
2 parents 09d533a + cdc5a63 commit 491db4a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+510
-409
lines changed

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
22
dnl Don't forget to push a corresponding tag when updating any of _CLIENT_VERSION_* numbers
33
define(_CLIENT_VERSION_MAJOR, 23)
44
define(_CLIENT_VERSION_MINOR, 0)
5-
define(_CLIENT_VERSION_BUILD, 0)
5+
define(_CLIENT_VERSION_BUILD, 2)
66
define(_CLIENT_VERSION_IS_RELEASE, false)
77
define(_COPYRIGHT_YEAR, 2025)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

‎doc/man/dash-cli.1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH DASH-CLI "1" "October 2025" "dash-cli v23.0.0" "User Commands"
2+
.TH DASH-CLI "1" "December 2025" "dash-cli v23.0.2" "User Commands"
33
.SH NAME
4-
dash-cli \- manual page for dash-cli v23.0.0
4+
dash-cli \- manual page for dash-cli v23.0.2
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 v23.0.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 v23.0.0
18+
Dash Core RPC client version v23.0.2
1919
.SH OPTIONS
2020
.HP
2121
\-?
@@ -162,4 +162,4 @@ The source code is available from <https://github.com/dashpay/dash>.
162162

163163
This is experimental software.
164164
Distributed under the MIT software license, see the accompanying file COPYING
165-
or <https://opensource.org/licenses/MIT>
165+
or <https://opensource.org/licenses/MIT>

‎doc/man/dash-qt.1‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH DASH-QT "1" "October 2025" "dash-qt v23.0.0" "User Commands"
2+
.TH DASH-QT "1" "December 2025" "dash-qt v23.0.2" "User Commands"
33
.SH NAME
4-
dash-qt \- manual page for dash-qt v23.0.0
4+
dash-qt \- manual page for dash-qt v23.0.2
55
.SH SYNOPSIS
66
.B dash-qt
77
[\fI\,command-line options\/\fR] [\fI\,URI\/\fR]
88
.SH DESCRIPTION
9-
Dash Core version v23.0.0
9+
Dash Core version v23.0.2
1010
.PP
1111
Optional URI is a Dash address in BIP21 URI format.
1212
.SH OPTIONS
@@ -25,9 +25,9 @@ message)
2525
If this block is in the chain assume that it and its ancestors are valid
2626
and potentially skip their script verification (0 to verify all,
2727
default:
28-
0000000000000009ba1e8f47851d036bb618a4f6565eb3c32d1f647d450ff195,
28+
00000000000000149d207073b6959004cb457df98e111981c9bf0e4e5190c5db,
2929
testnet:
30-
00000107d42829a38e31c1a38c660d621e1ca376a880df1520e85e38af175d3a)
30+
000000598ffa45083b795d85a1e40f13da68b2c6c81e232cb990108f0515f88e)
3131
.HP
3232
\fB\-blockfilterindex=\fR<type>
3333
.IP
@@ -125,12 +125,12 @@ Do not keep transactions in the mempool longer than <n> hours (default:
125125
.HP
126126
\fB\-par=\fR<n>
127127
.IP
128-
Set the number of script verification threads (\fB\-24\fR to 15, 0 = auto, <0 =
128+
Set the number of script verification threads (\fB\-14\fR to 15, 0 = auto, <0 =
129129
leave that many cores free, default: 0)
130130
.HP
131131
\fB\-parbls=\fR<n>
132132
.IP
133-
Set the number of BLS verification threads (\fB\-24\fR to 33, 0 = auto, <0 =
133+
Set the number of BLS verification threads (\fB\-14\fR to 33, 0 = auto, <0 =
134134
leave that many cores free, default: 0)
135135
.HP
136136
\fB\-persistmempool\fR
@@ -870,7 +870,7 @@ is optional). If <category> is not supplied or if <category> = 1,
870870
output all debug and trace logging. <category> can be: addrman,
871871
bench, blockstorage, chainlocks, cmpctblock, coindb, coinjoin,
872872
creditpool, ehf, estimatefee, gobject, http, i2p, instantsend,
873-
ipc, leveldb, libevent, llmq, llmq\-dkg, llmq\-sigs, lock, mempool,
873+
ipc, leveldb, libevent, llmq, llmq\-dkg, llmq\-sigs, mempool,
874874
mempoolrej, mnpayments, mnsync, net, netconn, proxy, prune, qt,
875875
rand, reindex, rpc, selectcoins, spork, tor, txreconciliation,
876876
validation, walletdb, zmq. This option can be specified multiple
@@ -1157,7 +1157,7 @@ Set the font weight for bold texts. Possible range 0 to 8 (default: 4)
11571157
.HP
11581158
\fB\-font\-weight\-normal\fR
11591159
.IP
1160-
Set the font weight for normal texts. Possible range 0 to 8 (default: 2)
1160+
Set the font weight for normal texts. Possible range 0 to 8 (default: 1)
11611161
.HP
11621162
\fB\-lang=\fR<lang>
11631163
.IP
@@ -1188,4 +1188,4 @@ The source code is available from <https://github.com/dashpay/dash>.
11881188

11891189
This is experimental software.
11901190
Distributed under the MIT software license, see the accompanying file COPYING
1191-
or <https://opensource.org/licenses/MIT>
1191+
or <https://opensource.org/licenses/MIT>

‎doc/man/dash-tx.1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH DASH-TX "1" "October 2025" "dash-tx v23.0.0" "User Commands"
2+
.TH DASH-TX "1" "December 2025" "dash-tx v23.0.2" "User Commands"
33
.SH NAME
4-
dash-tx \- manual page for dash-tx v23.0.0
4+
dash-tx \- manual page for dash-tx v23.0.2
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 v23.0.0
12+
Dash Core dash\-tx utility version v23.0.2
1313
.SH OPTIONS
1414
.HP
1515
\-?
@@ -119,4 +119,4 @@ The source code is available from <https://github.com/dashpay/dash>.
119119

120120
This is experimental software.
121121
Distributed under the MIT software license, see the accompanying file COPYING
122-
or <https://opensource.org/licenses/MIT>
122+
or <https://opensource.org/licenses/MIT>

‎doc/man/dash-wallet.1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH DASH-WALLET "1" "October 2025" "dash-wallet v23.0.0" "User Commands"
2+
.TH DASH-WALLET "1" "December 2025" "dash-wallet v23.0.2" "User Commands"
33
.SH NAME
4-
dash-wallet \- manual page for dash-wallet v23.0.0
4+
dash-wallet \- manual page for dash-wallet v23.0.2
55
.SH DESCRIPTION
6-
Dash Core dash\-wallet version v23.0.0
6+
Dash Core dash\-wallet version v23.0.2
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.
@@ -109,4 +109,4 @@ The source code is available from <https://github.com/dashpay/dash>.
109109

110110
This is experimental software.
111111
Distributed under the MIT software license, see the accompanying file COPYING
112-
or <https://opensource.org/licenses/MIT>
112+
or <https://opensource.org/licenses/MIT>

‎doc/man/dashd.1‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH DASHD "1" "October 2025" "dashd v23.0.0" "User Commands"
2+
.TH DASHD "1" "December 2025" "dashd v23.0.2" "User Commands"
33
.SH NAME
4-
dashd \- manual page for dashd v23.0.0
4+
dashd \- manual page for dashd v23.0.2
55
.SH SYNOPSIS
66
.B dashd
77
[\fI\,options\/\fR] \fI\,Start Dash Core\/\fR
88
.SH DESCRIPTION
9-
Dash Core version v23.0.0
9+
Dash Core version v23.0.2
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-
0000000000000009ba1e8f47851d036bb618a4f6565eb3c32d1f647d450ff195,
26+
00000000000000149d207073b6959004cb457df98e111981c9bf0e4e5190c5db,
2727
testnet:
28-
00000107d42829a38e31c1a38c660d621e1ca376a880df1520e85e38af175d3a)
28+
000000598ffa45083b795d85a1e40f13da68b2c6c81e232cb990108f0515f88e)
2929
.HP
3030
\fB\-blockfilterindex=\fR<type>
3131
.IP
@@ -123,12 +123,12 @@ Do not keep transactions in the mempool longer than <n> hours (default:
123123
.HP
124124
\fB\-par=\fR<n>
125125
.IP
126-
Set the number of script verification threads (\fB\-24\fR to 15, 0 = auto, <0 =
126+
Set the number of script verification threads (\fB\-14\fR to 15, 0 = auto, <0 =
127127
leave that many cores free, default: 0)
128128
.HP
129129
\fB\-parbls=\fR<n>
130130
.IP
131-
Set the number of BLS verification threads (\fB\-24\fR to 33, 0 = auto, <0 =
131+
Set the number of BLS verification threads (\fB\-14\fR to 33, 0 = auto, <0 =
132132
leave that many cores free, default: 0)
133133
.HP
134134
\fB\-persistmempool\fR
@@ -868,7 +868,7 @@ is optional). If <category> is not supplied or if <category> = 1,
868868
output all debug and trace logging. <category> can be: addrman,
869869
bench, blockstorage, chainlocks, cmpctblock, coindb, coinjoin,
870870
creditpool, ehf, estimatefee, gobject, http, i2p, instantsend,
871-
ipc, leveldb, libevent, llmq, llmq\-dkg, llmq\-sigs, lock, mempool,
871+
ipc, leveldb, libevent, llmq, llmq\-dkg, llmq\-sigs, mempool,
872872
mempoolrej, mnpayments, mnsync, net, netconn, proxy, prune, qt,
873873
rand, reindex, rpc, selectcoins, spork, tor, txreconciliation,
874874
validation, walletdb, zmq. This option can be specified multiple
@@ -1137,4 +1137,4 @@ The source code is available from <https://github.com/dashpay/dash>.
11371137

11381138
This is experimental software.
11391139
Distributed under the MIT software license, see the accompanying file COPYING
1140-
or <https://opensource.org/licenses/MIT>
1140+
or <https://opensource.org/licenses/MIT>

‎doc/release-notes-14707.md‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎doc/release-notes-22650.md‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎doc/release-notes-22918.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎doc/release-notes-23093.md‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)