aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Chow <github@achow101.com>2022-08-25 11:29:15 -0400
committerAndrew Chow <github@achow101.com>2022-08-25 11:29:34 -0400
commitba2edcae7321d6f8dc4aad4acbbd2d3b5e846f5f (patch)
tree468a8302a72d2a03ee82b3645dc86de37677fad1
parent6057e7e2b90307b037bcdb686dbe8c90eaee58c5 (diff)
parent6242314ba8a0ebf036e782e75c80d1b1ad6251ca (diff)
downloadbitcoin-ba2edcae7321d6f8dc4aad4acbbd2d3b5e846f5f.tar.xz
Merge bitcoin/bitcoin#25925: doc: add `{import,list}descriptors` to list of descriptor RPCs
6242314ba8a0ebf036e782e75c80d1b1ad6251ca doc: add `{import,list}descriptors` to list of descriptor RPCs (Sebastian Falbesoner) Pull request description: This PR adds the missing RPCs `importlistdescriptors` ([since v0.21](https://github.com/bitcoin/bitcoin/blob/1420547ec30a24fc82ba3ae5ac18374e8e5af5e5/doc/release-notes/release-notes-0.21.0.md?plain=1#L405)) and `listdescriptors` ([since v22](https://github.com/bitcoin/bitcoin/blob/1420547ec30a24fc82ba3ae5ac18374e8e5af5e5/doc/release-notes/release-notes-22.0.md?plain=1#L175)) to the list of RPCs supporting descriptors in descriptors.md. Also changes the description of `importmulti` slightly to point out that it only works for legacy wallets. ACKs for top commit: S3RK: ACK 6242314ba8a0ebf036e782e75c80d1b1ad6251ca achow101: ACK 6242314ba8a0ebf036e782e75c80d1b1ad6251ca aureleoules: ACK 6242314ba8a0ebf036e782e75c80d1b1ad6251ca. brunoerg: ACK 6242314ba8a0ebf036e782e75c80d1b1ad6251ca Tree-SHA512: e8905c800b0c9a760e3380efebe2fb015c321a891dd4bf283039486d9d3b382b2c76901fcc8413acf435ed9832f76d9828efd70ba5ce62d4be65e87672bbd0a2
-rw-r--r--doc/descriptors.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/descriptors.md b/doc/descriptors.md
index 60cc36db07..69a5ee2715 100644
--- a/doc/descriptors.md
+++ b/doc/descriptors.md
@@ -11,13 +11,16 @@ Supporting RPCs are:
addresses.
- `listunspent` outputs a specialized descriptor for the reported unspent outputs.
- `getaddressinfo` outputs a descriptor for solvable addresses (since v0.18).
-- `importmulti` takes as input descriptors to import into the wallet
+- `importmulti` takes as input descriptors to import into a legacy wallet
(since v0.18).
- `generatetodescriptor` takes as input a descriptor and generates coins to it
(`regtest` only, since v0.19).
- `utxoupdatepsbt` takes as input descriptors to add information to the psbt
(since v0.19).
-- `createmultisig` and `addmultisigaddress` return descriptors as well (since v0.20)
+- `createmultisig` and `addmultisigaddress` return descriptors as well (since v0.20).
+- `importdescriptors` takes as input descriptors to import into a descriptor wallet
+ (since v0.21).
+- `listdescriptors` outputs descriptors imported into a descriptor wallet (since v22).
This document describes the language. For the specifics on usage, see the RPC
documentation for the functions mentioned above.