From e5aec59e0f5c4e7ae1e91e0fe619eec7d8187ea8 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 14 Oct 2022 10:19:44 +0800 Subject: build: Bump version to 24.0rc2 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e60ae73c01..1156a17166 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 24) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 1) +define(_CLIENT_VERSION_RC, 2) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2022) define(_COPYRIGHT_HOLDERS,[The %s developers]) -- cgit v1.2.3 From c349096fa26171a6753dc114252d7cecdc9df412 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 14 Oct 2022 10:27:29 +0800 Subject: doc: Generate manual pages for 24.0rc2 --- doc/man/bitcoin-cli.1 | 6 +++--- doc/man/bitcoin-qt.1 | 14 +++++++------- doc/man/bitcoin-tx.1 | 6 +++--- doc/man/bitcoin-util.1 | 6 +++--- doc/man/bitcoin-wallet.1 | 6 +++--- doc/man/bitcoind.1 | 14 +++++++------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index 926bd3be83..d770c445ab 100644 --- a/doc/man/bitcoin-cli.1 +++ b/doc/man/bitcoin-cli.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH BITCOIN-CLI "1" "September 2022" "bitcoin-cli v24.0.0rc1" "User Commands" +.TH BITCOIN-CLI "1" "October 2022" "bitcoin-cli v24.0.0rc2" "User Commands" .SH NAME -bitcoin-cli \- manual page for bitcoin-cli v24.0.0rc1 +bitcoin-cli \- manual page for bitcoin-cli v24.0.0rc2 .SH SYNOPSIS .B bitcoin-cli [\fI\,options\/\fR] \fI\, \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR @@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v24.0.0rc1 .B bitcoin-cli [\fI\,options\/\fR] \fI\,help Get help for a command\/\fR .SH DESCRIPTION -Bitcoin Core RPC client version v24.0.0rc1 +Bitcoin Core RPC client version v24.0.0rc2 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index 90e707b6f0..196ba1e70c 100644 --- a/doc/man/bitcoin-qt.1 +++ b/doc/man/bitcoin-qt.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH BITCOIN-QT "1" "September 2022" "bitcoin-qt v24.0.0rc1" "User Commands" +.TH BITCOIN-QT "1" "October 2022" "bitcoin-qt v24.0.0rc2" "User Commands" .SH NAME -bitcoin-qt \- manual page for bitcoin-qt v24.0.0rc1 +bitcoin-qt \- manual page for bitcoin-qt v24.0.0rc2 .SH SYNOPSIS .B bitcoin-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Bitcoin Core version v24.0.0rc1 +Bitcoin Core version v24.0.0rc2 .SH OPTIONS .HP \-? @@ -339,10 +339,6 @@ Serve compact block filters to peers per BIP 157 (default: 0) Support filtering of blocks and transaction with bloom filters (default: 0) .HP -\fB\-permitbaremultisig\fR -.IP -Relay non\-P2SH multisig (default: 1) -.HP \fB\-port=\fR .IP Listen for connections on . Nodes not using the default ports @@ -683,6 +679,10 @@ signaling (default: 0) Fees (in BTC/kvB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: 0.00001) .HP +\fB\-permitbaremultisig\fR +.IP +Relay non\-P2SH multisig (default: 1) +.HP \fB\-whitelistforcerelay\fR .IP Add 'forcerelay' permission to whitelisted inbound peers with default diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index 0d21d63ff1..9854f87ba6 100644 --- a/doc/man/bitcoin-tx.1 +++ b/doc/man/bitcoin-tx.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH BITCOIN-TX "1" "September 2022" "bitcoin-tx v24.0.0rc1" "User Commands" +.TH BITCOIN-TX "1" "October 2022" "bitcoin-tx v24.0.0rc2" "User Commands" .SH NAME -bitcoin-tx \- manual page for bitcoin-tx v24.0.0rc1 +bitcoin-tx \- manual page for bitcoin-tx v24.0.0rc2 .SH SYNOPSIS .B bitcoin-tx [\fI\,options\/\fR] \fI\, \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR @@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v24.0.0rc1 .B bitcoin-tx [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-tx utility version v24.0.0rc1 +Bitcoin Core bitcoin\-tx utility version v24.0.0rc2 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1 index 07b1a37341..f03037a435 100644 --- a/doc/man/bitcoin-util.1 +++ b/doc/man/bitcoin-util.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH BITCOIN-UTIL "1" "September 2022" "bitcoin-util v24.0.0rc1" "User Commands" +.TH BITCOIN-UTIL "1" "October 2022" "bitcoin-util v24.0.0rc2" "User Commands" .SH NAME -bitcoin-util \- manual page for bitcoin-util v24.0.0rc1 +bitcoin-util \- manual page for bitcoin-util v24.0.0rc2 .SH SYNOPSIS .B bitcoin-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-util utility version v24.0.0rc1 +Bitcoin Core bitcoin\-util utility version v24.0.0rc2 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1 index ed1497dba1..50196be5e2 100644 --- a/doc/man/bitcoin-wallet.1 +++ b/doc/man/bitcoin-wallet.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH BITCOIN-WALLET "1" "September 2022" "bitcoin-wallet v24.0.0rc1" "User Commands" +.TH BITCOIN-WALLET "1" "October 2022" "bitcoin-wallet v24.0.0rc2" "User Commands" .SH NAME -bitcoin-wallet \- manual page for bitcoin-wallet v24.0.0rc1 +bitcoin-wallet \- manual page for bitcoin-wallet v24.0.0rc2 .SH DESCRIPTION -Bitcoin Core bitcoin\-wallet version v24.0.0rc1 +Bitcoin Core bitcoin\-wallet version v24.0.0rc2 .PP bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files. By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir. diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1 index 98c9aeecdd..7e123d1500 100644 --- a/doc/man/bitcoind.1 +++ b/doc/man/bitcoind.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH BITCOIND "1" "September 2022" "bitcoind v24.0.0rc1" "User Commands" +.TH BITCOIND "1" "October 2022" "bitcoind v24.0.0rc2" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v24.0.0rc1 +bitcoind \- manual page for bitcoind v24.0.0rc2 .SH SYNOPSIS .B bitcoind [\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR .SH DESCRIPTION -Bitcoin Core version v24.0.0rc1 +Bitcoin Core version v24.0.0rc2 .SH OPTIONS .HP \-? @@ -339,10 +339,6 @@ Serve compact block filters to peers per BIP 157 (default: 0) Support filtering of blocks and transaction with bloom filters (default: 0) .HP -\fB\-permitbaremultisig\fR -.IP -Relay non\-P2SH multisig (default: 1) -.HP \fB\-port=\fR .IP Listen for connections on . Nodes not using the default ports @@ -683,6 +679,10 @@ signaling (default: 0) Fees (in BTC/kvB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: 0.00001) .HP +\fB\-permitbaremultisig\fR +.IP +Relay non\-P2SH multisig (default: 1) +.HP \fB\-whitelistforcerelay\fR .IP Add 'forcerelay' permission to whitelisted inbound peers with default -- cgit v1.2.3 From d68b6abeb844daa907c7d8c103efac4092de34c0 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 14 Oct 2022 10:28:34 +0800 Subject: doc: Generate example bitcoin conf for 24.0rc2 --- share/examples/bitcoin.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/examples/bitcoin.conf b/share/examples/bitcoin.conf index ab94040283..bbbbe66404 100644 --- a/share/examples/bitcoin.conf +++ b/share/examples/bitcoin.conf @@ -282,9 +282,6 @@ # 0) #peerbloomfilters=1 -# Relay non-P2SH multisig (default: 1) -#permitbaremultisig=1 - # Listen for connections on . Nodes not using the default ports # (default: 8333, testnet: 18333, signet: 38333, regtest: 18444) # are unlikely to get incoming connections. Not relevant for I2P @@ -575,6 +572,9 @@ # relaying, mining and transaction creation (default: 0.00001) #minrelaytxfee= +# Relay non-P2SH multisig (default: 1) +#permitbaremultisig=1 + # Add 'forcerelay' permission to whitelisted inbound peers with default # permissions. This will relay transactions even if the # transactions were already in the mempool. (default: 0) -- cgit v1.2.3