Update manpages & example bitcoin.conf

doc/man/bitcoin-cli.1

@@ -1,21 +1,28 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
 .TH BITCOIN-CLI "1" "March 2024" "bitcoin-cli v26.1.0" "User Commands"
 .SH NAME
 bitcoin-cli \- manual page for bitcoin-cli v26.1.0
 .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]  \fI\,Send command to Bitcoin Knots\/\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]...  \fI\,Send command to Bitcoin Knots (with named arguments)\/\fR
 .br
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,help                List commands\/\fR
 .br
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Bitcoin Core RPC client version v26.1.0
+Bitcoin Knots RPC client version v26.1.0
+.PP
+The bitcoin\-cli utility provides a command line interface to interact with a bitcoind/bitcoin\-qt RPC server.
+.PP
+It can be used to query network information, manage wallets, create or broadcast transactions, and control the bitcoind server.
+.PP
+Use the "help" command to list all commands. Use "help <command>" to show help for that command.
+Using the \fB\-named\fR option allows specifying params using key=value style, and therefore doesn't require passing unused params.
 .SH OPTIONS
 .HP
 \-?
@@ -39,6 +46,12 @@ and OS is not WIN32), never.
 Specify configuration file. Relative paths will be prefixed by datadir
 location. (default: bitcoin.conf)
 .HP
+\fB\-confrw=\fR<file>
+.IP
+Specify read/write configuration file. Relative paths will be prefixed
+by the network\-specific datadir location. (default:
+bitcoin_rw.conf)
+.HP
 \fB\-datadir=\fR<dir>
 .IP
 Specify data directory
@@ -54,11 +67,12 @@ nblocks and maxtries arguments. Example: bitcoin\-cli \fB\-generate\fR 4
 .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)
+Get general information from the remote server, including the total
+balance and the balances of each loaded wallet when in
+multiwallet mode. Note that \fB\-getinfo\fR is the combined result of
+several RPCs (getnetworkinfo, getblockchaininfo, getwalletinfo,
+getbalances, and in multiwallet mode, listwallets), each with
+potentially different state.
 .HP
 \fB\-named\fR
 .IP
@@ -153,6 +167,12 @@ signet, regtest
 Use the signet chain. Equivalent to \fB\-chain\fR=\fI\,signet\/\fR. Note that the network
 is defined by the \fB\-signetchallenge\fR parameter
 .HP
+\fB\-signetblocktime\fR
+.IP
+Difficulty adjustment will target a block time of the given amount in
+seconds (only for custom signet networks, must have
+\fB\-signetchallenge\fR set; defaults to 10 minutes)
+.HP
 \fB\-signetchallenge\fR
 .IP
 Blocks must satisfy the given script to be considered valid (only for
@@ -170,12 +190,14 @@ network seed node(s))
 .IP
 Use the test chain. Equivalent to \fB\-chain\fR=\fI\,test\/\fR.
 .SH COPYRIGHT
-Copyright (C) 2009-2023 The Bitcoin Core developers
+Copyright (C) 2009-2024 The Bitcoin Core developers
 
-Please contribute if you find Bitcoin Core useful. Visit
-<https://bitcoincore.org/> for further information about the software.
-The source code is available from <https://github.com/bitcoin/bitcoin>.
+Please contribute if you find Bitcoin Knots useful. Visit
+<https://bitcoinknots.org/> for further information about the software.
+The source code is available from <https://github.com/bitcoinknots/bitcoin>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
+or <https://opensource.org/licenses/MIT>
+.SH "SEE ALSO"
+bitcoind(1), bitcoin-tx(1), bitcoin-wallet(1), bitcoin-util(1), bitcoin-qt(1)

doc/man/bitcoin-tx.1

@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
 .TH BITCOIN-TX "1" "March 2024" "bitcoin-tx v26.1.0" "User Commands"
 .SH NAME
 bitcoin-tx \- manual page for bitcoin-tx v26.1.0
@@ -9,7 +9,11 @@ bitcoin-tx \- manual page for bitcoin-tx v26.1.0
 .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 v26.1.0
+Bitcoin Knots bitcoin\-tx utility version v26.1.0
+.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
 \-?
@@ -46,6 +50,12 @@ signet, regtest
 Use the signet chain. Equivalent to \fB\-chain\fR=\fI\,signet\/\fR. Note that the network
 is defined by the \fB\-signetchallenge\fR parameter
 .HP
+\fB\-signetblocktime\fR
+.IP
+Difficulty adjustment will target a block time of the given amount in
+seconds (only for custom signet networks, must have
+\fB\-signetchallenge\fR set; defaults to 10 minutes)
+.HP
 \fB\-signetchallenge\fR
 .IP
 Blocks must satisfy the given script to be considered valid (only for
@@ -114,8 +124,10 @@ wrap the output in a pay\-to\-script\-hash.
 .IP
 replaceable(=N)
 .IP
-Set RBF opt\-in sequence number for input N (if not provided, opt\-in all
-available inputs)
+Sets Replace\-By\-Fee (RBF) opt\-in sequence number for input N. If N is
+not provided, the command attempts to opt\-in all available inputs
+for RBF. If the transaction has no inputs, this option is
+ignored.
 .IP
 sign=SIGHASH\-FLAGS
 .IP
@@ -134,12 +146,14 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
-Copyright (C) 2009-2023 The Bitcoin Core developers
+Copyright (C) 2009-2024 The Bitcoin Core developers
 
-Please contribute if you find Bitcoin Core useful. Visit
-<https://bitcoincore.org/> for further information about the software.
-The source code is available from <https://github.com/bitcoin/bitcoin>.
+Please contribute if you find Bitcoin Knots useful. Visit
+<https://bitcoinknots.org/> for further information about the software.
+The source code is available from <https://github.com/bitcoinknots/bitcoin>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
+or <https://opensource.org/licenses/MIT>
+.SH "SEE ALSO"
+bitcoind(1), bitcoin-cli(1), bitcoin-wallet(1), bitcoin-util(1), bitcoin-qt(1)

doc/man/bitcoin-util.1

@@ -1,12 +1,14 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
 .TH BITCOIN-UTIL "1" "March 2024" "bitcoin-util v26.1.0" "User Commands"
 .SH NAME
 bitcoin-util \- manual page for bitcoin-util v26.1.0
 .SH SYNOPSIS
 .B bitcoin-util
-[\fI\,options\/\fR] [\fI\,commands\/\fR]  \fI\,Do stuff\/\fR
+[\fI\,options\/\fR] [\fI\,commands\/\fR]
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-util utility version v26.1.0
+Bitcoin Knots bitcoin\-util utility version v26.1.0
+.PP
+The bitcoin\-util tool is used to grind proof of work on a hex\-formatted bitcoin block header.
 .SH OPTIONS
 .HP
 \-?
@@ -31,6 +33,12 @@ signet, regtest
 Use the signet chain. Equivalent to \fB\-chain\fR=\fI\,signet\/\fR. Note that the network
 is defined by the \fB\-signetchallenge\fR parameter
 .HP
+\fB\-signetblocktime\fR
+.IP
+Difficulty adjustment will target a block time of the given amount in
+seconds (only for custom signet networks, must have
+\fB\-signetchallenge\fR set; defaults to 10 minutes)
+.HP
 \fB\-signetchallenge\fR
 .IP
 Blocks must satisfy the given script to be considered valid (only for
@@ -54,12 +62,14 @@ grind
 .IP
 Perform proof of work on hex header string
 .SH COPYRIGHT
-Copyright (C) 2009-2023 The Bitcoin Core developers
+Copyright (C) 2009-2024 The Bitcoin Core developers
 
-Please contribute if you find Bitcoin Core useful. Visit
-<https://bitcoincore.org/> for further information about the software.
-The source code is available from <https://github.com/bitcoin/bitcoin>.
+Please contribute if you find Bitcoin Knots useful. Visit
+<https://bitcoinknots.org/> for further information about the software.
+The source code is available from <https://github.com/bitcoinknots/bitcoin>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
+or <https://opensource.org/licenses/MIT>
+.SH "SEE ALSO"
+bitcoind(1), bitcoin-cli(1), bitcoin-tx(1), bitcoin-wallet(1), bitcoin-qt(1)

doc/man/bitcoin-wallet.1

@@ -1,16 +1,18 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
 .TH BITCOIN-WALLET "1" "March 2024" "bitcoin-wallet v26.1.0" "User Commands"
 .SH NAME
 bitcoin-wallet \- manual page for bitcoin-wallet v26.1.0
+.SH SYNOPSIS
+.B bitcoin-wallet
+[\fI\,options\/\fR] \fI\,<command>\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet version v26.1.0
+Bitcoin Knots bitcoin\-wallet version v26.1.0
+.PP
+bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Knots wallet files.
 .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.
-To change the target wallet, use the \fB\-datadir\fR, \fB\-wallet\fR and \fB\-regtest\fR/\-signet/\-testnet arguments.
-.SS "Usage:"
-.IP
-bitcoin\-wallet [options] <command>
+.PP
+To change the target wallet, use the \fB\-datadir\fR, \fB\-wallet\fR and \fB\-regtest\fR / \fB\-signet\fR / \fB\-testnet\fR arguments.
 .SH OPTIONS
 .HP
 \-?
@@ -70,6 +72,12 @@ signet, regtest
 Use the signet chain. Equivalent to \fB\-chain\fR=\fI\,signet\/\fR. Note that the network
 is defined by the \fB\-signetchallenge\fR parameter
 .HP
+\fB\-signetblocktime\fR
+.IP
+Difficulty adjustment will target a block time of the given amount in
+seconds (only for custom signet networks, must have
+\fB\-signetchallenge\fR set; defaults to 10 minutes)
+.HP
 \fB\-signetchallenge\fR
 .IP
 Blocks must satisfy the given script to be considered valid (only for
@@ -101,6 +109,10 @@ dump
 .IP
 Print out all of the wallet key\-value records
 .IP
+importfromcoldcard
+.IP
+Create new wallet file and import descriptors from Coldcard wallet
+.IP
 info
 .IP
 Get wallet info
@@ -110,12 +122,14 @@ salvage
 Attempt to recover private keys from a corrupt wallet. Warning:
 \&'salvage' is experimental.
 .SH COPYRIGHT
-Copyright (C) 2009-2023 The Bitcoin Core developers
+Copyright (C) 2009-2024 The Bitcoin Core developers
 
-Please contribute if you find Bitcoin Core useful. Visit
-<https://bitcoincore.org/> for further information about the software.
-The source code is available from <https://github.com/bitcoin/bitcoin>.
+Please contribute if you find Bitcoin Knots useful. Visit
+<https://bitcoinknots.org/> for further information about the software.
+The source code is available from <https://github.com/bitcoinknots/bitcoin>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
+or <https://opensource.org/licenses/MIT>
+.SH "SEE ALSO"
+bitcoind(1), bitcoin-cli(1), bitcoin-tx(1), bitcoin-util(1), bitcoin-qt(1)

share/examples/bitcoin.conf

@@ -23,16 +23,16 @@
 # 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:
-# 00000000000000000001a0a448d6cf2546b06801389cc030b2b18c6491266815,
+# 00000000000000000003349bda23ed5efc98145c10620c247ec93896ac249e22,
 # testnet:
 # 0000000000000093bcb68c03a9a168ae252572d348a2eaeba2cdf9231d73206f,
 # signet:
 # 0000013d778ba3f914530f11f6b69869c9fab54acff85acd7b8201d111f19b7f)
 #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.
+# basic, v0). If <type> is not supplied or if <type> = 1, certain
+# indexes are enabled (currently just basic).
 #blockfilterindex=<type>
 
 # Execute command when the best block changes (%s in cmd is replaced by
@@ -47,10 +47,10 @@
 # <datadir>)
 #blocksdir=<dir>
 
-# Whether to reject transactions from network peers. Automatic broadcast
-# and rebroadcast of any transactions from inbound peers is
-# disabled, unless the peer has the 'forcerelay' permission. RPC
-# transactions are not affected. (default: 0)
+# 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
 
 # Maintain coinstats index used by the gettxoutsetinfo RPC (default: 0)
@@ -61,6 +61,14 @@
 # configuration file) (default: bitcoin.conf)
 #conf=<file>
 
+# Specify read/write configuration file. Relative paths will be prefixed
+# by the network-specific datadir location (default:
+# bitcoin_rw.conf)
+#confrw=<file>
+
+# Use Bitcoin Core policy defaults (default: 0)
+#corepolicy=1
+
 # Run in the background as a daemon and accept commands (default: 0)
 #daemon=1
 
@@ -71,7 +79,7 @@
 # Specify data directory
 #datadir=<dir>
 
-# Maximum database cache size <n> MiB (4 to 16384, default: 450). In
+# Maximum database cache size <n> MiB (4 to 1048576, default: 450). In
 # addition, unused mempool memory is shared for this cache (see
 # -maxmempool).
 #dbcache=<n>
@@ -88,6 +96,10 @@
 # Imports blocks from external file on startup
 #loadblock=<file>
 
+# If system available memory falls below <n> MiB, flush caches (0 to
+# disable, default: 10)
+#lowmem=<n>
+
 # Keep the transaction memory pool below <n> megabytes (default: 300)
 #maxmempool=<n>
 
@@ -124,7 +136,8 @@
 # blk*.dat files on disk. Also wipe and rebuild other optional
 # indexes that are active. If an assumeutxo snapshot was loaded,
 # its chainstate will be wiped as well. The snapshot can then be
-# reloaded via RPC.
+# reloaded via RPC. Setting this to auto automatically reindexes
+# the block database if it is corrupted.
 #reindex=1
 
 # If enabled, wipe chain state, and rebuild it from blk*.dat files on
@@ -275,7 +288,7 @@
 #peerblockfilters=1
 
 # Support filtering of blocks and transaction with bloom filters (default:
-# 0)
+# 1)
 #peerbloomfilters=1
 
 # Listen for connections on <port>. Nodes not using the default ports
@@ -307,34 +320,45 @@
 # 9051 will be used.
 #torcontrol=<ip>:<port>
 
+# Tor command to use if not already running (default: tor)
+#torexecute=<command>
+
 # Tor control port password (default: empty)
 #torpassword=<pass>
 
-# Use UPnP to map the listening port (default: 1 when listening and no
-# -proxy)
+# Append literal to the user agent string (should only be used for
+# software embedding)
+#uaappend=<cmt>
+
+# Use UPnP to map the listening port (default: 0)
 #upnp=1
 
-# Support v2 transport (default: 0)
+# Support v2 transport (default: 1)
 #v2transport=1
 
 # Bind to the given address and add permission flags to the peers
 # connecting to it. Use [host]:port notation for IPv6. Allowed
 # permissions: bloomfilter (allow requesting BIP37 filtered blocks
-# and transactions), noban (do not ban for misbehavior; implies
+# and transactions), blockfilters (serve compact block filters to
+# peers per BIP157), noban (do not ban for misbehavior; implies
 # download), forcerelay (relay transactions that are already in the
 # mempool; implies relay), relay (relay even in -blocksonly mode,
 # and unlimited transaction announcements), mempool (allow
 # requesting BIP35 mempool contents), download (allow getheaders
 # during IBD, no disconnect after maxuploadtarget limit), addr
 # (responses to GETADDR avoid hitting the cache and contain random
-# records with the most up-to-date info). Specify multiple
+# records with the most up-to-date info), forceinbound (when
+# connections are full, attempt to evict a random unprotected
+# inbound peer to open a slot; implies noban). Specify multiple
 # permissions separated by commas (default:
 # download,noban,mempool,relay). Can be specified multiple times.
 #whitebind=<[permissions@]addr>
 
-# Add permission flags to the peers connecting from the given IP address
-# (e.g. 1.2.3.4) or CIDR-notated network (e.g. 1.2.3.0/24). Uses
-# the same permissions as -whitebind. Can be specified multiple
+# Add permission flags to the peers using the given IP address (e.g.
+# 1.2.3.4) or CIDR-notated network (e.g. 1.2.3.0/24). Uses the same
+# permissions as -whitebind. Additional flags "in" and "out"
+# control whether permissions apply to incoming connections and/or
+# outgoing (default: incoming only). Can be specified multiple
 # times.
 #whitelist=<[permissions@]IP address or network>
 
@@ -405,7 +429,7 @@
 #spendzeroconfchange=1
 
 # If paytxfee is not set, include enough fee so transactions begin
-# confirmation on average within n blocks (default: 6)
+# confirmation on average within n blocks (default: 144)
 #txconfirmtarget=<n>
 
 # Specify wallet path to load at startup. Can be used multiple times to
@@ -424,14 +448,17 @@
 # exists, otherwise <datadir>)
 #walletdir=<dir>
 
+# Support segwit when restoring wallet backups and importing keys
+# (default: 0)
+#walletimplicitsegwit=1
+
 # Execute command when a wallet transaction changes. %s in cmd is replaced
 # by TxID, %w is replaced by wallet name, %b is replaced by the
 # hash of the block including the transaction (set to 'unconfirmed'
 # if the transaction is not included) and %h is replaced by the
-# block height (-1 if not included). %w is not currently
-# implemented on windows. On systems where %w is supported, it
-# should NOT be quoted because this would break shell escaping used
-# to invoke the command.
+# block height (-1 if not included). %w should NOT be quoted
+# because this would break shell escaping used to invoke the
+# command.
 #walletnotify=<cmd>
 
 # Send transactions with full-RBF opt-in enabled (RPC only, default: 1)
@@ -454,6 +481,13 @@
 # 1000)
 #zmqpubhashtxhwm=<n>
 
+# Enable publish hash wallet transaction in <address>
+#zmqpubhashwallettx=<address>
+
+# Set publish hash wallet transaction outbound message high water mark
+# (default: 1000)
+#zmqpubhashwallettxhwm=<n>
+
 # Enable publish raw block in <address>
 #zmqpubrawblock=<address>
 
@@ -467,6 +501,13 @@
 # 1000)
 #zmqpubrawtxhwm=<n>
 
+# Enable publish raw wallet transaction in <address>
+#zmqpubrawwallettx=<address>
+
+# Set publish raw wallet transaction outbound message high water mark
+# (default: 1000)
+#zmqpubrawwallettxhwm=<n>
+
 # Enable publish hash block and tx sequence in <address>
 #zmqpubsequence=<address>
 
@@ -481,10 +522,11 @@
 # is optional). If <category> is not supplied or if <category> = 1,
 # output all debug and trace logging. <category> can be: addrman,
 # bench, blockstorage, cmpctblock, coindb, estimatefee, http, i2p,
-# ipc, leveldb, libevent, mempool, mempoolrej, net, proxy, prune,
-# qt, rand, reindex, rpc, scan, selectcoins, tor, txpackages,
-# txreconciliation, util, validation, walletdb, zmq. This option
-# can be specified multiple times to output multiple categories.
+# ipc, leveldb, libevent, lock, mempool, mempoolrej, net, proxy,
+# prune, qt, rand, reindex, rpc, scan, selectcoins, tor,
+# txpackages, txreconciliation, util, validation, walletdb, zmq.
+# This option can be specified multiple times to output multiple
+# categories.
 #debug=<category>
 
 # Exclude debug and trace logging for a category. Can be used in
@@ -536,6 +578,11 @@
 # is defined by the -signetchallenge parameter
 #signet=1
 
+# Difficulty adjustment will target a block time of the given amount in
+# seconds (only for custom signet networks, must have
+# -signetchallenge set; defaults to 10 minutes)
+#signetblocktime=1
+
 # Blocks must satisfy the given script to be considered valid (only for
 # signet networks; defaults to the global default signet test
 # network challenge)
@@ -554,49 +601,94 @@
 ### Node relay options
 
 
+# Relay and mine non-OP_RETURN datacarrier injection (default: 0)
+#acceptnonstddatacarrier=1
+
+# Relay and mine "non-standard" transactions (default: 0)
+#acceptnonstdtxn=1
+
 # Equivalent bytes per sigop in transactions for relay and mining
 # (default: 20)
 #bytespersigop=1
 
+# Minimum bytes per sigop in transactions we relay and mine (default: 20)
+#bytespersigopstrict=1
+
 # Relay and mine data carrier transactions (default: 1)
 #datacarrier=1
 
-# Relay and mine transactions whose data-carrying raw scriptPubKey is of
-# this size or less (default: 83)
+# Treat extra data in transactions as at least N vbytes per actual byte
+# (default: 1)
+#datacarriercost=1
+
+# Maximum size of data in data carrier transactions we relay and mine
+# (default: 42)
 #datacarriersize=1
 
+# Automatically raise dustrelayfee based on either the expected fee to be
+# mined within <blocks> blocks, or to be within the best <kvB> kvB
+# of this node's mempool. (default: off)
+#dustdynamic=off|target:<blocks>|mempool:<kvB>
+
+# Fee rate (in BTC/kvB) used to define dust, the value of an output such
+# that it will cost more than its value in fees at this fee rate to
+# spend it. (default: 0.00003)
+#dustrelayfee=<amt>
+
+# Maximum size of scripts we relay and mine (default: 1650)
+#maxscriptsize=1
+
 # Accept transaction replace-by-fee without requiring replaceability
-# signaling (default: 0)
+# signaling (default: 1)
 #mempoolfullrbf=1
 
+# Set to 0 to disable RBF entirely, "fee,optin" to honour RBF opt-out
+# signal, or "fee,-optin" to always RBF aka full RBF (default:
+# fee,-optin)
+#mempoolreplacement=1
+
 # Fees (in BTC/kvB) smaller than this are considered zero fee for
 # relaying, mining and transaction creation (default: 0.00001)
 #minrelaytxfee=<amt>
 
-# Relay non-P2SH multisig (default: 1)
+# Relay non-P2SH multisig (default: 0)
 #permitbaremultisig=1
 
-# Add 'forcerelay' permission to whitelisted inbound peers with default
+# Relay legacy pubkey outputs (default: 0)
+#permitbarepubkey=1
+
+# Accept transactions reusing addresses or other pubkey scripts (default:
+# allow)
+#spkreuse=1
+
+# Add 'forcerelay' permission to whitelisted peers with default
 # permissions. This will relay transactions even if the
 # transactions were already in the mempool. (default: 0)
 #whitelistforcerelay=1
 
-# Add 'relay' permission to whitelisted inbound peers with default
-# permissions. This will accept relayed transactions even when not
-# relaying transactions (default: 1)
+# Add 'relay' permission to whitelisted peers with default permissions.
+# This will accept relayed transactions even when not relaying
+# transactions (default: 1)
 #whitelistrelay=1
 
 
 ### Block creation options
 
 
-# Set maximum BIP141 block weight (default: 3996000)
+# Set maximum block size in bytes (default: 300000)
+#blockmaxsize=<n>
+
+# Set maximum BIP141 block weight (default: 1200000)
 #blockmaxweight=<n>
 
 # Set lowest fee rate (in BTC/kvB) for transactions to be included in
 # block creation. (default: 0.00001)
 #blockmintxfee=<amt>
 
+# Set maximum size of high-priority/low-fee transactions in bytes
+# (default: 100000)
+#blockprioritysize=<n>
+
 
 ### RPC server options
 
@@ -619,6 +711,10 @@
 # option can be specified multiple times
 #rpcauth=<userpw>
 
+# A file with a single lines with same format as rpcauth. This option can
+# be specified multiple times
+#rpcauthfile=<userpw>
+
 # Bind to given address to listen for JSON-RPC connections. Do not expose
 # the RPC server to untrusted networks such as the public internet!
 # This option is ignored unless -rpcallowip is also passed. Port is
@@ -631,6 +727,10 @@
 # net-specific datadir location. (default: data dir)
 #rpccookiefile=<loc>
 
+# Set the permissions on the RPC auth cookie file to the specified octal
+# value (default: 400)
+#rpccookieperms=<octal>
+
 # Password for JSON-RPC connections
 #rpcpassword=<pw>
 
@@ -668,6 +768,16 @@
 #server=1
 
 
+### Statistic options
+
+
+# Enable statistics (default: 0)
+#statsenable=1
+
+# Set the memory limit target for statistics in bytes (default: 10485760)
+#statsmaxmemorytarget=<n>
+
+
 # [Sections]
 # Most options will apply to all networks. To confine an option to a specific
 # network, add it under the relevant section below.