Merge 4f793a0031 into b48b5de9d8

src/_bitcoin-cli

@@ -28,14 +28,14 @@
 # Description
 # -----------
 #
-#  Completion script for bitcoin-cli v29.0.0 (https://bitcoin.org).
+#  Completion script for bitcoin-cli (https://bitcoin.org).
 #
 # ------------------------------------------------------------------------------
 # Authors
 # -------
 #
 #  * Ian Ker-Seymer (https://github.com/ianks)
-#  * notmike (https://github.com/notmike-5)
+#  * notmike
 # ------------------------------------------------------------------------------
 
 _bitcoin-cli() {
@@ -43,24 +43,21 @@ _bitcoin-cli() {
 
   _arguments -C \
     -?'[This help message]' \
-    -addrinfo'[Get the number of addresses known to the node, per network and total]' \
+    -addrinfo'[Get the number of addresses known to the node, per network and total, after filtering for quality and recency. Total number of addresses known to the node may be higher.]' \
     -chain='[Use the chain <chain> (default: main). Allowed values: main, test, signet, regtest]:chain:(main test signet regtest)' \
-    -color='[Color setting for CLI output (default: auto)]:when:(always auto never)' \
+    -color='[Color setting for CLI output (default: auto). Valid values: always, auto, never]:when:(always auto never)' \
     -conf='[Specify configuration file. Relative paths will be prefixed by datadir location. (default: bitcoin.conf)]:PATH:_files' \
     -datadir='[Specify data directory]:PATH:_directories' \
-    -getinfo'[Get general information from the remote server]' \
+    -getinfo='[Get general information from the remote server.]' \
     -testnet'[Use the test chain]' \
-    -regtest'[Enter regression test mode]' \
+    -regtest'[Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.]' \
     -named'[Pass named instead of positional arguments (default: false)]' \
     -netinfo=-'[Get network peer connection information from the remote server.]::level_or_help:(0 1 2 3 4 help)' \
-    -stdin'[Read extra arguments from standard input, one per line until EOF/Ctrl-D]' \
+    -stdin'[Read extra arguments from standard input, one per line until EOF/Ctrl-D (recommended for sensitive information such as passphrases)]' \
     -rpcport='[Connect to JSON-RPC on <port> (default: 8332, testnet: 18332, regtest: 18443)]: :_guard "[[\:digit\:]]#" "PORT"' \
     -rpcwait'[Wait for RPC server to start]' \
-    -rpcwaittimeout='[Timeout in seconds to wait for the RPC server to start, or 0 for no timeout. (default: 0)]:timeout' \
     -rpcuser='[Username for JSON-RPC connections]:RPCUSER:()' \
     -rpcpassword='[Password for JSON-RPC connections]:RPCPASSWORD:()' \
-    -rpccookiefile='[Location of the auth cookie(default: data dir)]:dir:_files' \
-    -rpcwallet='[Send RPC for non-default wallet on RPC server]:server' \
     -rpcconnect='[Send commands to node running on <ip> (default: 127.0.0.1)]:RPCCONNECT:_hosts' \
     -rpcclienttimeout='[Timeout during HTTP requests, or 0 for no timeout. (default: 900)]: :_guard "[[\:digit\:]]#" "RPCCLIENTTIMEOUT"' \
     -version'[Print version and exit]' \
@@ -69,7 +66,6 @@ _bitcoin-cli() {
   case $state in
     subcommand)
     subcommands=(
-        'dumptxoutset'
       'getbestblockhash'
       'getblock'
       'getblockchaininfo'
@@ -79,7 +75,6 @@ _bitcoin-cli() {
       'getblockhash'
       'getblockheader'
       'getblockstats'
-        'getchainstates'
       'getchaintips'
       'getchaintxstats'
       'getdeploymentinfo'
@@ -93,12 +88,9 @@ _bitcoin-cli() {
       'gettxoutproof'
       'gettxoutsetinfo'
       'gettxspendingprevout'
-        'importmempool'
-        'loadtxoutset'
       'preciousblock'
       'pruneblockchain'
       'savemempool'
-        'scanblocks'
       'scantxoutset'
       'verifychain'
       'verifytxoutproof'
@@ -111,7 +103,6 @@ _bitcoin-cli() {
       'getblocktemplate'
       'getmininginfo'
       'getnetworkhashps'
-        'getprioritisedtransactions'
       'prioritisetransaction'
       'submitblock'
       'submitheader'
@@ -119,7 +110,6 @@ _bitcoin-cli() {
       'clearbanned'
       'disconnectnode'
       'getaddednodeinfo'
-        'getaddrmaninfo'
       'getconnectioncount'
       'getnettotals'
       'getnetworkinfo'
@@ -138,14 +128,12 @@ _bitcoin-cli() {
       'decodepsbt'
       'decoderawtransaction'
       'decodescript'
-        'descriptorprocesspsbt'
       'finalizepsbt'
       'fundrawtransaction'
       'getrawtransaction'
       'joinpsbts'
       'sendrawtransaction'
       'signrawtransactionwithkey'
-        'submitpackage'
       'testmempoolaccept'
       'utxoupdatepsbt'
       'enumeratesigners'
@@ -153,22 +141,22 @@ _bitcoin-cli() {
       'deriveaddresses'
       'estimatesmartfee'
       'getdescriptorinfo'
-        'getindexinfo'
       'signmessagewithprivkey'
       'validateaddress'
       'verifymessage'
       'abandontransaction'
       'abortrescan'
+      'addmultisigaddress'
       'backupwallet'
       'bumpfee'
       'createwallet'
-        'createwalletdescriptor'
+      'dumpprivkey'
+      'dumpwallet'
       'encryptwallet'
       'getaddressesbylabel'
       'getaddressinfo'
       'getbalance'
       'getbalances'
-        'gethdkeys'
       'getnewaddress'
       'getrawchangeaddress'
       'getreceivedbyaddress'
@@ -176,8 +164,13 @@ _bitcoin-cli() {
       'gettransaction'
       'getunconfirmedbalance'
       'getwalletinfo'
+      'importaddress'
       'importdescriptors'
+      'importmulti'
+      'importprivkey'
       'importprunedfunds'
+      'importpubkey'
+      'importwallet'
       'keypoolrefill'
       'listaddressgroupings'
       'listdescriptors'
@@ -193,6 +186,7 @@ _bitcoin-cli() {
       'loadwallet'
       'lockunspent'
       'migratewallet'
+      'newkeypool'
       'psbtbumpfee'
       'removeprunedfunds'
       'rescanblockchain'
@@ -201,6 +195,7 @@ _bitcoin-cli() {
       'sendall'
       'sendmany'
       'sendtoaddress'
+      'sethdseed'
       'setlabel'
       'settxfee'
       'setwalletflag'