Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#25925: doc: add {import,list}descriptors to l…
Browse files Browse the repository at this point in the history
…ist of descriptor RPCs

6242314 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 6242314
  achow101:
    ACK 6242314
  aureleoules:
    ACK 6242314.
  brunoerg:
    ACK 6242314

Tree-SHA512: e8905c800b0c9a760e3380efebe2fb015c321a891dd4bf283039486d9d3b382b2c76901fcc8413acf435ed9832f76d9828efd70ba5ce62d4be65e87672bbd0a2
  • Loading branch information
achow101 committed Aug 25, 2022
2 parents 6057e7e + 6242314 commit ba2edca
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions doc/descriptors.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit ba2edca

Please sign in to comment.