Merge 07ad869b7a into b48b5de9d8

src/_bitcoin-cli

@@ -35,7 +35,7 @@
 # -------
 #
 #  * Ian Ker-Seymer (https://github.com/ianks)
-#  * notmike
+#  * notmike (https://github.com/notmike-5)
 # ------------------------------------------------------------------------------
 
 _bitcoin-cli() {
@@ -43,29 +43,33 @@ _bitcoin-cli() {
 
   _arguments -C \
     -?'[This help message]' \
-    -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.]' \
+    -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). 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.]' \
-    -testnet'[Use the test chain]' \
-    -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 (recommended for sensitive information such as passphrases)]' \
+    -testnet='[Use the test chain]' \
+    -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 (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]' \
+    -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)]' \
     -rpcuser='[Username for JSON-RPC connections]:RPCUSER:()' \
     -rpcpassword='[Password for JSON-RPC connections]:RPCPASSWORD:()' \
+    -rpccookiefile='[Location of the auth cookie. Relative paths will be prefixed by a net-specific datadir location. (default: data dir)]:RPCCOOKIEFILE:()' \
+    -rpcwallet='[Send RPC for non-default wallet on RPC server (needs to exactly match corresponding -wallet option passed to bitcoind). This changes the RPC endpoint used, e.g. http://127.0.0.1:8332/wallet/<walletname>]' \
     -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]' \
+    -version='[Print version and exit]' \
     ':subcommand:->subcommand' && ret=0
 
   case $state in
     subcommand)
       subcommands=(
+        'dumptxoutset'
         'getbestblockhash'
         'getblock'
         'getblockchaininfo'
@@ -75,6 +79,7 @@ _bitcoin-cli() {
         'getblockhash'
         'getblockheader'
         'getblockstats'
+        'getchainstates'
         'getchaintips'
         'getchaintxstats'
         'getdeploymentinfo'
@@ -88,9 +93,12 @@ _bitcoin-cli() {
         'gettxoutproof'
         'gettxoutsetinfo'
         'gettxspendingprevout'
+        'importmempool'
+        'loadtxoutset'
         'preciousblock'
         'pruneblockchain'
         'savemempool'
+        'scanblocks'
         'scantxoutset'
         'verifychain'
         'verifytxoutproof'
@@ -103,6 +111,7 @@ _bitcoin-cli() {
         'getblocktemplate'
         'getmininginfo'
         'getnetworkhashps'
+        'getprioritisedtransactions'
         'prioritisetransaction'
         'submitblock'
         'submitheader'
@@ -110,6 +119,7 @@ _bitcoin-cli() {
         'clearbanned'
         'disconnectnode'
         'getaddednodeinfo'
+        'getaddrmaninfo'
         'getconnectioncount'
         'getnettotals'
         'getnetworkinfo'
@@ -128,12 +138,14 @@ _bitcoin-cli() {
         'decodepsbt'
         'decoderawtransaction'
         'decodescript'
+        'descriptorprocesspsbt'
         'finalizepsbt'
         'fundrawtransaction'
         'getrawtransaction'
         'joinpsbts'
         'sendrawtransaction'
         'signrawtransactionwithkey'
+        'submitpackage'
         'testmempoolaccept'
         'utxoupdatepsbt'
         'enumeratesigners'
@@ -141,22 +153,22 @@ _bitcoin-cli() {
         'deriveaddresses'
         'estimatesmartfee'
         'getdescriptorinfo'
+        'getindexinfo'
         'signmessagewithprivkey'
         'validateaddress'
         'verifymessage'
         'abandontransaction'
         'abortrescan'
-      'addmultisigaddress'
         'backupwallet'
         'bumpfee'
         'createwallet'
-      'dumpprivkey'
-      'dumpwallet'
+        'createwalletdescriptor'
         'encryptwallet'
         'getaddressesbylabel'
         'getaddressinfo'
         'getbalance'
         'getbalances'
+        'gethdkeys'
         'getnewaddress'
         'getrawchangeaddress'
         'getreceivedbyaddress'
@@ -164,13 +176,8 @@ _bitcoin-cli() {
         'gettransaction'
         'getunconfirmedbalance'
         'getwalletinfo'
-      'importaddress'
         'importdescriptors'
-      'importmulti'
-      'importprivkey'
         'importprunedfunds'
-      'importpubkey'
-      'importwallet'
         'keypoolrefill'
         'listaddressgroupings'
         'listdescriptors'
@@ -186,7 +193,6 @@ _bitcoin-cli() {
         'loadwallet'
         'lockunspent'
         'migratewallet'
-      'newkeypool'
         'psbtbumpfee'
         'removeprunedfunds'
         'rescanblockchain'
@@ -195,7 +201,6 @@ _bitcoin-cli() {
         'sendall'
         'sendmany'
         'sendtoaddress'
-      'sethdseed'
         'setlabel'
         'settxfee'
         'setwalletflag'