Skip to content

Commit

Permalink
Merge pull request #5308 from PastaPastaPasta/v19.x-bp-final
Browse files Browse the repository at this point in the history
[v19.x] backport: final version release backports
  • Loading branch information
PastaPastaPasta committed Apr 11, 2023
2 parents 68b6677 + 4266edf commit 3688ac9
Show file tree
Hide file tree
Showing 39 changed files with 2,668 additions and 2,770 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ before_script:
- 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);'
# Build docker image only for develop branch of the main repo
- 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
# TODO: Check keys and signed commits
# TODO(ignore if don't use travis): Check keys and signed commits
#- 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
#- if [ "$TRAVIS_REPO_SLUG" = "dashpay/dash" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then travis_wait 30 contrib/verify-commits/verify-commits.py; fi
after_script:
Expand Down
3 changes: 1 addition & 2 deletions ci/dash/test_unittests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ if [ "$RUN_UNIT_TESTS" != "true" ]; then
exit 0
fi

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

export WINEDEBUG=fixme-all
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 19)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 10)
define(_CLIENT_VERSION_IS_RELEASE, false)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2023)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]])
Expand Down
17 changes: 11 additions & 6 deletions doc/man/dash-cli.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH DASH-CLI "1" "December 2022" "dash-cli v18.2.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
.TH DASH-CLI "1" "April 2023" "dash-cli v19.0.0" "User Commands"
.SH NAME
dash-cli \- manual page for dash-cli v18.2.0
dash-cli \- manual page for dash-cli v19.0.0
.SH SYNOPSIS
.B dash-cli
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Dash Core\/\fR
Expand All @@ -15,7 +15,7 @@ dash-cli \- manual page for dash-cli v18.2.0
.B dash-cli
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
.SH DESCRIPTION
Dash Core RPC client version v18.2.0
Dash Core RPC client version v19.0.0
.SH OPTIONS
.HP
\-?
Expand Down Expand Up @@ -142,6 +142,11 @@ devnet\-only)
Override the default LLMQ type used for InstantSendDIP0024. (default:
llmq_60_75, devnet\-only)
.HP
\fB\-llmqplatform=\fR<quorum name>
.IP
Override the default LLMQ type used for Platform. (default: llmq_100_67,
devnet\-only)
.HP
\fB\-minimumdifficultyblocks=\fR<n>
.IP
The number of blocks that can be mined with the minimum difficulty at
Expand All @@ -156,8 +161,8 @@ minutes, devnet\-only)
.IP
Use the test chain
.SH COPYRIGHT
Copyright (C) 2014-2022 The Dash Core developers
Copyright (C) 2009-2022 The Bitcoin Core developers
Copyright (C) 2014-2023 The Dash Core developers
Copyright (C) 2009-2023 The Bitcoin Core developers

Please contribute if you find Dash Core useful. Visit <https://dash.org> for
further information about the software.
Expand Down
47 changes: 24 additions & 23 deletions doc/man/dash-qt.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH DASH-QT "1" "December 2022" "dash-qt v18.2.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
.TH DASH-QT "1" "April 2023" "dash-qt v19.0.0" "User Commands"
.SH NAME
dash-qt \- manual page for dash-qt v18.2.0
dash-qt \- manual page for dash-qt v19.0.0
.SH SYNOPSIS
.B dash-qt
[\fI\,command-line options\/\fR]
.SH DESCRIPTION
Dash Core version v18.2.0
Dash Core version v19.0.0
.SH OPTIONS
.HP
\-?
Expand All @@ -23,9 +23,9 @@ message)
If this block is in the chain assume that it and its ancestors are valid
and potentially skip their script verification (0 to verify all,
default:
000000000000001d531f36005159f19351bd49ca676398a561e55dcccb84eacd,
00000000000000261bdbe99c01fcba992e577efa6cc41aae564b8ca9f112b2a3,
testnet:
00000104cb60a2b5e00a8a4259582756e5bf0dca201c0993c63f0e54971ea91a)
0000005c35514190ef3c38d322f69412553dc7e1107ed5f92adc2935b90acc51)
.HP
\fB\-blockfilterindex=\fR<type>
.IP
Expand All @@ -52,9 +52,8 @@ Specify directory to hold blocks subdirectory for *.dat files (default:
.IP
Whether to reject transactions from network peers. Automatic broadcast
and rebroadcast of any transactions from inbound peers is
disabled, unless '\-whitelistforcerelay' is '1', in which case
whitelisted peers' transactions will be relayed. RPC transactions
are not affected. (default: 0)
disabled, unless the peer has the 'forcerelay' permission. RPC
transactions are not affected. (default: 0)
.HP
\fB\-conf=\fR<file>
.IP
Expand Down Expand Up @@ -109,7 +108,7 @@ Do not keep transactions in the mempool longer than <n> hours (default:
.HP
\fB\-par=\fR<n>
.IP
Set the number of script verification threads (\fB\-4\fR to 15, 0 = auto, <0 =
Set the number of script verification threads (\fB\-24\fR to 15, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-persistmempool\fR
Expand Down Expand Up @@ -468,18 +467,15 @@ start from wallet creation time, 2 = start from genesis block)
.IP
Spend unconfirmed change when sending transactions (default: 1)
.HP
\fB\-upgradewallet\fR
.IP
Upgrade wallet to latest format on startup
.HP
\fB\-wallet=\fR<path>
.IP
Specify wallet database path. Can be specified multiple times to load
multiple wallets. Path is interpreted relative to <walletdir> if
it is not absolute, and will be created if it does not exist (as
a directory containing a wallet.dat file and log files). For
backwards compatibility this will also accept names of existing
data files in <walletdir>.)
Specify wallet path to load at startup. Can be used multiple times to
load multiple wallets. Path is to a directory containing wallet
data and log files. If the path is not absolute, it is
interpreted relative to <walletdir>. This only loads existing
wallets and does not create new ones. For backwards compatibility
this also accepts names of existing top\-level data files in
<walletdir>.
.HP
\fB\-walletbackupsdir=\fR<dir>
.IP
Expand Down Expand Up @@ -868,6 +864,11 @@ devnet\-only)
Override the default LLMQ type used for InstantSendDIP0024. (default:
llmq_60_75, devnet\-only)
.HP
\fB\-llmqplatform=\fR<quorum name>
.IP
Override the default LLMQ type used for Platform. (default: llmq_100_67,
devnet\-only)
.HP
\fB\-minimumdifficultyblocks=\fR<n>
.IP
The number of blocks that can be mined with the minimum difficulty at
Expand Down Expand Up @@ -1028,7 +1029,7 @@ Set the font weight for bold texts. Possible range 0 to 8 (default: 4)
.HP
\fB\-font\-weight\-normal\fR
.IP
Set the font weight for normal texts. Possible range 0 to 8 (default: 1)
Set the font weight for normal texts. Possible range 0 to 8 (default: 2)
.HP
\fB\-lang=\fR<lang>
.IP
Expand All @@ -1050,8 +1051,8 @@ Show splash screen on startup (default: 1)
.IP
Sets a window title which is appended to "Dash Core \- "
.SH COPYRIGHT
Copyright (C) 2014-2022 The Dash Core developers
Copyright (C) 2009-2022 The Bitcoin Core developers
Copyright (C) 2014-2023 The Dash Core developers
Copyright (C) 2009-2023 The Bitcoin Core developers

Please contribute if you find Dash Core useful. Visit <https://dash.org> for
further information about the software.
Expand Down
17 changes: 11 additions & 6 deletions doc/man/dash-tx.1
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH DASH-TX "1" "December 2022" "dash-tx v18.2.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
.TH DASH-TX "1" "April 2023" "dash-tx v19.0.0" "User Commands"
.SH NAME
dash-tx \- manual page for dash-tx v18.2.0
dash-tx \- manual page for dash-tx v19.0.0
.SH SYNOPSIS
.B dash-tx
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded dash transaction\/\fR
.br
.B dash-tx
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded dash transaction\/\fR
.SH DESCRIPTION
Dash Core dash\-tx utility version v18.2.0
Dash Core dash\-tx utility version v19.0.0
.SH OPTIONS
.HP
\-?
Expand Down Expand Up @@ -65,6 +65,11 @@ devnet\-only)
Override the default LLMQ type used for InstantSendDIP0024. (default:
llmq_60_75, devnet\-only)
.HP
\fB\-llmqplatform=\fR<quorum name>
.IP
Override the default LLMQ type used for Platform. (default: llmq_100_67,
devnet\-only)
.HP
\fB\-minimumdifficultyblocks=\fR<n>
.IP
The number of blocks that can be mined with the minimum difficulty at
Expand Down Expand Up @@ -142,8 +147,8 @@ set=NAME:JSON\-STRING
.IP
Set register NAME to given JSON\-STRING
.SH COPYRIGHT
Copyright (C) 2014-2022 The Dash Core developers
Copyright (C) 2009-2022 The Bitcoin Core developers
Copyright (C) 2014-2023 The Dash Core developers
Copyright (C) 2009-2023 The Bitcoin Core developers

Please contribute if you find Dash Core useful. Visit <https://dash.org> for
further information about the software.
Expand Down
17 changes: 11 additions & 6 deletions doc/man/dash-wallet.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH DASH-WALLET "1" "December 2022" "dash-wallet v18.2.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
.TH DASH-WALLET "1" "April 2023" "dash-wallet v19.0.0" "User Commands"
.SH NAME
dash-wallet \- manual page for dash-wallet v18.2.0
dash-wallet \- manual page for dash-wallet v19.0.0
.SH DESCRIPTION
Dash Core dash\-wallet version v18.2.0
Dash Core dash\-wallet version v19.0.0
.PP
dash\-wallet is an offline tool for creating and interacting with Dash Core wallet files.
By default dash\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
Expand Down Expand Up @@ -73,6 +73,11 @@ devnet\-only)
Override the default LLMQ type used for InstantSendDIP0024. (default:
llmq_60_75, devnet\-only)
.HP
\fB\-llmqplatform=\fR<quorum name>
.IP
Override the default LLMQ type used for Platform. (default: llmq_100_67,
devnet\-only)
.HP
\fB\-minimumdifficultyblocks=\fR<n>
.IP
The number of blocks that can be mined with the minimum difficulty at
Expand Down Expand Up @@ -101,8 +106,8 @@ salvage
.IP
Attempt to recover private keys from a corrupt wallet
.SH COPYRIGHT
Copyright (C) 2014-2022 The Dash Core developers
Copyright (C) 2009-2022 The Bitcoin Core developers
Copyright (C) 2014-2023 The Dash Core developers
Copyright (C) 2009-2023 The Bitcoin Core developers

Please contribute if you find Dash Core useful. Visit <https://dash.org> for
further information about the software.
Expand Down
45 changes: 23 additions & 22 deletions doc/man/dashd.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH DASHD "1" "December 2022" "dashd v18.2.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
.TH DASHD "1" "April 2023" "dashd v19.0.0" "User Commands"
.SH NAME
dashd \- manual page for dashd v18.2.0
dashd \- manual page for dashd v19.0.0
.SH SYNOPSIS
.B dashd
[\fI\,options\/\fR] \fI\,Start Dash Core Daemon\/\fR
.SH DESCRIPTION
Dash Core Daemon version v18.2.0
Dash Core Daemon version v19.0.0
.SH OPTIONS
.HP
\-?
Expand All @@ -23,9 +23,9 @@ message)
If this block is in the chain assume that it and its ancestors are valid
and potentially skip their script verification (0 to verify all,
default:
000000000000001d531f36005159f19351bd49ca676398a561e55dcccb84eacd,
00000000000000261bdbe99c01fcba992e577efa6cc41aae564b8ca9f112b2a3,
testnet:
00000104cb60a2b5e00a8a4259582756e5bf0dca201c0993c63f0e54971ea91a)
0000005c35514190ef3c38d322f69412553dc7e1107ed5f92adc2935b90acc51)
.HP
\fB\-blockfilterindex=\fR<type>
.IP
Expand All @@ -52,9 +52,8 @@ Specify directory to hold blocks subdirectory for *.dat files (default:
.IP
Whether to reject transactions from network peers. Automatic broadcast
and rebroadcast of any transactions from inbound peers is
disabled, unless '\-whitelistforcerelay' is '1', in which case
whitelisted peers' transactions will be relayed. RPC transactions
are not affected. (default: 0)
disabled, unless the peer has the 'forcerelay' permission. RPC
transactions are not affected. (default: 0)
.HP
\fB\-conf=\fR<file>
.IP
Expand Down Expand Up @@ -109,7 +108,7 @@ Do not keep transactions in the mempool longer than <n> hours (default:
.HP
\fB\-par=\fR<n>
.IP
Set the number of script verification threads (\fB\-4\fR to 15, 0 = auto, <0 =
Set the number of script verification threads (\fB\-24\fR to 15, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-persistmempool\fR
Expand Down Expand Up @@ -468,18 +467,15 @@ start from wallet creation time, 2 = start from genesis block)
.IP
Spend unconfirmed change when sending transactions (default: 1)
.HP
\fB\-upgradewallet\fR
.IP
Upgrade wallet to latest format on startup
.HP
\fB\-wallet=\fR<path>
.IP
Specify wallet database path. Can be specified multiple times to load
multiple wallets. Path is interpreted relative to <walletdir> if
it is not absolute, and will be created if it does not exist (as
a directory containing a wallet.dat file and log files). For
backwards compatibility this will also accept names of existing
data files in <walletdir>.)
Specify wallet path to load at startup. Can be used multiple times to
load multiple wallets. Path is to a directory containing wallet
data and log files. If the path is not absolute, it is
interpreted relative to <walletdir>. This only loads existing
wallets and does not create new ones. For backwards compatibility
this also accepts names of existing top\-level data files in
<walletdir>.
.HP
\fB\-walletbackupsdir=\fR<dir>
.IP
Expand Down Expand Up @@ -868,6 +864,11 @@ devnet\-only)
Override the default LLMQ type used for InstantSendDIP0024. (default:
llmq_60_75, devnet\-only)
.HP
\fB\-llmqplatform=\fR<quorum name>
.IP
Override the default LLMQ type used for Platform. (default: llmq_100_67,
devnet\-only)
.HP
\fB\-minimumdifficultyblocks=\fR<n>
.IP
The number of blocks that can be mined with the minimum difficulty at
Expand Down Expand Up @@ -1001,8 +1002,8 @@ subject to empty whitelists.
.IP
Accept command line and JSON\-RPC commands
.SH COPYRIGHT
Copyright (C) 2014-2022 The Dash Core developers
Copyright (C) 2009-2022 The Bitcoin Core developers
Copyright (C) 2014-2023 The Dash Core developers
Copyright (C) 2009-2023 The Bitcoin Core developers

Please contribute if you find Dash Core useful. Visit <https://dash.org> for
further information about the software.
Expand Down
8 changes: 0 additions & 8 deletions doc/release-notes-15427.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-15454.md

This file was deleted.

Loading

0 comments on commit 3688ac9

Please sign in to comment.