Skip to content

[29.x] bump to v29.0rc1 - #32046

Merged
fanquake merged 5 commits into
bitcoin:29.xfrom
glozow:2025-03-29.0-rc1
Mar 13, 2025
Merged

[29.x] bump to v29.0rc1#32046
fanquake merged 5 commits into
bitcoin:29.xfrom
glozow:2025-03-29.0-rc1

Conversation

@glozow

@glozow glozow commented Mar 12, 2025

Copy link
Copy Markdown
Contributor

@DrahtBot

DrahtBot commented Mar 12, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32046.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK hebasto, achow101, davidgumberg

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

hebasto
hebasto approved these changes Mar 12, 2025
View reviewed changes

@hebasto hebasto left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 628e4f59b8784fcde2de176fb98260e71def18ec, I have reviewed the code and it looks OK.

@hebasto

hebasto commented Mar 12, 2025

Copy link
Copy Markdown
Member

ACK 628e4f5, I have reviewed the code and it looks OK.

Revoked. Man pages for bitcoind and bitcoin-qt miss "ZeroMQ notification options"

@glozow
glozow force-pushed the 2025-03-29.0-rc1 branch from 628e4f5 to 868a757 Compare March 12, 2025 19:02
@glozow

glozow commented Mar 12, 2025

Copy link
Copy Markdown
Contributor Author

Great, fixed.

@hebasto

hebasto commented Mar 12, 2025

Copy link
Copy Markdown
Member

ACK 628e4f5, I have reviewed the code and it looks OK.

Revoked. Man pages for bitcoind and bitcoin-qt miss "ZeroMQ notification options"

My apologies for not checking all stuff at once, but examples/bitcoin.conf also lacks "ZeroMQ notification options".

@glozow
glozow force-pushed the 2025-03-29.0-rc1 branch from 868a757 to 47e2fa8 Compare March 12, 2025 19:09
@glozow

glozow commented Mar 12, 2025

Copy link
Copy Markdown
Contributor Author

Thanks @hebasto!

hebasto
hebasto approved these changes Mar 12, 2025
View reviewed changes

@hebasto hebasto left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 47e2fa8.

@davidgumberg

davidgumberg commented Mar 12, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

It appears that gen-bitcoin-conf.sh became broken after #31118 changed the --help output format, all options above -help in the --help output are missing, I've opened a fix in #32049.

bitcoin.conf diff between 28.1 and #32046

 
$ git diff v28.1/share/examples/bitcoin.conf 32046/share/examples/bitcoin.conf
diff --git a/v28.1/share/examples/bitcoin.conf b/32046/share/examples/bitcoin.conf
index a8dfc27..5b0003b 100644
--- a/v28.1/share/examples/bitcoin.conf
+++ b/32046/share/examples/bitcoin.conf
@@ -12,82 +12,6 @@
 ### Options
 
 
-# Execute command when an alert is raised (%s in cmd is replaced by
-# message)
-#alertnotify=<cmd>
-
-# For backwards compatibility, treat an unused bitcoin.conf file in the
-# datadir as a warning, not an error.
-#allowignoredconf=1
-
-# 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:
-# 000000000000000000011c5890365bdbe5d25b97ce0057589acaef4f1a57263f,
-# testnet3:
-# 000000000000000465b1a66c9f386308e8c75acef9201f3f577811da09fc90ad,
-# testnet4:
-# 000000005be348057db991fa5d89fe7c4695b667cfb311391a8db374b6f681fd,
-# signet:
-# 0000014aad1d58dddcb964dd749b073374c6306e716b22f573a2efe68d414539)
-#assumevalid=<hex>
-
-# Maintain an index of compact filters by block (default: 0, values:
-# basic). If <type> is not supplied or if <type> = 1, indexes for
-# all known types are enabled.
-#blockfilterindex=<type>
-
-# Execute command when the best block changes (%s in cmd is replaced by
-# block hash)
-#blocknotify=<cmd>
-
-# Extra transactions to keep in memory for compact block reconstructions
-# (default: 100)
-#blockreconstructionextratxn=<n>
-
-# Specify directory to hold blocks subdirectory for *.dat files (default:
-# <datadir>)
-#blocksdir=<dir>
-
-# Whether to reject transactions from network peers. Disables automatic
-# broadcast and rebroadcast of transactions, unless the source peer
-# has the 'forcerelay' permission. RPC transactions are not
-# affected. (default: 0)
-#blocksonly=1
-
-# Whether an XOR-key applies to blocksdir *.dat files. The created XOR-key
-# will be zeros for an existing blocksdir or when `-blocksxor=0` is
-# set, and random for a freshly initialized blocksdir. (default: 1)
-#blocksxor=1
-
-# Maintain coinstats index used by the gettxoutsetinfo RPC (default: 0)
-#coinstatsindex=1
-
-# Specify path to read-only configuration file. Relative paths will be
-# prefixed by datadir location (only useable from command line, not
-# configuration file) (default: bitcoin.conf)
-#conf=<file>
-
-# Run in the background as a daemon and accept commands (default: 0)
-#daemon=1
-
-# Wait for initialization to be finished before exiting. This implies
-# -daemon (default: 0)
-#daemonwait=1
-
-# Specify data directory
-#datadir=<dir>
-
-# Maximum database cache size <n> MiB (4 to 16384, default: 450). In
-# addition, unused mempool memory is shared for this cache (see
-# -maxmempool).
-#dbcache=<n>
-
-# Specify location of debug log file (default: debug.log). Relative paths
-# will be prefixed by a net-specific datadir location. Pass
-# -nodebuglogfile to disable writing the log to a file.
-#debuglogfile=<file>
-
 # Specify additional configuration file, relative to the -datadir path
 # (only useable from configuration file, not command line)
 #includeconf=<file>
@@ -263,7 +187,7 @@
 # base while uppercase is 1024 base
 #maxuploadtarget=<n>
 
-# Use NAT-PMP to map the listening port (default: 0)
+# Use PCP or NAT-PMP to map the listening port (default: 0)
 #natpmp=1
 
 # Enable all P2P network activity (default: 1). Can be changed by the
@@ -321,9 +245,6 @@
 # Tor control port password (default: empty)
 #torpassword=<pass>
 
-# Use UPnP to map the listening port (default: 0)
-#upnp=1
-
 # Support v2 transport (default: 1)
 #v2transport=1
 
@@ -586,10 +507,6 @@
 # this size or less (default: 83)
 #datacarriersize=1
 
-# (DEPRECATED) Accept transaction replace-by-fee without requiring
-# replaceability signaling (default: 1)
-#mempoolfullrbf=1
-
 # Fees (in BTC/kvB) smaller than this are considered zero fee for
 # relaying, mining and transaction creation (default: 0.00001)
 #minrelaytxfee=<amt>
@@ -611,13 +528,18 @@
 ### Block creation options
 
 
-# Set maximum BIP141 block weight (default: 3996000)
+# Set maximum BIP141 block weight (default: 4000000)
 #blockmaxweight=<n>
 
 # Set lowest fee rate (in BTC/kvB) for transactions to be included in
 # block creation. (default: 0.00001)
 #blockmintxfee=<amt>
 
+# Reserve space for the fixed-size block header plus the largest coinbase
+# transaction the mining software may add to the block. (default:
+# 8000).
+#blockreservedweight=<n>
+
 
 ### RPC server options
 
@@ -663,7 +585,7 @@
 # 18332, testnet4: 48332, signet: 38332, regtest: 18443)
 #rpcport=<port>
 
-# Set the number of threads to service RPC calls (default: 4)
+# Set the number of threads to service RPC calls (default: 16)
 #rpcthreads=<n>
 
 # Username for JSON-RPC connections

Otherwise, I compared this PR to the instructions in doc/release-process.md and the v28.0rc1 bump (#30726) and the same changes are made here plus the #32041 backport. I lightly reviewed the diff between the manpages generated here and in v28.1, and didn't see anything unexpected.

manpages diff between 28.1 and #32046

 
$ git diff v28.1/doc/man/ 32046/doc/man
diff --git a/v28.1/doc/man/Makefile.am b/v28.1/doc/man/Makefile.am
deleted file mode 100644
index 8f890da..0000000
--- a/v28.1/doc/man/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-dist_man1_MANS=
-
-if BUILD_BITCOIND
-  dist_man1_MANS+=bitcoind.1
-endif
-
-if ENABLE_QT
-  dist_man1_MANS+=bitcoin-qt.1
-endif
-
-if BUILD_BITCOIN_CLI
-  dist_man1_MANS+=bitcoin-cli.1
-endif
-
-if BUILD_BITCOIN_TX
-  dist_man1_MANS+=bitcoin-tx.1
-endif
-
-if BUILD_BITCOIN_UTIL
-  dist_man1_MANS+=bitcoin-util.1
-endif
-
-if ENABLE_WALLET
-if BUILD_BITCOIN_WALLET
-  dist_man1_MANS+=bitcoin-wallet.1
-endif
-endif
diff --git a/v28.1/doc/man/bitcoin-cli.1 b/32046/doc/man/bitcoin-cli.1
index d355289..2eb89ff 100644
--- a/v28.1/doc/man/bitcoin-cli.1
+++ b/32046/doc/man/bitcoin-cli.1
@@ -1,38 +1,36 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-CLI "1" "December 2024" "bitcoin-cli v28.1.0" "User Commands"
+.TH BITCOIN-CLI "1" "March 2025" "bitcoin-cli v29.0.0rc1" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v28.1.0
+bitcoin-cli \- manual page for bitcoin-cli v29.0.0rc1
 .SH SYNOPSIS
 .B bitcoin-cli
-[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Bitcoin Core\/\fR
+[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]
 .br
 .B bitcoin-cli
-[\fI\,options\/\fR] \fI\,-named <command> \/\fR[\fI\,name=value\/\fR]...  \fI\,Send command to Bitcoin Core (with named arguments)\/\fR
+[\fI\,options\/\fR] \fI\,-named <command> \/\fR[\fI\,name=value\/\fR]...
 .br
 .B bitcoin-cli
-[\fI\,options\/\fR] \fI\,help                List commands\/\fR
+[\fI\,options\/\fR] \fI\,help\/\fR
 .br
 .B bitcoin-cli
-[\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
+[\fI\,options\/\fR] \fI\,help <command>\/\fR
 .SH DESCRIPTION
-Bitcoin Core RPC client version v28.1.0
+Bitcoin Core RPC client version v29.0.0rc1
+.PP
+The bitcoin\-cli utility provides a command line interface to interact with a Bitcoin Core RPC server.
+.PP
+It can be used to query network information, manage wallets, create or broadcast transactions, and control the Bitcoin Core server.
+.PP
+Use the "help" command to list all commands. Use "help <command>" to show help for that command.
+The \fB\-named\fR option allows you to specify parameters using the key=value format, eliminating the need to pass unused positional parameters.
 .SH OPTIONS
 .HP
-\-?
-.IP
-Print this help message and exit
-.HP
-\fB\-addrinfo\fR
-.IP
-Get the number of addresses known to the node, per network and total,
-after filtering for quality and recency. The total number of
-addresses known to the node may be higher.
-.HP
 \fB\-color=\fR<when>
 .IP
 Color setting for CLI output (default: auto). Valid values: always, auto
 (add color codes when standard output is connected to a terminal
-and OS is not WIN32), never.
+and OS is not WIN32), never. Only applies to the output of
+\fB\-getinfo\fR.
 .HP
 \fB\-conf=\fR<file>
 .IP
@@ -43,34 +41,14 @@ location. (default: bitcoin.conf)
 .IP
 Specify data directory
 .HP
-\fB\-generate\fR
-.IP
-Generate blocks, equivalent to RPC getnewaddress followed by RPC
-generatetoaddress. Optional positional integer arguments are
-number of blocks to generate (default: 1) and maximum iterations
-to try (default: 1000000), equivalent to RPC generatetoaddress
-nblocks and maxtries arguments. Example: bitcoin\-cli \fB\-generate\fR 4
-1000
-.HP
-\fB\-getinfo\fR
+\fB\-help\fR
 .IP
-Get general information from the remote server. Note that unlike
-server\-side RPC calls, the output of \fB\-getinfo\fR is the result of
-multiple non\-atomic requests. Some entries in the output may
-represent results from different states (e.g. wallet balance may
-be as of a different block from the chain state reported)
+Print this help message and exit (also \fB\-h\fR or \-?)
 .HP
 \fB\-named\fR
 .IP
 Pass named instead of positional arguments (default: false)
 .HP
-\fB\-netinfo\fR
-.IP
-Get network peer connection information from the remote server. An
-optional integer argument from 0 to 4 can be passed for different
-peers listings (default: 0). Pass "help" for detailed help
-documentation.
-.HP
 \fB\-rpcclienttimeout=\fR<n>
 .IP
 Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
@@ -175,8 +153,42 @@ Consider moving to testnet4 now by using \fB\-testnet4\fR.
 \fB\-testnet4\fR
 .IP
 Use the testnet4 chain. Equivalent to \fB\-chain\fR=\fI\,testnet4\/\fR.
+.PP
+CLI Commands:
+.HP
+\fB\-addrinfo\fR
+.IP
+Get the number of addresses known to the node, per network and total,
+after filtering for quality and recency. The total number of
+addresses known to the node may be higher.
+.HP
+\fB\-generate\fR
+.IP
+Generate blocks, equivalent to RPC getnewaddress followed by RPC
+generatetoaddress. Optional positional integer arguments are
+number of blocks to generate (default: 1) and maximum iterations
+to try (default: 1000000), equivalent to RPC generatetoaddress
+nblocks and maxtries arguments. Example: bitcoin\-cli \fB\-generate\fR 4
+1000
+.HP
+\fB\-getinfo\fR
+.IP
+Get general information from the remote server. Note that unlike
+server\-side RPC calls, the output of \fB\-getinfo\fR is the result of
+multiple non\-atomic requests. Some entries in the output may
+represent results from different states (e.g. wallet balance may
+be as of a different block from the chain state reported)
+.HP
+\fB\-netinfo\fR
+.IP
+Get network peer connection information from the remote server. An
+optional argument from 0 to 4 can be passed for different peers
+listings (default: 0). If a non\-zero value is passed, an
+additional "outonly" (or "o") argument can be passed to see
+outbound peers only. Pass "help" (or "h") for detailed help
+documentation.
 .SH COPYRIGHT
-Copyright (C) 2009-2024 The Bitcoin Core developers
+Copyright (C) 2009-2025 The Bitcoin Core developers
 
 Please contribute if you find Bitcoin Core useful. Visit
 <https://bitcoincore.org/> for further information about the software.
diff --git a/v28.1/doc/man/bitcoin-qt.1 b/32046/doc/man/bitcoin-qt.1
index fe76cd9..20b7b96 100644
--- a/v28.1/doc/man/bitcoin-qt.1
+++ b/32046/doc/man/bitcoin-qt.1
@@ -1,20 +1,22 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-QT "1" "December 2024" "bitcoin-qt v28.1.0" "User Commands"
+.TH BITCOIN-QT "1" "March 2025" "bitcoin-qt v29.0.0rc1" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v28.1.0
+bitcoin-qt \- manual page for bitcoin-qt v29.0.0rc1
 .SH SYNOPSIS
 .B bitcoin-qt
-[\fI\,command-line options\/\fR] [\fI\,URI\/\fR]
+[\fI\,options\/\fR] [\fI\,URI\/\fR]
 .SH DESCRIPTION
-Bitcoin Core version v28.1.0
+Bitcoin Core version v29.0.0rc1
 .PP
-Optional URI is a Bitcoin address in BIP21 URI format.
+The bitcoin\-qt application provides a graphical interface for interacting with Bitcoin Core.
+.PP
+It combines the core functionalities of bitcoind with a user\-friendly interface for wallet management, transaction history, and network statistics.
+.PP
+It is suitable for users who prefer a graphical over a command\-line interface.
+.PP
+You can optionally specify a payment [URI], in e.g. the BIP21 URI format.
 .SH OPTIONS
 .HP
-\-?
-.IP
-Print this help message and exit
-.HP
 \fB\-alertnotify=\fR<cmd>
 .IP
 Execute command when an alert is raised (%s in cmd is replaced by
@@ -30,13 +32,13 @@ datadir as a warning, not an error.
 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:
-000000000000000000011c5890365bdbe5d25b97ce0057589acaef4f1a57263f,
+00000000000000000001b658dd1120e82e66d2790811f89ede9742ada3ed6d77,
 testnet3:
-000000000000000465b1a66c9f386308e8c75acef9201f3f577811da09fc90ad,
+00000000000003fc7967410ba2d0a8a8d50daedc318d43e8baf1a9782c236a57,
 testnet4:
-000000005be348057db991fa5d89fe7c4695b667cfb311391a8db374b6f681fd,
+0000000000003ed4f08dbdf6f7d6b271a6bcffce25675cb40aa9fa43179a89f3,
 signet:
-0000014aad1d58dddcb964dd749b073374c6306e716b22f573a2efe68d414539)
+000000895a110f46e59eb82bbc5bfb67fa314656009c295509c21b4999f5180a)
 .HP
 \fB\-blockfilterindex=\fR<type>
 .IP
@@ -97,9 +99,9 @@ Specify data directory
 .HP
 \fB\-dbcache=\fR<n>
 .IP
-Maximum database cache size <n> MiB (4 to 16384, default: 450). In
-addition, unused mempool memory is shared for this cache (see
-\fB\-maxmempool\fR).
+Maximum database cache size <n> MiB (minimum 4, default: 450). Make sure
+you have enough RAM. In addition, unused memory allocated to the
+mempool is shared with this cache (see \fB\-maxmempool\fR).
 .HP
 \fB\-debuglogfile=\fR<file>
 .IP
@@ -107,6 +109,10 @@ Specify location of debug log file (default: debug.log). Relative paths
 will be prefixed by a net\-specific datadir location. Pass
 \fB\-nodebuglogfile\fR to disable writing the log to a file.
 .HP
+\fB\-help\fR
+.IP
+Print this help message and exit (also \fB\-h\fR or \-?)
+.HP
 \fB\-includeconf=\fR<file>
 .IP
 Specify additional configuration file, relative to the \fB\-datadir\fR path
@@ -319,7 +325,7 @@ base while uppercase is 1024 base
 .HP
 \fB\-natpmp\fR
 .IP
-Use NAT\-PMP to map the listening port (default: 0)
+Use PCP or NAT\-PMP to map the listening port (default: 0)
 .HP
 \fB\-networkactive\fR
 .IP
@@ -388,10 +394,6 @@ Tor control host and port to use if onion listening enabled (default:
 .IP
 Tor control port password (default: empty)
 .HP
-\fB\-upnp\fR
-.IP
-Use UPnP to map the listening port (default: 0)
-.HP
 \fB\-v2transport\fR
 .IP
 Support v2 transport (default: 1)
@@ -697,11 +699,6 @@ Relay and mine data carrier transactions (default: 1)
 Relay and mine transactions whose data\-carrying raw scriptPubKey is of
 this size or less (default: 83)
 .HP
-\fB\-mempoolfullrbf\fR
-.IP
-(DEPRECATED) Accept transaction replace\-by\-fee without requiring
-replaceability signaling (default: 1)
-.HP
 \fB\-minrelaytxfee=\fR<amt>
 .IP
 Fees (in BTC/kvB) smaller than this are considered zero fee for
@@ -727,12 +724,18 @@ Block creation options:
 .HP
 \fB\-blockmaxweight=\fR<n>
 .IP
-Set maximum BIP141 block weight (default: 3996000)
+Set maximum BIP141 block weight (default: 4000000)
 .HP
 \fB\-blockmintxfee=\fR<amt>
 .IP
 Set lowest fee rate (in BTC/kvB) for transactions to be included in
 block creation. (default: 0.00001)
+.HP
+\fB\-blockreservedweight=\fR<n>
+.IP
+Reserve space for the fixed\-size block header plus the largest coinbase
+transaction the mining software may add to the block. (default:
+8000).
 .PP
 RPC server options:
 .HP
@@ -787,7 +790,7 @@ Listen for JSON\-RPC connections on <port> (default: 8332, testnet3:
 .HP
 \fB\-rpcthreads=\fR<n>
 .IP
-Set the number of threads to service RPC calls (default: 4)
+Set the number of threads to service RPC calls (default: 16)
 .HP
 \fB\-rpcuser=\fR<user>
 .IP
@@ -836,7 +839,7 @@ Reset all settings changed in the GUI
 .IP
 Show splash screen on startup (default: 1)
 .SH COPYRIGHT
-Copyright (C) 2009-2024 The Bitcoin Core developers
+Copyright (C) 2009-2025 The Bitcoin Core developers
 
 Please contribute if you find Bitcoin Core useful. Visit
 <https://bitcoincore.org/> for further information about the software.
diff --git a/v28.1/doc/man/bitcoin-tx.1 b/32046/doc/man/bitcoin-tx.1
index 26cbd9b..b493f91 100644
--- a/v28.1/doc/man/bitcoin-tx.1
+++ b/32046/doc/man/bitcoin-tx.1
@@ -1,25 +1,29 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-TX "1" "December 2024" "bitcoin-tx v28.1.0" "User Commands"
+.TH BITCOIN-TX "1" "March 2025" "bitcoin-tx v29.0.0rc1" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v28.1.0
+bitcoin-tx \- manual page for bitcoin-tx v29.0.0rc1
 .SH SYNOPSIS
 .B bitcoin-tx
-[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded bitcoin transaction\/\fR
+[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]
 .br
 .B bitcoin-tx
-[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded bitcoin transaction\/\fR
+[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-tx utility version v28.1.0
+Bitcoin Core bitcoin\-tx utility version v29.0.0rc1
+.PP
+The bitcoin\-tx tool is used for creating and modifying bitcoin transactions.
+.PP
+bitcoin\-tx can be used with "<hex\-tx> [commands]" to update a hex\-encoded bitcoin transaction, or with "\-create [commands]" to create a hex\-encoded bitcoin transaction.
 .SH OPTIONS
 .HP
-\-?
-.IP
-Print this help message and exit
-.HP
 \fB\-create\fR
 .IP
 Create new, empty TX.
 .HP
+\fB\-help\fR
+.IP
+Print this help message and exit (also \fB\-h\fR or \-?)
+.HP
 \fB\-json\fR
 .IP
 Select JSON output
@@ -142,7 +146,7 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
-Copyright (C) 2009-2024 The Bitcoin Core developers
+Copyright (C) 2009-2025 The Bitcoin Core developers
 
 Please contribute if you find Bitcoin Core useful. Visit
 <https://bitcoincore.org/> for further information about the software.
diff --git a/v28.1/doc/man/bitcoin-util.1 b/32046/doc/man/bitcoin-util.1
index 415e6d0..74cf232 100644
--- a/v28.1/doc/man/bitcoin-util.1
+++ b/32046/doc/man/bitcoin-util.1
@@ -1,17 +1,22 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-UTIL "1" "December 2024" "bitcoin-util v28.1.0" "User Commands"
+.TH BITCOIN-UTIL "1" "March 2025" "bitcoin-util v29.0.0rc1" "User Commands"
 .SH NAME
-bitcoin-util \- manual page for bitcoin-util v28.1.0
+bitcoin-util \- manual page for bitcoin-util v29.0.0rc1
 .SH SYNOPSIS
 .B bitcoin-util
-[\fI\,options\/\fR] [\fI\,commands\/\fR]  \fI\,Do stuff\/\fR
+[\fI\,options\/\fR] [\fI\,command\/\fR]
+.br
+.B bitcoin-util
+[\fI\,options\/\fR] \fI\,grind <hex-block-header>\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-util utility version v28.1.0
+Bitcoin Core bitcoin\-util utility version v29.0.0rc1
+.PP
+The bitcoin\-util tool provides bitcoin related functionality that does not rely on the ability to access a running node. Available [commands] are listed below.
 .SH OPTIONS
 .HP
-\-?
+\fB\-help\fR
 .IP
-Print this help message and exit
+Print this help message and exit (also \fB\-h\fR or \-?)
 .HP
 \fB\-version\fR
 .IP
@@ -60,7 +65,7 @@ grind
 .IP
 Perform proof of work on hex header string
 .SH COPYRIGHT
-Copyright (C) 2009-2024 The Bitcoin Core developers
+Copyright (C) 2009-2025 The Bitcoin Core developers
 
 Please contribute if you find Bitcoin Core useful. Visit
 <https://bitcoincore.org/> for further information about the software.
diff --git a/v28.1/doc/man/bitcoin-wallet.1 b/32046/doc/man/bitcoin-wallet.1
index a043129..dbf3010 100644
--- a/v28.1/doc/man/bitcoin-wallet.1
+++ b/32046/doc/man/bitcoin-wallet.1
@@ -1,22 +1,20 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-WALLET "1" "December 2024" "bitcoin-wallet v28.1.0" "User Commands"
+.TH BITCOIN-WALLET "1" "March 2025" "bitcoin-wallet v29.0.0rc1" "User Commands"
 .SH NAME
-bitcoin-wallet \- manual page for bitcoin-wallet v28.1.0
+bitcoin-wallet \- manual page for bitcoin-wallet v29.0.0rc1
+.SH SYNOPSIS
+.B bitcoin-wallet
+[\fI\,options\/\fR] \fI\,<command>\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet version v28.1.0
+Bitcoin Core bitcoin\-wallet utility version v29.0.0rc1
 .PP
 bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
+.PP
 By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
-To change the target wallet, use the \fB\-datadir\fR, \fB\-wallet\fR and \fB\-regtest\fR/\-signet/\-testnet/\-testnet4 arguments.
-.SS "Usage:"
-.IP
-bitcoin\-wallet [options] <command>
+.PP
+To change the target wallet, use the \fB\-datadir\fR, \fB\-wallet\fR and (test)chain selection arguments.
 .SH OPTIONS
 .HP
-\-?
-.IP
-Print this help message and exit
-.HP
 \fB\-datadir=\fR<dir>
 .IP
 Specify data directory
@@ -35,6 +33,10 @@ with 'createfromdump', loads the records into a new wallet.
 The format of the wallet file to create. Either "bdb" or "sqlite". Only
 used with 'createfromdump'
 .HP
+\fB\-help\fR
+.IP
+Print this help message and exit (also \fB\-h\fR or \-?)
+.HP
 \fB\-legacy\fR
 .IP
 Create legacy wallet. Only for 'create'
@@ -121,7 +123,7 @@ salvage
 Attempt to recover private keys from a corrupt wallet. Warning:
 \&'salvage' is experimental.
 .SH COPYRIGHT
-Copyright (C) 2009-2024 The Bitcoin Core developers
+Copyright (C) 2009-2025 The Bitcoin Core developers
 
 Please contribute if you find Bitcoin Core useful. Visit
 <https://bitcoincore.org/> for further information about the software.
diff --git a/v28.1/doc/man/bitcoind.1 b/32046/doc/man/bitcoind.1
index 1acb2df..865a59e 100644
--- a/v28.1/doc/man/bitcoind.1
+++ b/32046/doc/man/bitcoind.1
@@ -1,18 +1,22 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIND "1" "December 2024" "bitcoind v28.1.0" "User Commands"
+.TH BITCOIND "1" "March 2025" "bitcoind v29.0.0rc1" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind v28.1.0
+bitcoind \- manual page for bitcoind v29.0.0rc1
 .SH SYNOPSIS
 .B bitcoind
-[\fI\,options\/\fR]                     \fI\,Start Bitcoin Core\/\fR
+[\fI\,options\/\fR]
 .SH DESCRIPTION
-Bitcoin Core version v28.1.0
+Bitcoin Core daemon version v29.0.0rc1
+.PP
+The Bitcoin Core daemon (bitcoind) is a headless program that connects to the Bitcoin network to validate and relay transactions and blocks, as well as relaying addresses.
+.PP
+It provides the backbone of the Bitcoin network and its RPC, REST and ZMQ services can provide various transaction, block and address\-related services.
+.PP
+There is an optional wallet component which provides transaction services.
+.PP
+It can be used in a headless environment or as part of a server setup.
 .SH OPTIONS
 .HP
-\-?
-.IP
-Print this help message and exit
-.HP
 \fB\-alertnotify=\fR<cmd>
 .IP
 Execute command when an alert is raised (%s in cmd is replaced by
@@ -28,13 +32,13 @@ datadir as a warning, not an error.
 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:
-000000000000000000011c5890365bdbe5d25b97ce0057589acaef4f1a57263f,
+00000000000000000001b658dd1120e82e66d2790811f89ede9742ada3ed6d77,
 testnet3:
-000000000000000465b1a66c9f386308e8c75acef9201f3f577811da09fc90ad,
+00000000000003fc7967410ba2d0a8a8d50daedc318d43e8baf1a9782c236a57,
 testnet4:
-000000005be348057db991fa5d89fe7c4695b667cfb311391a8db374b6f681fd,
+0000000000003ed4f08dbdf6f7d6b271a6bcffce25675cb40aa9fa43179a89f3,
 signet:
-0000014aad1d58dddcb964dd749b073374c6306e716b22f573a2efe68d414539)
+000000895a110f46e59eb82bbc5bfb67fa314656009c295509c21b4999f5180a)
 .HP
 \fB\-blockfilterindex=\fR<type>
 .IP
@@ -95,9 +99,9 @@ Specify data directory
 .HP
 \fB\-dbcache=\fR<n>
 .IP
-Maximum database cache size <n> MiB (4 to 16384, default: 450). In
-addition, unused mempool memory is shared for this cache (see
-\fB\-maxmempool\fR).
+Maximum database cache size <n> MiB (minimum 4, default: 450). Make sure
+you have enough RAM. In addition, unused memory allocated to the
+mempool is shared with this cache (see \fB\-maxmempool\fR).
 .HP
 \fB\-debuglogfile=\fR<file>
 .IP
@@ -105,6 +109,10 @@ Specify location of debug log file (default: debug.log). Relative paths
 will be prefixed by a net\-specific datadir location. Pass
 \fB\-nodebuglogfile\fR to disable writing the log to a file.
 .HP
+\fB\-help\fR
+.IP
+Print this help message and exit (also \fB\-h\fR or \-?)
+.HP
 \fB\-includeconf=\fR<file>
 .IP
 Specify additional configuration file, relative to the \fB\-datadir\fR path
@@ -317,7 +325,7 @@ base while uppercase is 1024 base
 .HP
 \fB\-natpmp\fR
 .IP
-Use NAT\-PMP to map the listening port (default: 0)
+Use PCP or NAT\-PMP to map the listening port (default: 0)
 .HP
 \fB\-networkactive\fR
 .IP
@@ -386,10 +394,6 @@ Tor control host and port to use if onion listening enabled (default:
 .IP
 Tor control port password (default: empty)
 .HP
-\fB\-upnp\fR
-.IP
-Use UPnP to map the listening port (default: 0)
-.HP
 \fB\-v2transport\fR
 .IP
 Support v2 transport (default: 1)
@@ -695,11 +699,6 @@ Relay and mine data carrier transactions (default: 1)
 Relay and mine transactions whose data\-carrying raw scriptPubKey is of
 this size or less (default: 83)
 .HP
-\fB\-mempoolfullrbf\fR
-.IP
-(DEPRECATED) Accept transaction replace\-by\-fee without requiring
-replaceability signaling (default: 1)
-.HP
 \fB\-minrelaytxfee=\fR<amt>
 .IP
 Fees (in BTC/kvB) smaller than this are considered zero fee for
@@ -725,12 +724,18 @@ Block creation options:
 .HP
 \fB\-blockmaxweight=\fR<n>
 .IP
-Set maximum BIP141 block weight (default: 3996000)
+Set maximum BIP141 block weight (default: 4000000)
 .HP
 \fB\-blockmintxfee=\fR<amt>
 .IP
 Set lowest fee rate (in BTC/kvB) for transactions to be included in
 block creation. (default: 0.00001)
+.HP
+\fB\-blockreservedweight=\fR<n>
+.IP
+Reserve space for the fixed\-size block header plus the largest coinbase
+transaction the mining software may add to the block. (default:
+8000).
 .PP
 RPC server options:
 .HP
@@ -785,7 +790,7 @@ Listen for JSON\-RPC connections on <port> (default: 8332, testnet3:
 .HP
 \fB\-rpcthreads=\fR<n>
 .IP
-Set the number of threads to service RPC calls (default: 4)
+Set the number of threads to service RPC calls (default: 16)
 .HP
 \fB\-rpcuser=\fR<user>
 .IP
@@ -812,7 +817,7 @@ subject to empty whitelists.
 .IP
 Accept command line and JSON\-RPC commands
 .SH COPYRIGHT
-Copyright (C) 2009-2024 The Bitcoin Core developers
+Copyright (C) 2009-2025 The Bitcoin Core developers
 
 Please contribute if you find Bitcoin Core useful. Visit
 <https://bitcoincore.org/> for further information about the software.

@achow101

achow101 commented Mar 12, 2025

Copy link
Copy Markdown
Member

ACK 47e2fa8

Other than the issue with the example bitcoin.conf, everything seems correct. I think we can move forward with rc1 and just backport the gen-bitcoin-conf.sh fixes for rc2 (or final). The script has to be rerun for every rc anyways.

@davidgumberg

davidgumberg commented Mar 13, 2025

Copy link
Copy Markdown
Contributor

ACK 47e2fa8

I'm ~0 on whether or not the release candidate should be held up by the example bitcoin.conf, but everything else looks good to me.

@fanquake fanquake added this to the 29.0 milestone Mar 13, 2025
@fanquake

fanquake commented Mar 13, 2025

Copy link
Copy Markdown
Member

There's likely going to be more rcs than usual, so just getting this out for testing with the incomplete example .conf is fine.

@fanquake
fanquake merged commit e9e6825 into bitcoin:29.x Mar 13, 2025
@glozow
glozow deleted the 2025-03-29.0-rc1 branch March 13, 2025 04:20
morozow pushed a commit to morozow/bitcoin_rd that referenced this pull request May 8, 2026
@fanquake
Merge bitcoin#32046: [29.x] bump to v29.0rc1
5110199 
df443e7 [doc] release notes link for 29.0 (glozow)
bb0b4c7 [examples] generate example bitcoin.conf (glozow)
b4b0e03 [doc] update man pages for 29.0rc1 (glozow)
a21825e [build] bump version to 29.0rc1 (glozow)
83ff904 [build] bump CLIENT_VERSION_MAJOR to 29 (glozow)

Pull request description:

  - "backport" bitcoin#32041
  - bump version to v29.0rc1
  - generate manpages
  - add example bitcoin.conf
  - add release-notes.md pointing to wiki

ACKs for top commit:
  achow101:
    ACK df443e7
  davidgumberg:
    ACK bitcoin@df443e7
  hebasto:
    ACK df443e7.

Tree-SHA512: 4e4eec31ab12990d933b6313950e779b7b58fc349f294f59d2504a8db3c28d5dea64b79e588e2c0fe62836db306fb4c3fb3fcd7bd1f51350e880370cec3437d6
tomt1664 added a commit to tomt1664/elements that referenced this pull request Jul 13, 2026
@tomt1664
Merge e9e6825 into merged_master (Bitcoin PR bitcoin/bitcoin#32046)
b7e7161
@bitcoin bitcoin locked and limited conversation to collaborators Jul 30, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@hebasto hebasto hebasto approved these changes

Assignees

No one assigned

Labels

Backport

Projects

None yet

Milestone

29.0

Development

Successfully merging this pull request may close these issues.

6 participants

@glozow @DrahtBot @hebasto @davidgumberg @achow101 @fanquake