aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-02-09 04:55:29 -0800
committerMarcoFalke <falke.marco@gmail.com>2020-02-09 04:55:45 -0800
commit75fb37ce68289eb7e00e2ccdd2ef7f9271332545 (patch)
tree479e5ada5df0d546b89e6b00558933f13a392dcc /doc
parent23fab1a3dfe6f308880197dbe2bd7ce70866f13c (diff)
parent19a354b11f85a3c6c81ff83bf702bf7a40cf5046 (diff)
downloadbitcoin-75fb37ce68289eb7e00e2ccdd2ef7f9271332545.tar.xz
Merge #18032: rpc: Output a descriptor in createmultisig and addmultisigaddress
19a354b11f85a3c6c81ff83bf702bf7a40cf5046 Output a descriptor in createmultisig and addmultisigaddress (Andrew Chow) Pull request description: Give a descriptor from `createmultisig` and `addmultisigaddress`. Extracted from #16528 with `addmultisgaddress` and tests added. ACKs for top commit: Sjors: tACK 19a354b11f85a3c6c81ff83bf702bf7a40cf5046 MarcoFalke: ACK 19a354b11f85a3c6c81ff83bf702bf7a40cf5046 promag: Code review ACK 19a354b11f85a3c6c81ff83bf702bf7a40cf5046. meshcollider: utACK 19a354b11f85a3c6c81ff83bf702bf7a40cf5046 Tree-SHA512: e813125fbbc358ea8d45b1748de16a29a94efd83175b748fb8fa3b0bfc8e783ed36b6c554d84f5d4ead1ba252a83a3e937b6c3f75da7b8d3b4e55f94d6013771
Diffstat (limited to 'doc')
-rw-r--r--doc/descriptors.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/descriptors.md b/doc/descriptors.md
index e31665b129..181ff77e50 100644
--- a/doc/descriptors.md
+++ b/doc/descriptors.md
@@ -17,6 +17,7 @@ Supporting RPCs are:
(`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)
This document describes the language. For the specifics on usage, see the RPC
documentation for the functions mentioned above.